diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index c6f2a845..4d3476ef 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -83,8 +83,8 @@ public class TbsCostApplyController { //@PostMapping("/testChangeAmt") public R testChangeAmt(@RequestBody TbsAffairCommitBo param){ TbsCostApplyOperationServiceImpl impl = SpringUtils.getBean(TbsCostApplyOperationServiceImpl.class); - BigDecimal total = impl.checkToChangeAmount(param); - return R.ok(total); + impl.doFinished(param); + return R.ok(); } /** diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index ffdd34e6..e5d9f19a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -321,7 +321,8 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService } TbsBudgetLog budgetLog = budgetCostItem.toBudgetLog( costApply, - BudgetLogOptFlag.State_6, + //BudgetLogOptFlag.State_6, + BudgetLogOptFlag.State_7, currentCenterGoods.getCenterGoodsAmount(), sysUser, budgetCode 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 0f56eeb6..7d1c9002 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 @@ -170,6 +170,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl activityCenters4Update = new ArrayList<>(); List activitySubject4Update = new ArrayList<>(); + int countCode = 1; for (TbsActivitySubject activitySubject : activitySubjectList) { if(tempTotal.compareTo(BigDecimal.ZERO)<1){ break; @@ -242,11 +243,31 @@ public class VtbVerificationServiceImpl extends ServiceImpl