浏览代码

feat:导出包信息 包含父级执行包所属省份

shc 5 月之前
父节点
当前提交
8bb5acd0ee

+ 7 - 0
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/WmScorePackageInfoExcelModel.java

@@ -41,6 +41,13 @@ public class WmScorePackageInfoExcelModel implements Serializable {
     @ExcelProperty("父级执行包")
     private String parentPkgName;
 
+    /**
+     * 父级执行包所属省份
+     */
+    @ColumnWidth(128)
+    @ExcelProperty("父级执行包所属省份")
+    private String parentPkgProvAbbr;
+
     /**
      * 产品名称
      */

+ 3 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -585,7 +585,7 @@ public class WmPackageManager {
               DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(endDate)));
     }
 
-    // 获取上级包
+    // 获取区域的上级包
     List<String> ppid =
         pkgs.stream()
             .map(WmScorePackage::getRelationScoreId)
@@ -673,7 +673,7 @@ public class WmPackageManager {
     // taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId,
     // cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
 
-    // 根据任务类型id分组
+    // 根据id分组
     Map<String, List<WmTask>> pkg2TaskListMap =
         tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
 
@@ -702,6 +702,7 @@ public class WmPackageManager {
 
                   // 父级包
                   WmScorePackage wmScorePackages = ppMap.get(pkg.getRelationScoreId());
+                  model.setParentPkgProvAbbr(wmScorePackages.getProvAbbr());
                   model.setParentPkgName(
                       wmScorePackages != null ? wmScorePackages.getScorePackageName() : "");