From aea863172084a7400edca79b04f77bb4762cbb32 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 12 Jul 2024 08:38:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VtbVerificationBatchController.java | 5 +- .../controller/VtbVerificationController.java | 4 +- .../modules/vtb/entity/VtbVerification.java | 3 + .../service/VtbVerificationApplication.java | 2 + ...VerificationBatchOperationServiceImpl.java | 3 + .../impl/VtbVerificationServiceImpl.java | 77 +++++++++++-------- 6 files changed, 58 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index 7f2ab350..a50d7d3a 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -110,10 +110,7 @@ public class VtbVerificationBatchController { @GetMapping("/getById/{id}") public R getById(@PathVariable("id") String id){ VtbVerificationBatch batch = vtbVerificationBatchService.getById(id); - if(batch.getVtbBatchStatus().equals(VtbVerificationBatch.BatchState.CHECKING)){ - vtbVerificationBatchOperationService.runCompensate(id); - batch = vtbVerificationBatchService.getById(id); - } + List verificationList = vtbVerificationService .list(new LambdaQueryWrapper() .eq(VtbVerification::getBatchId,batch.getId())); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index abc36e07..6f301925 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -192,7 +192,8 @@ public class VtbVerificationController { @PreAuthorize("hasRole('vtb:verification:query')") public R getById(@PathVariable("id") String id){ VtbVerification vtbVerification = vtbVerificationService.getById(id); - if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ + boolean notBatch = vtbVerification.getBatchId()==null; + if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode()) && notBatch){ try { vtbVerificationOperationService.runCompensate(id); vtbVerification = vtbVerificationService.getById(id); @@ -265,7 +266,6 @@ public class VtbVerificationController { if(verificationDB.getBatchId()!=null){ String templateCode = TbsSeeYonConst.BatchCostCheckConf.Code(); R> result = seeYonService.commonListAffairs(verificationDB.getBatchId()+"",null,templateCode); - //TODO List result2 = verificationApplication.buildCtpAffairVoList(result.getData()); return R.ok(result2); } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index a9682f0f..ee05c5c6 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -83,6 +83,9 @@ public class VtbVerification implements Serializable { /** 记录释放标识 */ private Integer regReleaseFlag; + /** 记录释放人员id */ + private String regReleaseUserId; + /** 输入的释放标识 */ private Integer inputReleaseFlag; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 350e04b7..526f8584 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -458,6 +458,8 @@ public class VtbVerificationApplication { activity4Upd.setUsedAmount(totalUsed); if(totalUsed.compareTo(activity.getTotalAmount())>=0){ activity4Upd.setActivityState(TbsActivityState.STATE_1_Finished); + }else if (activity.getReleaseFlag().equals(1)){ + activity4Upd.setActivityState(TbsActivityState.STATE_4_Release); }else { activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java index ede84920..b83bd8a4 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java @@ -236,7 +236,10 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); vtbVer.setRegReleaseFlag(itemCommit.getReleaseFlag()); + vtbVer.setRegReleaseUserId(AuthContextUtils.getSysUserId()); vtbVerificationService.updateById(vtbVer); + //完成时会调用更新 + verification.setRegReleaseFlag(itemCommit.getReleaseFlag()); } //保存审批线结果 diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 9c117f08..f19365c0 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -380,35 +380,38 @@ public class VtbVerificationServiceImpl extends ServiceImpl