feat: task check 6

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/TaskManager.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.manager;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -91,6 +92,22 @@ public class TaskManager {
 
     Page<TaskRespVO.ToDirectCheck> page = new Page<>(query.getCurrent(), query.getSize());
 
+    Integer nodeId = query.getNodeId();
+    List<Integer> nodeIds;
+
+    // 商务组
+    if (nodeId == 12) {
+      nodeIds = ListUtil.of(3, 9);
+    }
+    // 市场组
+    else if (nodeId == 11) {
+      nodeIds = ListUtil.of(3, 8);
+    }
+    // 其他
+    else {
+      nodeIds = Collections.singletonList(nodeId);
+    }
+
     taskMapper.pageDirectCheck(
         page,
         issueDate,
@@ -102,7 +119,7 @@ public class TaskManager {
         skuIds,
         query.getSalesId(),
         query.getProvAbbr(),
-        query.getNodeId(),
+        nodeIds,
         query.getTaskStatus());
 
     return build(page);
@@ -333,7 +350,7 @@ public class TaskManager {
               .set(finished, WmScorePackage::getTaskAddFlag, AddTaskState.DISABLE.getState())
               .set(finished, WmScorePackage::getPackageFinishTime, now)
               .set(WmScorePackage::getUpdateTime, now)
-              .set(WmScorePackage::getUpdateUser, user.getUsername())
+              .set(WmScorePackage::getUpdateUser, user.getId())
               .eq(WmScorePackage::getId, task.getScorePackageId()));
 
       // 更新领取信息
@@ -341,7 +358,7 @@ public class TaskManager {
           Wrappers.<WmScorePackageStatus>lambdaUpdate()
               .set(finished, WmScorePackageStatus::getTaskAddFlag, AddTaskState.DISABLE.getState())
               .set(WmScorePackageStatus::getUpdateTime, now)
-              .set(WmScorePackageStatus::getUpdateUser, user.getUsername())
+              .set(WmScorePackageStatus::getUpdateUser, user.getId())
               .eq(WmScorePackageStatus::getPackageId, task.getScorePackageId()));
     }
   }
@@ -374,7 +391,7 @@ public class TaskManager {
     }
 
     if (AddTaskState.DISABLE.getState().equals(scorePackage.getTaskAddFlag())) {
-//      throw new BizException("当前包已经关闭，不能追加新服务记录");
+      //      throw new BizException("当前包已经关闭，不能追加新服务记录");
     }
   }
 
@@ -385,7 +402,7 @@ public class TaskManager {
     }
 
     if (AddTaskState.DISABLE.getState().equals(picked.getTaskAddFlag())) {
-//      throw new BizException("当前包已经关闭，不能追加新服务记录");
+      //      throw new BizException("当前包已经关闭，不能追加新服务记录");
     }
   }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskV2Mapper.java

@@ -31,7 +31,7 @@ public interface WmTaskV2Mapper extends BaseMapper<WmTask> {
       @Param("salesId") Integer salesId,
       @Param("prov") String prov,
 //      @Param("taskIds") List<Integer> taskIds,
-      @Param("nodeId") Integer nodeId,
+      @Param("nodeIds") List<Integer> nodeIds,
       @Param("taskStatus") String taskStatus
       );
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskV2Mapper.xml

@@ -41,10 +41,13 @@
     FROM wm_task AS t
     LEFT JOIN wm_score_package AS pkg ON pkg.id = t.score_package_id
     INNER JOIN (SELECT DISTINCT tmp.target_id AS task_id
-                FROM (SELECT h.target_id, MAX(h.node_id) AS node_id
+                FROM (SELECT h.target_id,  MAX(if((h.node_id BETWEEN 5 AND 6), h.node_id + 10, h.node_id)) AS node_id
                       FROM sys_chain_node_check_his AS h
                       GROUP BY h.target_id) tmp
-                      WHERE tmp.node_id = #{nodeId}
+                      WHERE tmp.node_id IN
+                      <foreach collection="nodeIds" item="nodeId" open="(" close=")" separator=",">
+                        #{nodeId}
+                      </foreach>
                 ORDER BY task_id) AS his
     ON his.task_id = t.id
     <where>