feat: 支持包名搜索

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageControllerV2.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller.pkg;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
@@ -60,7 +61,7 @@ public class WmScorePackageControllerV2 {
   }
 
   @GetMapping(value = "/pkg/avail")
-  public R<Map<String, List<String>>> availPkg(
+  public R<Map<String, String>> availPkg(
       @RequestParam(value = "pkgName", required = false) String pkgName) {
 
     // 获取所有的包
@@ -91,20 +92,20 @@ public class WmScorePackageControllerV2 {
     Map<String, List<WmScorePackage>> collect =
           avail.stream().collect(Collectors.groupingBy(WmScorePackage::getRelationScoreId));
 
-    Map<String, List<String>> map = new HashMap<>(ppkgs.size());
+    Map<String, String> map = new HashMap<>(ppkgs.size());
     ppkgs.forEach(
         ppkg -> {
           List<WmScorePackage> pkg = collect.get(ppkg.getId());
-          List<String> pkgIds =
+          String pkgIds =
               CollUtil.isEmpty(pkg)
-                  ? Collections.emptyList()
+                  ? ""
                   : pkg.stream()
                       .map(WmScorePackage::getId)
                       .distinct()
                       .sorted()
-                      .collect(Collectors.toList());
+                      .collect(Collectors.joining(StrPool.COMMA));
 
-          map.put(ppkg.getScorePackageName(), pkgIds);
+          map.put(ppkg.getScorePackageName().trim(), pkgIds);
         });
 
     return R.ok(map);

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

@@ -57,6 +57,9 @@ public final class TaskReqVO {
 
     // 任务状态
     private String taskStatus;
+
+    // 包ID
+    private String pkgIds;
   }
 
   @Data

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.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -99,6 +100,9 @@ public class TaskManager {
         page,
         issueDate,
         expiryDate,
+        StrUtil.isEmpty(query.getPkgIds())
+            ? Collections.emptyList()
+            : StrUtil.split(query.getPkgIds(), StrPool.COMMA),
         startTime,
         endTime,
         query.getTaskTypeId(),

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

@@ -23,6 +23,7 @@ public interface WmTaskV2Mapper extends BaseMapper<WmTask> {
       Page<TaskRespVO.ToDirectCheck> page,
       @Param("pkgIssueDate") LocalDate pkgIssueDate,
       @Param("pkgExpiryDate") LocalDate pkgExpiryDay,
+      @Param("pkgIds") List<String> pkgIds,
       @Param("taskStartTime") LocalDateTime taskStartTime,
       @Param("taskEndTime") LocalDateTime taskEndTime,
       @Param("taskTypeId") String taskTypeId,

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

@@ -72,6 +72,12 @@
           #{skuId}
         </foreach>
       </if>
+      <if test="pkgIds != null and pkgIds.size > 0">
+        AND t.score_package_id IN
+        <foreach collection="pkgIds" item="pid" open="(" close=")" separator=",">
+          #{pid}
+        </foreach>
+      </if>
       <if test="taskTypeId != null and taskTypeId != ''">
         AND t.task_type_id = #{taskTypeId}
       </if>