优化 推送 项目归集的 采购 段

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java

@@ -396,7 +396,7 @@ public class ProjectRenewalFundManage {
         }
 
         //判断金额
-//        checkPaymentAmount(projectCode,projectYear,dto.getAnnualPaymentAmount());
+        checkPaymentAmount(projectCode,projectYear,dto.getAnnualPaymentAmount());
 
         declaration.setApprovalStatus(ProjectRenewalApprovalStatusEnum.PENDING.name());
         if(Objects.nonNull(project)){

syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java

@@ -169,13 +169,21 @@ public class ProjectReceiveManage {
         List<ProjectProcure> procures = dto.getProcures();
         if(Objects.nonNull(procures)){
             List<ProjectProcure> olds = procureService.list(Wrappers.lambdaQuery(ProjectProcure.class)
-                    .eq(ProjectProcure::getBaseProjId, baseProjId));
+                    .eq(ProjectProcure::getBaseProjId, baseProjId)
+                    .orderByAsc(ProjectProcure::getBaseBidCode));
+            Integer index = 0;
             for(ProjectProcure old : olds){
+                if(StringUtils.isNotBlank(old.getBaseBidCode())){
+                    try{
+                        String bidCode = old.getBaseBidCode().split(StrPool.DASH)[1];
+                        index = Integer.parseInt(bidCode);
+                    }catch (Exception e){}
+                }
                 //删除标记
                 old.setOp(BizConst.OP_DELETE);
                 procureService.updateById(old);
             }
-            Integer index = 1;
+            index ++;
             for(ProjectProcure procure : procures){
                 //添加标记
                 ProjectProcure saveProcure = BeanUtil.copyProperties(procure,ProjectProcure.class);