工作台代码提交

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,7 +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);
+    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,7 +279,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         if (ObjectUtil.equal(request.getSubmitType(), 2)) {
             coreDrillTask.setStatus(DrillDoStatus.WAIT_SIGN.getCode());
-        }else {
+        } else {
             coreDrillTask.setStatus(DrillDoStatus.WAIT_SUBMIT.getCode());
         }
 
@@ -671,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()) {
@@ -850,7 +848,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         panelListDto.setOrgPath(sysOrg.getPath());
         List<Integer> statusList = new ArrayList<>();
         Collections.addAll(statusList, DrillDoStatus.WAIT_SUBMIT.getCode(),
-                DrillDoStatus.WAIT_RECORDED.getCode(),DrillDoStatus.WAIT_SIGN.getCode());
+                DrillDoStatus.WAIT_RECORDED.getCode(), DrillDoStatus.WAIT_SIGN.getCode());
         List<PanelListVo> list = coreDrillTaskMapper.selectCurUserTaskList(panelListDto, statusList);
         dealListData(list, panelListDto.getUserId());
         //省联社/办事处或行社
@@ -859,16 +857,16 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 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);
+            List<PanelListVo> waitEvaluateTaskList = coreDrillTaskMapper.selectWaitEvaluateTaskList(panelListDto);
+            List<PanelListVo> waitRecTaskList = coreDrillTaskMapper.selectWaitRecTaskList(panelListDto);
+            waitRecTaskList.forEach(item -> {
+                if (ObjectUtil.isNotNull(item.getRecStatus())) {
+                    item.setStatus(10);
                 }
             });
-            list2.removeIf(item -> DateUtil.compare(new Date(), item.getEndTime()) > 0);
-            list.addAll(list2);
-
-
+            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/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -195,12 +195,14 @@
     </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>
-        and t.org_path like concat(#{request.orgPath},'%')
-        <include refid="timeRangeSql"/>
+        select * from core_drill_task t
+        <where>
+            <if test="request.recStatus!=null">
+                t.rec_status =#{request.recStatus}
+            </if>
+            and t.org_path like concat(#{request.orgPath},'%')
+            <include refid="timeRangeSql"/>
+        </where>
     </select>
     <sql id="recTaskListPage">
         <if test="request.orgPath !=null and request.orgPath != ''">
@@ -294,19 +296,18 @@
           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
+    <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.status =3
-        and t.org_path like concat(#{request.orgPath},'%')
+        where  t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
-        <if test="request.orgType=3">
+        <if test="request.orgType==3">
             and t.rec_status =0 and o.type=4
         </if>
-        <if test="request.orgType=2">
+        <if test="request.orgType==2">
             and t.rec_status =2 and o.type=3
         </if>
-        <if test="request.orgType=1">
+        <if test="request.orgType==1">
             and t.rec_status =4 and o.type=2
         </if>
     </select>