Browse Source

成本中心维度核销,debug

v1.0
Yen 2 years ago
parent
commit
dafe2764a3
  1. 3
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
  2. 1
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
  3. 4
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

3
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@ -98,7 +98,7 @@ public class VtbVerificationApplication {
VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
if(devFlag){ if(devFlag){
summeryResult = "next"; summeryResult = "finished";
} }
R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult); R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult);
try { try {
@ -422,6 +422,7 @@ public class VtbVerificationApplication {
vtbVer.setFinishedTime(LocalDateTime.now()); vtbVer.setFinishedTime(LocalDateTime.now());
vtbVer.setRegReleaseFlag(verification.getRegReleaseFlag()); vtbVer.setRegReleaseFlag(verification.getRegReleaseFlag());
vtbVerificationService.updateById(vtbVer); vtbVerificationService.updateById(vtbVer);
//刷新本次核销数据
vtbVerificationService.successCommit(verification.getId()); vtbVerificationService.successCommit(verification.getId());
LambdaQueryWrapper<TbsActivity> countOLqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TbsActivity> countOLqw = new LambdaQueryWrapper<>();

1
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java

@ -198,6 +198,7 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
} }
TbsActivitySubject activitySubject = new TbsActivitySubject(); TbsActivitySubject activitySubject = new TbsActivitySubject();
activitySubject.setId(currActivitySubject.getId()); activitySubject.setId(currActivitySubject.getId());
activitySubject.setSubjectId(currActivitySubject.getSubjectId());
activitySubject.setUsedAmount(subjectTotal); activitySubject.setUsedAmount(subjectTotal);
activitySubject4Update.add(activitySubject); activitySubject4Update.add(activitySubject);
//更新成本中心 //更新成本中心

4
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@ -1291,13 +1291,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
fundFlowService.saveBatch(addFundFlowList); fundFlowService.saveBatch(addFundFlowList);
//更新已用费用记录,并更新活动状态是否完成(旧流程按比例分配,新流程按比例分配后,进行再分配)
fundFlowService.flushActivityAmount(verification.getActivityId());
//fundFlow绑定考核期项,用于合计预算使用情况 //fundFlow绑定考核期项,用于合计预算使用情况
LambdaQueryWrapper<VtbVerificationSubject> subjectLqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VtbVerificationSubject> subjectLqw = new LambdaQueryWrapper<>();
subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId); subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId);
VtbVerificationSubject subjectParam = new VtbVerificationSubject(); VtbVerificationSubject subjectParam = new VtbVerificationSubject();
subjectParam.setEffectiveFlag(1); subjectParam.setEffectiveFlag(1);
//更新已用费用记录,并更新活动状态是否完成(旧流程按比例分配,新流程按比例分配后,进行再分配)
fundFlowService.flushActivityAmount(verification.getActivityId());
verificationSubjectService.update(subjectParam,subjectLqw); verificationSubjectService.update(subjectParam,subjectLqw);
//更新成本中心维度 //更新成本中心维度
if(isCenterCommit){ if(isCenterCommit){

Loading…
Cancel
Save