预案演练计划代码提交

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

@@ -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> selectWaitEvaluateTaskList2(@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());
@@ -847,7 +849,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,8 +858,13 @@ 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.forEach(vo->{
+                if (ObjectUtil.isNotNull(vo.getRecStatus())){
+                    vo.setStatus(10);
+                }
+            });
             list2.removeIf(item -> DateUtil.compare(new Date(), item.getEndTime()) > 0);
             list.addAll(list2);
 

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

@@ -281,18 +281,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 +293,21 @@
         where end_date <![CDATA[<]]> now()
           and status in (0, 1)
     </update>
+
+    <select id="selectWaitEvaluateTaskList2" 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 inner join sys_org o on t.org_id=o.id
+        where t.status =3
+        and 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>