瀏覽代碼

init: init project step4: biz code support

shc 1 年之前
父節點
當前提交
22ad7a9591

+ 8 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1541,6 +1541,14 @@ public class WmScorePackageController {
             for (Future<WmScorePackage> future : futureList) {
                 WmScorePackage wmScorePackage = future.get();
 
+                // 设置planId
+                SysPlanPkg one = planPkgService.getOne(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPkgId, wmScorePackage.getId()));
+
+                if (one != null){
+                    wmScorePackage.setPlanId(one.getPlanId());
+                }
+
+
                 if (wmScorePackage.getP2pAmount() != null) {
                     wmScorePackage.setP2pDraft(false);
                 } else {

+ 16 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -18,13 +18,17 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplPlanDetails;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplPlanDetailsItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplementPlan;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysPlanPkg;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.vo.SysImplementPlanVO;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysImplPlanDetailsItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysImplPlanDetailsService;
 import com.qunzhixinxi.hnqz.admin.service.SysImplementPlanService;
+import com.qunzhixinxi.hnqz.admin.service.SysPlanPkgService;
 import com.qunzhixinxi.hnqz.admin.service.SysRoleService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntDrugtableService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import lombok.AllArgsConstructor;
@@ -61,6 +65,8 @@ public class SysImplementPlanManager {
     private final SysRoleService roleService;
     private final SysImplPlanDetailsItemService implPlanDetailsItemService;
     private final WmDaDrugEntDrugtableService drugEntDrugtableService;
+    private final SysPlanPkgService planPkgService;
+    private final WmScorePackageService scorePackageService;
 
     /**
      * 创建计划
@@ -191,7 +197,16 @@ public class SysImplementPlanManager {
             p.setConsigneeInfo(consigneeInfo);
 
             // 执行包总值
-            p.setExecScoreValue(0L);
+            Set<Integer> pkgIds = planPkgService.list(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPlanId, record.getPlanId())).stream().map(SysPlanPkg::getPkgId).collect(Collectors.toSet());
+            long execScoreVal = 0L;
+            if (CollUtil.isNotEmpty(pkgIds)) {
+                List<WmScorePackage> packages = scorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getRelationScoreId, pkgIds));
+                if (CollUtil.isNotEmpty(packages)) {
+                    execScoreVal = packages.stream().mapToLong(WmScorePackage::getScore).sum();
+                }
+
+            }
+            p.setExecScoreValue(execScoreVal);
 
             // 产品信息
             Map<String, String> sku = skuMap.get(record.getSkuId());