教育培训代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/domain/CoreEduTrainingPlan.java

@@ -95,7 +95,7 @@ public class CoreEduTrainingPlan extends BaseEntity {
     @ApiModelProperty(value = "是否是标准计划,0:否,1:是")
     private Integer standard;
 
-    @ApiModelProperty(value = "是否已下发", notes = "0:否,1:是")
+    @ApiModelProperty(value = "是否已下发或当前为被下发计划", notes = "0:否,1:是")
     @TableField("issue")
     private Integer issue;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -1,6 +1,7 @@
 package com.xunmei.common.core.domain.edu.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,6 +82,8 @@ public class CoreEduTrainingTaskDetailVo {
     @ApiModelProperty(value = "图片")
     private String imageList;
 
+    @ApiModelProperty(value = "附件信息")
+    private List<String> fileList;
 
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreEduTrainingTaskToUser> taskUserList;
@@ -89,4 +92,9 @@ public class CoreEduTrainingTaskDetailVo {
     @ApiModelProperty(value = "登记簿地址")
     private String pdfUrl;
 
+
+    @JsonIgnore
+    @ApiModelProperty(value = "图片")
+    private String file;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingTaskMapper.java

@@ -28,4 +28,6 @@ public interface CoreEduTrainingTaskMapper extends BaseMapper<CoreEduTrainingTas
     CoreEduTrainingTaskDetailVo selectEduTrainingTaskDetail(@Param("id") Long id);
 
     List<CoreEduTrainingTaskReportVo> selectReport(@Param("request") CoreEduTrainingTaskReportDto request);
+
+    Integer checkHasTask(@Param("planId") Long planId);
 }

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

@@ -252,7 +252,20 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         coreEduTrainingPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
         batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
         batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
-        return coreEduTrainingPlanMapper.updateById(plan);
+        final int i = coreEduTrainingPlanMapper.updateById(plan);
+        if (ObjectUtil.equal(plan.getStandard(), 0) && ObjectUtil.equal(plan.getIssue(), 0)) {
+            //说明是行方自己创建的计划，修改后需要重新下发
+            Integer exit = coreEduTrainingTaskMapper.checkHasTask(request.getId());
+            Integer hasDone = coreEduTrainingTaskMapper.checkHasTaskIsDone(Collections.singletonList(request.getId()));
+            if (ObjectUtil.equal(exit, 1) && ObjectUtil.isNull(hasDone)) {
+                coreEduTrainingTaskMapper.deleteByMap(MapUtil.of("plan_id", request.getId()));
+                //说明有任务并且都没执行过，需要重新生成任务
+                final CoreEduTrainingPlanDataVo dataVo = getCoreEduTrainingPlanDataVo(request.getId());
+                coreEduTrainingTaskService.createTaskForNow(dataVo, plan.getStartDate(), plan.getEndDate());
+            }
+        }
+
+        return i;
     }
 
     @Override

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

@@ -145,7 +145,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         int signNums = (int) userList.stream().filter(user -> user.getSign() == 1).count();
         record.setSignNums(signNums + "/" + userList.size());
         if (ObjectUtil.isNotEmpty(record.getPdfUrl())) {
-            record.setPdfUrl(staticsPath+ record.getPdfUrl());
+            record.setPdfUrl(staticsPath + record.getPdfUrl());
         }
     }
 
@@ -165,6 +165,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     public CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id) {
         CoreEduTrainingTaskDetailVo detailVo = coreEduTrainingTaskMapper.selectEduTrainingTaskDetail(id);
         List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectByMap(MapUtil.of("edu_training_task_id", id));
+        if (ObjectUtil.isNotEmpty(detailVo.getFile())) {
+            detailVo.setFileList(JSON.parseArray(detailVo.getFile(), String.class));
+        }
         if (ObjectUtil.isNotEmpty(userList)) {
             detailVo.setTaskUserList(userList);
         }

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

@@ -48,7 +48,7 @@ public class SysKnowledgeServiceImpl extends ServiceImpl<SysKnowledgeMapper, Sys
         }
         //查询条件
         LambdaQueryWrapper<SysKnowledge> wrapper = new LambdaQueryWrapper<>(sysKnowledge);
-        wrapper.orderByAsc(SysKnowledge::getCreateTime);
+        wrapper.orderByDesc(SysKnowledge::getCreateTime);
         //模糊查询
         if (StringUtils.isNotNull(sysKnowledge.getName())) {
             wrapper.like(SysKnowledge::getName, sysKnowledge.getName());

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

@@ -129,9 +129,10 @@
                image_list,
                t.host_id,
                t.recorder_id,
-               u.name    as hostName,
-               u2.name   as recorderName,
-               t.pdf_url as pdfUrl
+               u.name      as hostName,
+               u2.name     as recorderName,
+               t.pdf_url   as pdfUrl,
+               t.file_list as file
         from core_edu_training_task t
                  left join sys_user u on u.id = t.host_id
                  left join sys_user u2 on u2.id = t.recorder_id
@@ -160,4 +161,8 @@
             </if>
         </where>
     </select>
+
+    <select id="checkHasTask" resultType="java.lang.Integer">
+        select 1 from core_edu_training_task where plan_id = #{planId} limit 1
+    </select>
 </mapper>