|
@@ -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)) {
|