培训/演练: bug修改

project_data/sql/0.0.5/升级说明.txt

@@ -0,0 +1,10 @@
+
+
+nacos配置中心file模块增加配置说明:
+在spring模块下增加配置
+示例:
+spring
+  servlet:
+    multipart:
+      max-file-size: 20MB
+      max-request-size: 20MB

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

@@ -295,10 +295,6 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     @Transactional(rollbackFor = Exception.class)
     public void updateCoreDrillPlan(CoreDrillPlanUpdateDto request) {
         final CoreDrillPlan plan = getById(request.getId());
-        if (ObjectUtil.notEqual(plan.getCreateOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
-            throw new RuntimeException("暂无权限编辑该培训任务!");
-        }
-
        /* DateRange range;
         if (ObjectUtil.equal(plan.getPlanCycle(), EduTrainingPlanCycleEnum.NONE.getCode())) {
             range = new DateRange(DateUtil.beginOfDay(plan.getStartDate()), DateUtil.endOfDay(plan.getEndDate()));

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

@@ -145,6 +145,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 }
                 dealData(record, records, cacheList);
             }
+            //App的排序逻辑已在SQL中实现,如果不是App的查询,那么就走Web的排序逻辑
+            if (ObjectUtil.notEqual(1, request.getIsAppSelect())) {
+                records.sort(getWebComparator());
+            }
         }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);
@@ -177,6 +181,15 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
     }
 
+    public static Comparator<CoreDrillTaskPageVo> getWebComparator() {
+        return (o1, o2) -> {
+            int startTimeCompare = o1.getStartDate().compareTo(o2.getStartDate());
+            if (startTimeCompare == 0) {
+                return o1.getTitle().compareToIgnoreCase(o2.getTitle());
+            }
+            return startTimeCompare;
+        };
+    }
 
     private void dealData(CoreDrillTaskPageVo record, List<CoreDrillTaskPageVo> records, List<SysOrgVO> cacheList) {
         record.setNo(records.indexOf(record) + 1);
@@ -477,7 +490,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             Map<Short, DateRange> rangeMap;
             if (OrgTypeEnum.YINGYE_WANGDIAN.getCode().equals(org.getType())) {
                 if (ObjectUtil.isNotEmpty(listMap.get(org.getId()))) {
-                    rangeMap = TaskCreatingServiceImplBase. splitTaskTime(plan.getExecTimes().shortValue(), EduTrainingPlanCycleEnum.toCommonEnum(plan.getPlanCycle()), start, end, listMap.get(org.getId()));
+                    rangeMap = TaskCreatingServiceImplBase.splitTaskTime(plan.getExecTimes().shortValue(), EduTrainingPlanCycleEnum.toCommonEnum(plan.getPlanCycle()), start, end, listMap.get(org.getId()));
                 } else {
                     continue;
                 }
@@ -1066,7 +1079,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     public WebPanelResult selectWebIndexData(PanelListDto req) {
         final int count = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
                 .eq(CoreDrillTask::getOrgId, req.getOrgId())
-                .in(CoreDrillTask::getStatus, Arrays.asList(DrillDoStatus.WAIT_RECORDED.getCode(),DrillDoStatus.WAIT_SUBMIT.getCode()))).intValue();
+                .in(CoreDrillTask::getStatus, Arrays.asList(DrillDoStatus.WAIT_RECORDED.getCode(), DrillDoStatus.WAIT_SUBMIT.getCode()))).intValue();
         return WebPanelResult
                 .builder()
                 .status(DrillDoStatus.WAIT_RECORDED.getCode())

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

@@ -297,10 +297,6 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     @Transactional(rollbackFor = Exception.class)
     public int updateCoreEduTrainingPlan(CoreEduTrainingPlanEditDto request) {
         final CoreEduTrainingPlan plan = getById(request.getId());
-        if (ObjectUtil.notEqual(plan.getCreateOrgId(), SecurityUtils.getLoginUser().getOrgId())) {
-            throw new RuntimeException("暂无权限编辑该培训任务!");
-        }
-
        /* DateRange range;
         if (ObjectUtil.equal(plan.getPlanCycle(), EduTrainingPlanCycleEnum.NONE.getCode())) {
             range = new DateRange(DateUtil.beginOfDay(plan.getStartDate()), DateUtil.endOfDay(plan.getEndDate()));

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

@@ -127,7 +127,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         dealTaskPageParam(request);
         IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPageRequest(), request);
         if (ObjectUtil.isNotEmpty(pageData.getRecords())) {
-            pageData.getRecords().sort(getComparator());
            /* List<Long> idList = pageData.getRecords().stream().map(CoreEduTrainingTaskPageVo::getId).collect(Collectors.toList());
             List<CoreEduTrainingTaskToRole> roleList = taskToRoleMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>()
                     .in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, idList));
@@ -136,7 +135,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             for (CoreEduTrainingTaskPageVo record : records) {
                 dealData(record, records, null);
             }
-            records.sort(getComparator());
+            //App的排序逻辑已在SQL中实现,如果不是App的查询,那么就走Web的排序逻辑
+            if (ObjectUtil.notEqual(1, request.getIsAppSelect())) {
+                records.sort(getComparator());
+            }
         }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(pageData);
@@ -167,9 +169,16 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
 
     public static Comparator<CoreEduTrainingTaskPageVo> getComparator() {
+        return (o1, o2) -> {
+            int startTimeCompare = o1.getStartDate().compareTo(o2.getStartDate());
+            if (startTimeCompare == 0) {
+                return o1.getTitle().compareToIgnoreCase(o2.getTitle());
+            }
+            return startTimeCompare;
+        };
         //将0映射为0，4映射为1，1映射为2，2映射为3，3映射为4，其他情况映射为5
         //0:待培训,1:待签名,2:已完成,3:已逾期,4:待提交
-        return Comparator.comparingInt((CoreEduTrainingTaskPageVo vo) -> {
+       /* return Comparator.comparingInt((CoreEduTrainingTaskPageVo vo) -> {
             Integer num = vo.getStatus();
             if (num == 0) {
                 return 0;
@@ -184,7 +193,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             } else {
                 return 5;
             }
-        });
+        });*/
     }
 
     private void dealData(CoreEduTrainingTaskPageVo record, List<CoreEduTrainingTaskPageVo> records, Map<Long, List<CoreEduTrainingTaskToRole>> listMap) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -173,7 +173,7 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
     @Override
     public int updateCoreOutInRecord(CoreOutInRecord coreOutInRecord) {
         final int i = coreOutInRecordMapper.updateById(coreOutInRecord);
-        if (ObjectUtil.isNotEmpty(coreOutInRecord.getDepartureTime())){
+        if (ObjectUtil.isNotEmpty(coreOutInRecord.getDepartureTime())) {
             this.buildOutInRecordPdf(coreOutInRecord.getId());
         }
         return i;
@@ -308,6 +308,8 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
                 final String url = (String) map.get("imgPath");
                 if (ObjectUtil.isNotEmpty(url)) {
                     strings.add(url);
+                } else {
+                    strings.add((String) map.get("url"));
                 }
             }
             data.put("file", getFileRealPath(strings, prefixPath, staticsPath));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1061,12 +1061,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
     public List<AppResumptionDataInfoVo> getItems(List<Resumption> resumptions) {
         List<AppResumptionDataInfoVo> vos = new ArrayList<>();
-        for (Resumption r :
-                resumptions) {
+        for (Resumption r : resumptions) {
             ResumptionRecordVo resumptionRecordVo = resumptionRecordService.selectInfo(r.getId());
             List<ResumptionRecordItemVo> items = resumptionRecordVo.getItems();
-            for (ResumptionRecordItemVo v :
-                    items) {
+            for (ResumptionRecordItemVo v : items) {
                 vos.addAll(v.getDataInfoList());
             }
         }
@@ -1084,7 +1082,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             for (AppResumptionDataInfoVo vo : map.getValue()) {
                 pointName = vo.getPointName();
                 result += vo.getResValue();
-                submitName.append(vo.getSubmitName());
+                if (!(submitName.toString().contains(vo.getSubmitName()))) {
+                    submitName.append(vo.getSubmitName());
+                }
             }
             ResumptionPdf tem = new ResumptionPdf();
             tem.setPointName(pointName);

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -89,7 +89,7 @@
             </if>
             <include refid="timeRangeSql"/>
         </where>
-        order by t.status, t.update_time desc, t.id
+        order by field(t.status,1,4,0,2,3),t.title desc
     </select>
 
     <select id="selectEduTrainingTaskDetail"