Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1096,8 +1096,8 @@ END IF;
 
     -- 安全检查检查项所属机构id
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_resumption_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
-        ALTER TABLE `core_resumption_plan_to_point` ADD COLUMN `of_org_id` INT NULL DEFAULT NULL COMMENT '所属机构id';
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan_to_point' AND COLUMN_NAME = 'of_org_id' ) THEN
+        ALTER TABLE `core_safecheck_plan_to_point` ADD COLUMN `of_org_id` bigint NULL COMMENT '所属机构id';
 
     END IF;
 
@@ -1268,10 +1268,11 @@ delete from sys_dict_type where dict_type='drill_task_status';
 delete from sys_dict_data where dict_type='drill_task_status';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES ('预案演练任务状态', 'drill_task_status', '0', '超级管理员', '2023-09-20 16:06:14', '', 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 (0, '待演练', '0', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:06:46', '', 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 (1, '待签名', '1', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:06:56', '', 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', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:05', '超级管理员', '2023-09-20 16:07:30', 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 (3, '已完成', '3', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:13', '', 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 (4, '已逾期', '4', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:23', '', 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, '待签名', '1', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:06:56', '', 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 (3, '待评价', '2', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:05', '超级管理员', '2023-09-20 16:07:30', 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 (4, '已完成', '3', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:13', '', 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 (5, '已逾期', '4', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:23', '', 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 (1, '待提交', '5', 'drill_task_status', null, 'default', 'N', '0', '超级管理员', '2023-09-20 16:07:23', '', null, null);
 
 
 -- 公告通知start

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -33,6 +33,12 @@ public class PanelListVo {
     @ApiModelProperty(value = "任务状态")
     private int status;
 
+    @JsonIgnore
+    @ApiModelProperty(value = "评优状态",notes = "仅演练使用该字段")
+    private Integer recStatus;
+
+
+
 
 
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/drill/DrillDoStatus.java

@@ -17,6 +17,7 @@ public enum DrillDoStatus {
     DONE(3, "已完成"),
 
     OVERDUE(4, "已逾期"),
+    WAIT_SUBMIT(5, "待提交"),
 
 
     ;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillTaskMapper.java

@@ -35,7 +35,7 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
 
     Integer checkHasTaskIsDoneByPlanParentId(@Param("planId") Long planId);
 
-    IPage<CoreDrillTaskRecPageVo> selectRecPage(Page<CoreDrillTaskRecPageVo> pageRequest, @Param("request") CoreDrillTaskRecPageDto request, @Param("recStatusList") List<Integer> recStatus);
+    IPage<CoreDrillTaskRecPageVo> selectRecPage(Page<CoreDrillTaskRecPageVo> pageRequest, @Param("request") CoreDrillTaskRecPageDto request);
 
     IPage<CoreDrillTaskRecTaskPageVo> selectRecTaskListPage(Page<Object> pageRequest, @Param("request") CoreDrillTaskRecPageDto request);
 
@@ -44,6 +44,7 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
     List<PanelListVo> selectCurUserTaskList(@Param("request") PanelListDto request,@Param("list") List<Integer> list);
 
     List<PanelListVo> selectWaitEvaluateTaskList(@Param("request") PanelListDto panelListDto);
+    List<PanelListVo> selectWaitRecTaskList(@Param("request") PanelListDto panelListDto);
 
     Integer updateTaskStatus(@Param("status") int status);
 

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

@@ -279,6 +279,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         if (ObjectUtil.equal(request.getSubmitType(), 2)) {
             coreDrillTask.setStatus(DrillDoStatus.WAIT_SIGN.getCode());
+        } else {
+            coreDrillTask.setStatus(DrillDoStatus.WAIT_SUBMIT.getCode());
         }
 
         coreDrillTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
@@ -669,11 +671,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     public TableDataInfo<CoreDrillTaskRecPageVo> recList(CoreDrillTaskRecPageDto request) {
         dealRecListParam(request);
         IPage<CoreDrillTaskRecPageVo> page;
-        if (request.getRecStatus() != null) {
-            page = coreDrillTaskMapper.selectRecPage(request.getPageRequest(), request, Collections.singletonList(request.getRecStatus()));
-        } else {
-            page = coreDrillTaskMapper.selectRecPage(request.getPageRequest(), request, getRecStatus());
-        }
+
+            page = coreDrillTaskMapper.selectRecPage(request.getPageRequest(), request);
+
         final List<SysDictData> drillTypeDictList = DictUtils.getDictCache(DictConstants.CORE_DRILL_TYPE);
         final List<SysDictData> drillTaskRecStatusList = DictUtils.getDictCache(DictConstants.DRILL_TASK_REC_STATUS);
         for (CoreDrillTaskRecPageVo record : page.getRecords()) {
@@ -847,7 +847,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         panelListDto.setOrgType(sysOrg.getType());
         panelListDto.setOrgPath(sysOrg.getPath());
         List<Integer> statusList = new ArrayList<>();
-        Collections.addAll(statusList, 0, 1);
+        Collections.addAll(statusList, DrillDoStatus.WAIT_SUBMIT.getCode(),
+                DrillDoStatus.WAIT_RECORDED.getCode(), DrillDoStatus.WAIT_SIGN.getCode());
         List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto, statusList);
         dealListData(list, panelListDto.getUserId());
         //省联社/办事处或行社
@@ -855,12 +856,17 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 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<PanelListVo> waitEvaluateTaskList = coreDrillTaskMapper.selectWaitEvaluateTaskList(panelListDto);
+            List<PanelListVo> waitRecTaskList = coreDrillTaskMapper.selectWaitRecTaskList(panelListDto);
+            waitRecTaskList.forEach(item -> {
+                if (ObjectUtil.isNotNull(item.getRecStatus())) {
+                    item.setStatus(10);
+                }
+            });
+            list.addAll(waitEvaluateTaskList);
+            list.addAll(waitRecTaskList);
+            list.removeIf(item -> DateUtil.compare(new Date(), item.getEndTime()) > 0);
         }
 
         list.forEach(item -> {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -299,7 +299,11 @@ public class SafetyCheckJobBusiness {
                 vo.setCheckOrg(check);
                 vo.setExecOrg(org);
                 vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
-                vo.setPlanName(plan.getPlanName()+"第"+(i+1)+"次");
+                if (plan.getCount()==1){
+                    vo.setPlanName(plan.getPlanName());
+                }else {
+                    vo.setPlanName(plan.getPlanName() + "第" + (i + 1) + "次");
+                }
                 list.add(vo);
             }
 //            for (CoreSafecheckPlanToRole role : roles) {

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

@@ -195,10 +195,11 @@
     </select>
 
     <select id="selectRecPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecPageVo">
-        select * from core_drill_task t where t.rec_status in
-        <foreach collection="recStatusList" item="item" index="index" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
+        select * from core_drill_task t
+        where t.rec_status is not null
+        <if test="request.recStatus!=null">
+            and t.rec_status =#{request.recStatus}
+        </if>
         and t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
     </select>
@@ -281,18 +282,9 @@
 
     <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
+        from core_drill_task t inner join sys_org o on t.org_id=o.id
         where t.status =2
         and t.org_path like concat(#{request.orgPath},'%')
-        <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>
 
@@ -302,4 +294,20 @@
         where end_date <![CDATA[<]]> now()
           and status in (0, 1)
     </update>
+
+    <select id="selectWaitRecTaskList" 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,t.rec_status
+        from core_drill_task t inner join sys_org o on t.org_id=o.id
+        where  t.org_path like concat(#{request.orgPath},'%')
+        <include refid="timeRangeSql"/>
+        <if test="request.orgType==3">
+            and t.rec_status =0 and o.type=4
+        </if>
+        <if test="request.orgType==2">
+            and t.rec_status =2 and o.type=3
+        </if>
+        <if test="request.orgType==1">
+            and t.rec_status =4 and o.type=2
+        </if>
+    </select>
 </mapper>