Browse Source

fix: 个人执行包数据导出接口-省份和任务数没回显问题

lixuesong 4 days ago
parent
commit
b8315d9f9f

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

@@ -73,6 +73,7 @@ public class WmScorePackageSubInfoExcelModel implements Serializable {
      * 接包人电话
      */
     @ColumnWidth(20)
+    @ExcelProperty("接包人电话")
     private String taskUserPhone;
 
     /**

+ 2 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageExportServiceImpl.java

@@ -18,7 +18,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageTaskTypeQty;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
-import com.qunzhixinxi.hnqz.admin.api.model.excel.SysUserExcelModel;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.WmScorePackageSubInfoExcelModel;
 import com.qunzhixinxi.hnqz.admin.aspect.ExportGuard;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
@@ -220,7 +219,7 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 
 									// 父级包
 									WmScorePackage wmScorePackages = pMap.get(pkg.getRelationScoreId());
-									model.setParentPkgProvAbbr(pkg.getProvAbbr());
+									model.setParentPkgProvAbbr(wmScorePackages.getProvAbbr());
 									model.setParentPkgName(
 											wmScorePackages != null ? wmScorePackages.getScorePackageName() : "");
 
@@ -237,7 +236,7 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 									// 接包人电话
 									model.setTaskUserPhone(taskUser != null ? taskUser.getPhone() : "");
 
-									List<String> cPkgIdList = parentId2PkgMap.get(pkg.getId());
+									List<String> cPkgIdList = Collections.singletonList(pkg.getId());
 
 									// 任务数据统计
 									if (CollUtil.isNotEmpty(cPkgIdList)) {