|
@ -135,10 +135,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe |
|
|
if(condition!=null){ |
|
|
if(condition!=null){ |
|
|
verification.setPayConditionId(condition.getId()); |
|
|
verification.setPayConditionId(condition.getId()); |
|
|
} |
|
|
} |
|
|
|
|
|
verification.setActivityCode(activity.getActivityCode()); |
|
|
|
|
|
verification.setCostApplyCode(costApply.getCode()); |
|
|
verification.setAmountRecord(param.getTotalCheckAmount()); |
|
|
verification.setAmountRecord(param.getTotalCheckAmount()); |
|
|
verification.setAmount(param.getTotalCheckAmount()); |
|
|
verification.setAmount(param.getTotalCheckAmount()); |
|
|
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
verification.setVerificationState(VtbVerificationState.Commiting.getCode()); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setCostApplyId(costApply.getId()); |
|
|
verification.setCostApplyId(costApply.getId()); |
|
|
verification.setActivityId(activity.getId()); |
|
|
verification.setActivityId(activity.getId()); |
|
|
verification.setSupplierId(activity.getSupplierId()); |
|
|
verification.setSupplierId(activity.getSupplierId()); |
|
@ -601,6 +603,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe |
|
|
validActivity(cotractFlag,activity,true,isCurrentCommit); |
|
|
validActivity(cotractFlag,activity,true,isCurrentCommit); |
|
|
VtbVerification verification = new VtbVerification(); |
|
|
VtbVerification verification = new VtbVerification(); |
|
|
verification.setId(verificationBo.getId()); |
|
|
verification.setId(verificationBo.getId()); |
|
|
|
|
|
verification.setCostApplyCode(costApply.getCode()); |
|
|
|
|
|
verification.setActivityCode(activity.getActivityCode()); |
|
|
verification.setPayConditionId(verificationBo.getPayConditionId()); |
|
|
verification.setPayConditionId(verificationBo.getPayConditionId()); |
|
|
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
verification.setVerificationCode("HX"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
verification.setVerificationState(VtbVerificationState.Commiting.getCode()); |
|
|
verification.setVerificationState(VtbVerificationState.Commiting.getCode()); |
|
|