Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1447,6 +1447,23 @@ ALTER TABLE `core_protection`
 MODIFY COLUMN `device_id` bigint NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`,
 MODIFY COLUMN `alarm_host_code` bigint NULL DEFAULT NULL COMMENT '报警主机唯一标识' AFTER `org_name`;
 
+-- 演练任务状态字典增加待提交
+delete from sys_dict_data where dict_type='edu_training_do_status' and dict_value in (4) ;
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 4, '待提交', '4', 'edu_training_do_status', null, 'default', 'N', '0', 'slsjyc', '2023-09-28 15:18:38', '', null, null);
+-- 演练任务状态字典排序修改
+UPDATE sys_dict_data t SET t.dict_sort = 2 WHERE  t.dict_type = 'edu_training_do_status' and t.dict_value=1;
+UPDATE sys_dict_data t SET t.dict_sort = 1 WHERE  t.dict_type = 'edu_training_do_status' and t.dict_value=4;
+UPDATE sys_dict_data t SET t.dict_sort = 4 WHERE t.dict_code = 294 and t.dict_type = 'edu_training_do_status' and t.dict_value=2;
+UPDATE sys_dict_data t SET t.dict_label = '待培训' WHERE t.dict_code = 292 and t.dict_type = 'edu_training_do_status' and t.dict_value=0;
+
+-- 教育培训周期字典新增 每日 每周
+delete from sys_dict_data where dict_type='edu_plan_cycle' and dict_value in (1,2) ;
+INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (1, '每日', '1', 'edu_plan_cycle', null, 'default', 'N', '0', 'slsjyc', '2023-09-28 15:58:06', '', null, null);
+INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (2, '每周', '2', 'edu_plan_cycle', null, 'default', 'N', '0', 'slsjyc', '2023-09-28 15:58:20', '', null, null);
+UPDATE soc.sys_dict_data t SET t.dict_sort = 3 WHERE dict_type='edu_plan_cycle' and dict_value=3;
+UPDATE soc.sys_dict_data t SET t.dict_sort = 5 WHERE dict_type='edu_plan_cycle' and dict_value=5;
+UPDATE soc.sys_dict_data t SET t.dict_sort = 6 WHERE dict_type='edu_plan_cycle' and dict_value=6;
+UPDATE soc.sys_dict_data t SET t.dict_sort = 4 WHERE dict_type='edu_plan_cycle' and dict_value=4;
 -- 修改履职计划类型
 DELETE from sys_dict_data where dict_type='resumption_plan_type';
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '营业前安全检查', '1', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-28 18:44:08', '超级管理员', '2023-09-28 15:16:39', NULL);

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingDoStatus.java

@@ -14,6 +14,7 @@ public enum EduTrainingDoStatus {
     WAIT_SIGN(1, "待签名"),
     DONE(2, "已完成"),
     OVERDUE(3, "已逾期"),
+    WAIT_SUBMIT(4, "待提交"),
 
 
     ;

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

@@ -801,14 +801,16 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                orgService.selectOrgById(panelListDto.getOrgId(), SecurityConstants.FROM_SOURCE), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+                orgService.selectSysOrgById(panelListDto.getOrgId(), SecurityConstants.FROM_SOURCE), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         List<Integer> statusList = new ArrayList<>();
-        Collections.addAll(statusList,0,1);
-        List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto,statusList);
-
+        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());
             //查询待评价数据
             List<PanelListVo> list2 = coreDrillTaskMapper.selectWaitEvaluateTaskList(panelListDto);
+            list2.removeIf(item->DateUtil.compare(new Date(), item.getEndTime()) > 0);
             list.addAll(list2);
         }
 
@@ -818,6 +820,28 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
         return list;
     }
+
+    private void dealListData(List<PanelListVo> list, Long userId) {
+        if (ObjectUtil.isEmpty(list)) {
+            return;
+        }
+        //如果当前时间大于任务的结束时间，将该数据移除
+        list.removeIf(item->DateUtil.compare(new Date(), item.getEndTime()) > 0);
+        //筛选出待签名的数据
+        //List<PanelListVo> signList = list.stream().filter(item -> item.getStatus() == 1).collect(Collectors.toList());
+        //如果用户不在某条数据的待签名范围中，将该数据移除
+        list.removeIf(item -> {
+            Long drillTaskId = item.getId();
+            long count = coreDrillTaskToUserService.count(new LambdaQueryWrapper<CoreDrillTaskToUser>()
+                    .eq(CoreDrillTaskToUser::getDrillTaskId, drillTaskId)
+                    .eq(CoreDrillTaskToUser::getType, 1)
+                    .eq(CoreDrillTaskToUser::getUserId, userId));
+            //如果当前用户不在参与用户范围中 或  当前时间大于任务的结束时间
+            return item.getStatus() == 1 && count < 1;
+        });
+
+
+    }
 }
 
 

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

@@ -257,10 +257,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             }
             coreEduTrainingTaskToUserService.saveBatch(taskUserList);
         }
-        if (ObjectUtil.equal(request.getSubmitType(), 2)) {
+        // 暂存： 待提交    提交：待签名
+        if (ObjectUtil.equal(request.getSubmitType(), 1)) {
+            coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_SUBMIT.getCode());
+        }else {
             coreEduTrainingTask.setStatus(EduTrainingDoStatus.WAIT_SIGN.getCode());
         }
 
+
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
 
@@ -632,10 +636,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
         List<PanelListVo> list = coreEduTrainingTaskMapper.selectCurUserTaskList(panelListDto);
-        list.forEach(item -> {
-            item.setType(PanelTypeEnums.EDU_TRAINING.getCode());
-        });
-
+        list.removeIf(item->DateUtil.compare(new Date(), item.getEndTime()) > 0);
+        list.forEach(item -> {item.setType(PanelTypeEnums.EDU_TRAINING.getCode());});
         return list;
     }
 }

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

@@ -160,6 +160,7 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
 
         List<PanelListVo> list = resumptionMapper.selectCurUserTaskList(panelListDto);
+        list.removeIf(item->DateUtil.compare(new Date(), item.getEndTime()) > 0);
         list.forEach(item->{item.setType(PanelTypeEnums.RESUMPTION.getCode());});
 
         return list;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -464,9 +464,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto request) {
         List<PanelListVo> list = baseMapper.selectCurUserTaskList(request);
-        list.forEach(item -> {
-            item.setType(PanelTypeEnums.MONITORING_RETRIEVAL.getCode());
-        });
+        list.removeIf(item->DateUtil.compare(new Date(), item.getEndTime()) > 0);
+        list.forEach(item -> {item.setType(PanelTypeEnums.MONITORING_RETRIEVAL.getCode());});
 
         return list;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xunmei.core.safetyCheck.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.date.DateUtil;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
@@ -142,10 +144,8 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
     @Override
     public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
         List<PanelListVo> list = coreSafetyTaskMapper.selectCurUserTaskList(panelListDto);
-
-        list.forEach(item -> {
-            item.setType(PanelTypeEnums.SAFETY_CHECK.getCode());
-        });
+        list.removeIf(item-> DateUtil.compare(new Date(), item.getEndTime()) > 0);
+        list.forEach(item -> { item.setType(PanelTypeEnums.SAFETY_CHECK.getCode());});
         return list;
     }
 }

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/CoreEduTrainingTask.java

@@ -32,6 +32,7 @@ public class CoreEduTrainingTask {
     }
 
     public void updateEduTaskStatus() {
+
         String id = UUID.fastUUID().toString();
         log.info("开始执行教育培训定时任务,处理未完成的数据的任务数据状态为 已逾期，当前任务 id:{}", id);
         AjaxResult result = remoteEduTrainingService.updateEduTaskStatus();