feat: task check 2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/dept/SysDeptControllerV2.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -32,7 +31,6 @@ public class SysDeptControllerV2 {
 
   @Resource private RedisTemplate redisTemplate;
 
-  @Inner(value = false)
   @GetMapping(value = "/avail")
   public R<List<Map<String, Object>>> listAvail(
       @RequestParam(value = "name", required = false) String name) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/drug/WmDrugControllerV2.java

@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -31,9 +31,8 @@ public class WmDrugControllerV2 {
 
   @Resource private RedisTemplate redisTemplate;
 
-  @Inner(value = false)
   @GetMapping(value = "/avail")
-  public R<Map<String, List<WmDaDrugEntDrugtable>>> listAvail(
+  public R<Map<String, List<Map<String, String>>>> listAvail(
       @RequestParam(value = "mah", required = false) String mah) {
 
     List<WmDaDrugEntDrugtable> range =
@@ -43,18 +42,27 @@ public class WmDrugControllerV2 {
       return R.ok(Collections.emptyMap());
     }
 
-    if (StrUtil.isBlank(mah)) {
+    if (StrUtil.isNotBlank(mah)) {
       range =
           range.stream()
               .filter(drug -> StrUtil.contains(drug.getDrugEntName(), mah))
               .collect(Collectors.toList());
     }
 
-    Map<String, List<WmDaDrugEntDrugtable>> collect = range.stream()
-        .collect(Collectors.groupingBy(WmDaDrugEntDrugtable::getDrugEntName));
-
-    return R.ok(collect);
+    Map<String, List<Map<String, String>>> collect =
+        range.stream()
+            .map(
+                drugtable -> {
+                  Map<String, String> map = new HashMap<>(4);
+                  map.put("id", drugtable.getId());
+                  map.put("entName", drugtable.getDrugEntName());
+                  map.put("drugName", drugtable.getDrugname());
+                  map.put("drugNameTy", drugtable.getDrugnameTy());
 
+                  return map;
+                })
+            .collect(Collectors.groupingBy(m -> m.get("entName")));
 
+    return R.ok(collect);
   }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/vo/TaskReqVO.java

@@ -49,5 +49,8 @@ public final class TaskReqVO {
 
     // 任务创建日期
     private LocalDate createTime;
+
+    // 任务状态
+    private String taskStatus;
   }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserControllerV2.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -30,7 +29,7 @@ public class SysUserControllerV2 {
 
   @Resource private RedisTemplate redisTemplate;
 
-  @Inner(false)
+
   @GetMapping(value = "/avail")
   public R<List<Map<String, Object>>> listAvail(
       @RequestParam(value = "realName", required = false) String realName) {

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState.TaskState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType.AreaType;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysCheckChainNodeCheckHistory;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
@@ -87,7 +88,8 @@ public final class TaskManager {
         skuIds,
         query.getSalesId(),
         query.getProvAbbr(),
-        query.getNodeId());
+        query.getNodeId(),
+        query.getTaskStatus());
 
     return build(page);
   }

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

@@ -31,6 +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("nodeId") Integer nodeId,
+      @Param("taskStatus") String taskStatus
       );
 }

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

@@ -52,7 +52,7 @@
         pkg.start_time >= #{pkgIssueDate} AND pkg.end_time <= #{pkgExpiryDate}
       </if>
       <if test="prov != null and prov != ''">
-        AND pkg.prov_abbr =#{prov}
+        AND pkg.prov_abbr = #{prov}
       </if>
       <if test="vendorIds != null and vendorIds.size > 0">
         AND pkg.dept_id IN
@@ -72,6 +72,9 @@
       <if test="salesId != null">
         AND t.task_user_id = #{salesId}
       </if>
+      <if test="taskStatus != null and taskStatus != ''">
+        AND t.task_status = #{taskStatus}
+      </if>
       <if test="taskStartTime != null and taskEndTime != null">
         AND (t.create_time BETWEEN #{taskStartTime} AND #{taskEndTime})
       </if>