教育培训bug修改

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

@@ -56,4 +56,10 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreEduTrainingTaskToUser> taskUserList;
 
+    @ApiModelProperty(value = "任务用户信息", notes = "参与人员")
+    private List<CoreEduTrainingTaskToUser> absenceList;
+
+    @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
+    private List<CoreEduTrainingTaskToUser> absentList;
+
 }

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

@@ -89,6 +89,12 @@ public class CoreEduTrainingTaskDetailVo {
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreEduTrainingTaskToUser> taskUserList;
 
+    @ApiModelProperty(value = "任务用户信息", notes = "参与人员")
+    private List<CoreEduTrainingTaskToUser> absenceList;
+
+    @ApiModelProperty(value = "任务用户信息", notes = "缺席人员")
+    private List<CoreEduTrainingTaskToUser> absentList;
+
 
     @ApiModelProperty(value = "登记簿地址")
     private String pdfUrl;

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

@@ -396,6 +396,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         flag = flag && validateField(request.getPlanStatus(), plan.getPlanStatus());
         flag = flag && validateField(request.getPlanCycle(), plan.getPlanCycle());
         flag = flag && validateField(request.getExecOrgType(), plan.getExecOrgType());
+        flag = flag && validateField(request.getFileList(), plan.getFileList());
 
         // 执行角色
         List<Long> roleIdLit = coreDrillPlanToRoleMapper.selectRoleIdByPlanId(planId);

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

@@ -60,6 +60,7 @@ import java.text.NumberFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -167,13 +168,17 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     public CoreEduTrainingTaskDetailVo selectCoreEduTrainingTaskById(Long id) {
         CoreEduTrainingTaskDetailVo detailVo = coreEduTrainingTaskMapper.selectEduTrainingTaskDetail(id);
-        List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectByMap(MapUtil.of("edu_training_task_id", id));
+
         detailVo.setTypeText(EduTrainingType.getName(detailVo.getType()));
         if (ObjectUtil.isNotEmpty(detailVo.getFile())) {
             detailVo.setFileList(JSON.parseArray(detailVo.getFile(), String.class));
         }
+        List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectByMap(MapUtil.of("edu_training_task_id", id));
         if (ObjectUtil.isNotEmpty(userList)) {
             detailVo.setTaskUserList(userList);
+            Map<Integer, List<CoreEduTrainingTaskToUser>> collect = userList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToUser::getType));
+            detailVo.setAbsenceList(collect.get(1));
+            detailVo.setAbsentList(collect.get(2));
         }
         return detailVo;
     }
@@ -227,7 +232,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         } else {
             coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
         }
-        List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
+        List<CoreEduTrainingTaskToUser> taskUserList;
+        if (ObjectUtil.isNotEmpty(request.getTaskUserList())) {
+            taskUserList = request.getTaskUserList();
+        } else {
+            taskUserList = Stream.of(request.getAbsenceList(), request.getAbsentList()).flatMap(Collection::stream).collect(Collectors.toList());
+        }
+
         if (ObjectUtil.isNotEmpty(taskUserList)) {
             checkTheSameUser(taskUserList);
             for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {

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

@@ -112,7 +112,7 @@
         inner join sys_user u on u.id=m.create_by
         where m.deleted = 0
         and k.deleted = 0
-        and m.create_by=#{request.userId}
+        and (m.create_by=#{request.userId} or m.is_open = 1)
         <include refid="pageRequest"/>
         <if test="request.checkSub==true">
             or ( m.org_path like concat(#{request.orgPath},'%') and m.is_open =
@@ -155,7 +155,7 @@
         inner join sys_user u on u.id=m.create_by
         where m.deleted = 0
         and k.deleted = 0
-        and m.create_by=#{request.userId}
+        and (m.create_by=#{request.userId} or m.is_open = 1)
         <include refid="pageRequest"/>
 
         <if test="request.checkSub==false">