任务管理

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/admin/LibraryController.java

@@ -110,6 +110,11 @@ public class LibraryController extends BaseApiController {
     @RequestMapping(value = "list", method = RequestMethod.POST)
     public PageResult<MarkLibraryVo> list(MarkLibrarySearchQuery query) {
 
+        return page(query);
+    }
+
+    private PageResult<MarkLibraryVo> page(MarkLibrarySearchQuery query) {
+
         LibraryStatus status = query.getStatus();
         int examId = getSessionExamId();
         ApiUser wu = getApiUser();
@@ -141,7 +146,11 @@ public class LibraryController extends BaseApiController {
             if (library.getMarkerScoreList() != null) {
                 library.setMarkerScoreList(library.getMarkerScoreList().replace(UN_SELECTIVE_SCORE, "/"));
             }
-            ret.add(MarkLibraryVo.of(library));
+            MarkLibraryVo vo = MarkLibraryVo.of(library);
+            if (Role.SUBJECT_HEADER.equals(wu.getRole()) && StringUtils.isNotBlank(library.getExamNumber())) {
+                vo.setExamNumber("***");
+            }
+            ret.add(vo);
         }
         return PageUtil.of(ret, query);
     }
@@ -432,45 +441,13 @@ public class LibraryController extends BaseApiController {
     @ApiOperation(value = "导出")
     @RequestMapping(value = "export", method = RequestMethod.POST)
     public void exportFile(MarkLibrarySearchQuery query, HttpServletResponse response) {
-        List<MarkLibraryVo> ret = new ArrayList<>();
-
         String fileName = "任务数据.xlsx";
-        LibraryStatus status = query.getStatus();
-        int examId = getSessionExamId();
-        ApiUser wu = getApiUser();
-        List<ExamSubject> subjectList = getExamSubject(examId, wu);
-        if (!subjectList.isEmpty()) {
-            query.setPageNumber(1);
-            query.setPageSize(Integer.MAX_VALUE);
-            query.setExamId(examId);
-            if (status != null) {
-                query.addStatus(status);
-            }
-            if (status != LibraryStatus.REJECTED) {
-                query.setRejectReason(null);
-            }
-            if (StringUtils.isEmpty(query.getSubjectCode()) && !subjectList.isEmpty()) {
-                query.setSubjectCode(subjectList.get(0).getCode());
-            }
-            query = libraryService.findByQuery(query);
-
-            for (MarkLibrary library : query.getResult()) {
-                if (library.getMarkerId() != null) {
-                    User marker = userService.findByMarkerId(library.getMarkerId());
-                    library.setMarkerLoginName(marker.getLoginName() + "/" + marker.getName());
-                    if (library.getHeaderId() != null) {
-                        User header = userService.findById(library.getHeaderId());
-                        library.setHeaderLoginName(header.getLoginName() + "/" + header.getName());
-                    }
-                }
-                if (library.getMarkerScoreList() != null) {
-                    library.setMarkerScoreList(library.getMarkerScoreList().replace(UN_SELECTIVE_SCORE, "/"));
-                }
-                ret.add(MarkLibraryVo.of(library));
-            }
-        }
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        PageResult<MarkLibraryVo> page = page(query);
         try {
-            new ExportExcel("任务数据", MarkLibraryVo.class).setDataList(ret).write(response, fileName).dispose();
+            new ExportExcel("任务数据", MarkLibraryVo.class).setDataList(page.getResult()).write(response, fileName)
+                    .dispose();
         } catch (IOException e) {
             throw new StatusException("任务数据导出出错", e);
         }