代办:推优评优列表数据 排序处理

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -112,7 +112,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     RemoteConfigService remoteConfigService;
     @Autowired
     private RemoteWorkTimeService workTimeService;
-
+    @Autowired
+    private ICoreRegisterBookPdfService registerBookPdfService;
     @Autowired
     private RemoteDictDataService remoteDictDataService;
     public static final long UN_WORK = 0L;
@@ -735,9 +736,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 result.add(reportVo);
             }
         }
-        List<CoreDrillTaskReportVo> reportVoList = result.stream().sorted(Comparator.comparing(vo -> Double.valueOf(vo.getScore()))).collect(Collectors.toList());
-        Collections.reverse(reportVoList);
-        return reportVoList;
+      /*  List<CoreDrillTaskReportVo> reportVoList = result.stream().sorted(Comparator.comparing(vo -> Double.valueOf(vo.getScore()))).collect(Collectors.toList());
+        Collections.reverse(reportVoList);*/
+        return result;
     }
 
     private void buildEmptyData(List<SysOrg> sysOrgList, List<CoreDrillTaskReportVo> result) {
@@ -817,9 +818,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public AjaxResult buildDrillTaskPdf(Long id) {
         CoreDrillTaskDetailVo task = this.selectCoreDrillTaskById(id);
-        /*if (ObjectUtil.isNotEmpty(task.getPdfUrl())) {
+        if (ObjectUtil.isNotEmpty(task.getPdfUrl())) {
             return AjaxResult.success(task.getPdfUrl());
-        }*/
+        }
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
         Map<String, Object> data = this.getFtlDrill(task);
@@ -842,7 +843,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
-            // registerBookPdfService.save(registerBookPdf);
+            registerBookPdfService.save(registerBookPdf);
 
 
         }, threadPoolTaskExecutor);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -653,13 +653,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     @Override
-    public void exportReport(CoreEduTrainingTaskReportDto request,HttpServletResponse response) {
+    public void exportReport(CoreEduTrainingTaskReportDto request, HttpServletResponse response) {
         final List<CoreEduTrainingTaskReportVo> list = this.selectCoreEduTrainingTaskReport(request);
         if (ObjectUtil.isEmpty(list)) {
             throw new SystemException("未获取到数据");
         }
         for (CoreEduTrainingTaskReportVo task : list) {
-            task.setNo(list.indexOf(task)+1);
+            task.setNo(list.indexOf(task) + 1);
         }
         try {
             // 设置响应头
@@ -709,14 +709,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         List<CoreEduTrainingTaskReportVo> result = new ArrayList<>();
         List<CoreEduTrainingTaskReportVo> list = coreEduTrainingTaskMapper.selectReport(request, planId, planIdList);
 
-        buildResultData(sysOrgList, result, list);
-        return result;
+        return buildResultData(sysOrgList, result, list);
     }
 
-    private void buildResultData(List<SysOrg> sysOrgList, List<CoreEduTrainingTaskReportVo> result, List<CoreEduTrainingTaskReportVo> list) {
+    private List<CoreEduTrainingTaskReportVo> buildResultData(List<SysOrg> sysOrgList, List<CoreEduTrainingTaskReportVo> result, List<CoreEduTrainingTaskReportVo> list) {
         if (list.isEmpty()) {
             //buildEmptyData(sysOrgList, result);
-            return;
+            return result;
         }
         for (SysOrg org : sysOrgList) {
             List<CoreEduTrainingTaskReportVo> childrenOrgData = list.stream()
@@ -734,6 +733,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             reportVo.setFinishRate(calculatePercent(totalFinish, totalShouldFinish));
             result.add(reportVo);
         }
+        return result;
     }
 
     private void buildEmptyData(List<SysOrg> sysOrgList, List<CoreEduTrainingTaskReportVo> result) {
@@ -834,7 +834,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         return AjaxResult.success("正在生成pdf，请稍后刷新页面查看!");
     }
 
-    private String getFileOrgName(SysOrg org){
+    private String getFileOrgName(SysOrg org) {
         String[] strings = org.getPath().split("-");
         List<Long> list = Arrays.stream(strings).map(Long::valueOf).collect(Collectors.toList());
         List<SysOrg> sysOrgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgByIdList(list, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
@@ -843,7 +843,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         for (String orgId : strings) {
             list1.add(map.get(Long.parseLong(orgId)));
         }
-        return   String.join("_", list1);
+        return String.join("_", list1);
     }
 
     private Map<String, Object> getFtlEdu(CoreEduTrainingTaskDetailVo task) {