预案演练计划代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/dto/PanelListDto.java

@@ -13,13 +13,11 @@ public class PanelListDto {
     private Long userId;
     private Long orgId;
     private String orgPath;
-
     private List<Long> roleIdList;
-
     private List<Integer> statusList;
-
-
     private Date startTime;
     private Date endTime;
 
+    private Integer orgType;
+
 }

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

@@ -151,11 +151,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         record.setStatusText(DrillDoStatus.getName(record.getStatus()));
 
         List<CoreDrillTaskToRole> coreDrillTaskToRoles = listMap.get(record.getId());
-        if (ObjectUtil.isEmpty(coreDrillTaskToRoles)) {
-            return;
+        if (ObjectUtil.isNotEmpty(coreDrillTaskToRoles)) {
+            record.setTaskRoleList(coreDrillTaskToRoles);
+            record.setTaskRoleNameList(coreDrillTaskToRoles.stream().map(CoreDrillTaskToRole::getRoleName).collect(Collectors.joining(",")));
         }
-        record.setTaskRoleList(coreDrillTaskToRoles);
-        record.setTaskRoleNameList(coreDrillTaskToRoles.stream().map(CoreDrillTaskToRole::getRoleName).collect(Collectors.joining(",")));
         //状态 ！= 待执行才存在相关用户信息
         if (!record.getStatus().equals(DrillDoStatus.WAIT_RECORDED.getCode())) {
             List<CoreDrillTaskToUser> userList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreDrillTaskToUser>()
@@ -845,16 +844,23 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                 orgService.selectSysOrgById(panelListDto.getOrgId(), SecurityConstants.FROM_SOURCE), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        panelListDto.setOrgType(sysOrg.getType());
+        panelListDto.setOrgPath(sysOrg.getPath());
         List<Integer> statusList = new ArrayList<>();
         Collections.addAll(statusList, 0, 1);
         List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto, statusList);
         dealListData(list, panelListDto.getUserId());
-        if (!OrgTypeEnum.YINGYE_WANGDIAN.getCode().equals(sysOrg.getType())) {
-            panelListDto.setOrgPath(sysOrg.getPath());
+        //省联社/办事处或行社
+        if (OrgTypeEnum.HANG_SHE.getCode().equals(sysOrg.getType()) ||
+                OrgTypeEnum.BAN_SHI_CHU.getCode().equals(sysOrg.getType()) ||
+                OrgTypeEnum.SHEGN_LIAN_SHE.getCode().equals(sysOrg.getType())) {
+
             //查询待评价数据
             List<PanelListVo> list2 = coreDrillTaskMapper.selectWaitEvaluateTaskList(panelListDto);
             list2.removeIf(item -> DateUtil.compare(new Date(), item.getEndTime()) > 0);
             list.addAll(list2);
+
+
         }
 
         list.forEach(item -> {

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

@@ -142,13 +142,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         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<Long> idList = pageData.getRecords().stream().map(CoreEduTrainingTaskPageVo::getId).collect(Collectors.toList());
             List<CoreEduTrainingTaskToRole> roleList = taskToRoleMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>()
                     .in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, idList));
-            Map<Long, List<CoreEduTrainingTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToRole::getEduTrainingTaskId));
+            Map<Long, List<CoreEduTrainingTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToRole::getEduTrainingTaskId));*/
             final List<CoreEduTrainingTaskPageVo> records = pageData.getRecords();
             for (CoreEduTrainingTaskPageVo record : records) {
-                dealData(record, records, listMap);
+                dealData(record, records, null);
             }
         }
         //抓换为TableDataInfo适配前端
@@ -182,12 +182,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         //record.setTypeText(EduTrainingType.getName(record.getType()));
         record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
 
-        List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
-        if (ObjectUtil.isEmpty(coreEduTrainingTaskToRoles)) {
-            return;
-        }
-        record.setTaskRoleList(coreEduTrainingTaskToRoles);
+       /* List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
+        if (ObjectUtil.isNotEmpty(coreEduTrainingTaskToRoles)) {
+           record.setTaskRoleList(coreEduTrainingTaskToRoles);
         record.setTaskRoleNameList(coreEduTrainingTaskToRoles.stream().map(CoreEduTrainingTaskToRole::getRoleName).collect(Collectors.joining(",")));
+        }*/
+
         List<CoreEduTrainingTaskToUser> userList = taskToUserMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTaskToUser>()
                 .eq(CoreEduTrainingTaskToUser::getEduTrainingTaskId, record.getId()));
         int signNums = (int) userList.stream().filter(user -> user.getSign() == 1 && ObjectUtil.equal(user.getType(), 1)).count();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/listener/WorkTimeChangeEventListener.java

