From 556d84418e60cf9afd173dce40501fc9bd3d5987 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 4 Dec 2023 10:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8E=A8=E9=80=81=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=E7=9A=84=20=E9=87=87?= =?UTF-8?q?=E8=B4=AD=20=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectlib/manage/ProjectRenewalFundManage.java | 2 +- .../syndataapi/open/manage/ProjectReceiveManage.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java index 7c9f243..3bfc006 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java +++ b/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)){ diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java index a4160a8..11fe301 100644 --- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java +++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java @@ -169,13 +169,21 @@ public class ProjectReceiveManage { List procures = dto.getProcures(); if(Objects.nonNull(procures)){ List 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);