@@ -31,9 +31,7 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
     private void eduTask(WorkTimeChangeEvent event) {
         try {
-            log.info("教育培训开始处理机构作息变更");
             coreEduTrainingTaskService.taskChangeForTimeWorkChange(event);
-            log.info("教育培训结束处理机构作息变更");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -42,9 +40,7 @@ public class WorkTimeChangeEventListener implements ApplicationListener<WorkTime
 
     private void resumptionTask(WorkTimeChangeEvent event) {
         try {
-            log.info("履职开始处理机构作息变更");
             rebuildResumptionTaskBusiness.rebuildTask(event);
-            log.info("履职结束处理机构作息变更");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -99,18 +99,6 @@ public class PanelServiceImpl implements PanelService {
         CompletableFuture<List<PanelListVo>> eduTrainingTaskFuture = CompletableFuture.supplyAsync(() ->
              eduTrainingTaskService.selectCurUserTaskList(panelListDto)
         );
-      /*  List<PanelListVo> resumptionTaskResult = resumptionTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-
-        List<PanelListVo> protectionTaskResult = protectionTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-        List<PanelListVo> monitorTaskResult = monitorTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-        List<PanelListVo> safetyTaskResult = safetyTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-        List<PanelListVo> drillTaskResult = drillTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-        List<PanelListVo> eduTrainingTaskResult = eduTrainingTaskFuture.get(TIMEOUT, TimeUnit.SECONDS);
-        dealResult(resumptionTaskResult,protectionTaskResult,monitorTaskResult,safetyTaskResult,drillTaskResult,eduTrainingTaskResult);
-        List<PanelListVo> resultList = Stream.of(resumptionTaskResult, protectionTaskResult, monitorTaskResult, safetyTaskResult, drillTaskResult, eduTrainingTaskResult)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());*/
-
         CompletableFuture<Void> allQueries = CompletableFuture.allOf(
                 resumptionTaskFuture, protectionTaskFuture, monitorTaskFuture,
                 safetyTaskFuture, drillTaskFuture, eduTrainingTaskFuture
@@ -125,7 +113,9 @@ public class PanelServiceImpl implements PanelService {
                 .flatMap(Collection::stream)
                 .collect(Collectors.toList());
         //将resultList根据type字段分组，并排序
-        Map<Integer, List<PanelListVo>> listMap = resultList.stream().sorted(Comparator.comparing(PanelListVo::getType)).collect(Collectors.groupingBy(PanelListVo::getType));
+        Map<Integer, List<PanelListVo>> listMap = resultList.stream()
+                .sorted(Comparator.comparing(PanelListVo::getType))
+                .collect(Collectors.groupingBy(PanelListVo::getType));
         List<PanelResultVo> list = new ArrayList<PanelResultVo>();
         for (Integer type : listMap.keySet()) {
             PanelResultVo vo = new PanelResultVo();

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -85,23 +85,7 @@
             <if test="request.status != null">
                 and t.status=#{request.status}
             </if>
-            <if test="request.startTime != null and request.endTime != null">
-                and (
-                (
-                #{request.startTime}   <![CDATA[<=]]> t.start_date
-                and #{request.endTime}     <![CDATA[>=]]> t.start_date
-                )
-                or
-                (
-                #{request.startTime}   <![CDATA[<=]]> t.end_date
-                and #{request.endTime}     <![CDATA[>=]]> t.end_date
-                )
-                or (
-                #{request.startTime}   <![CDATA[>=]]> t.start_date
-                and #{request.endTime}     <![CDATA[<=]]> t.end_date
-                )
-                )
-            </if>
+            <include refid="timeRangeSql"/>
         </where>
         order by t.update_time desc
     </select>
@@ -216,23 +200,7 @@
             #{item}
         </foreach>
         and t.org_path like concat(#{request.orgPath},'%')
-        <if test="request.startTime != null and request.endTime != null">
-            and (
-            (
-            #{request.startTime}   <![CDATA[<=]]> t.start_date
-            and #{request.endTime}     <![CDATA[>=]]> t.start_date
-            )
-            or
-            (
-            #{request.startTime}   <![CDATA[<=]]> t.end_date
-            and #{request.endTime}     <![CDATA[>=]]> t.end_date
-            )
-            or (
-            #{request.startTime}   <![CDATA[>=]]> t.start_date
-            and #{request.endTime}     <![CDATA[<=]]> t.end_date
-            )
-            )
-        </if>
+        <include refid="timeRangeSql"/>
     </select>
     <sql id="recTaskListPage">
         <if test="request.orgPath !=null and request.orgPath != ''">
@@ -285,7 +253,13 @@
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        and t.status in (0,1,2)
+        and t.status in
+        <foreach collection="list" item="status" open="(" separator="," close=")">
+            #{status}
+        </foreach>
+        <include refid="timeRangeSql"/>
+    </select>
+    <sql id="timeRangeSql">
         <if test="request.startTime != null and request.endTime != null">
             and (
             (
@@ -303,30 +277,23 @@
             )
             )
         </if>
-    </select>
+    </sql>
 
     <select id="selectWaitEvaluateTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select distinct t.id as id, title as taskName,t.start_date startTime,t.end_date as endTime,t.status
         from core_drill_task t
         where t.status =2
         and t.org_path like concat(#{request.orgPath},'%')
-        <if test="request.startTime != null and request.endTime != null">
-            and (
-            (
-            #{request.startTime}   <![CDATA[<=]]> t.start_date
-            and #{request.endTime}     <![CDATA[>=]]> t.start_date
-            )
-            or
-            (
-            #{request.startTime}   <![CDATA[<=]]> t.end_date
-            and #{request.endTime}     <![CDATA[>=]]> t.end_date
-            )
-            or (
-            #{request.startTime}   <![CDATA[>=]]> t.start_date
-            and #{request.endTime}     <![CDATA[<=]]> t.end_date
-            )
-            )
+        <if test="request.orgType =3">
+            or (t.rec_status=0)
+        </if>
+        <if test="request.orgType =2">
+            or (t.rec_status=2)
+        </if>
+        <if test="request.orgType =2">
+            or (t.rec_status=4)
         </if>
+        <include refid="timeRangeSql"/>
     </select>
 
     <update id="updateTaskStatus">