diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java index b4cabbdc..4f9b48db 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java @@ -79,12 +79,10 @@ public class TbsCostContractBo implements Serializable { /** 使用印章次数 */ @NotNull(message = "印章次数不能为空") - @Length(max = 255,message = "使用印章次数长度不能超过255字") private Integer sealNum; /** 文件份数 */ @NotNull(message = "文件份数不能为空") - @Length(max = 255,message = "文件份数长度不能超过255字") private Integer fileNum; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 602b0271..6285c05d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -111,9 +111,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl vtbLqw = new LambdaQueryWrapper<>(); vtbLqw.eq(VtbVerification::getCostApplyId,id); vtbLqw.and( - qw->qw.eq(VtbVerification::getVerificationState, VtbVerificationState.Finished) + qw->qw.eq(VtbVerification::getVerificationState, VtbVerificationState.Finished.getCode()) .or() - .eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting) + .eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting.getCode()) ); long count = verificationMapper.selectCount(vtbLqw); if(count>0){ @@ -122,6 +122,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl rmLogLqw = new LambdaQueryWrapper<>(); rmLogLqw.eq(TbsBudgetLog::getCostApplyId,id); @@ -706,12 +707,12 @@ public class TbsCostApplyServiceImpl extends ServiceImpl contractLambdaQueryWrapper = new LambdaQueryWrapper<>(); + contractLambdaQueryWrapper.eq(TbsActivityPayCondition::getActivityId,verification.getActivityId()); + TbsActivityPayCondition payCondition = activityPayConditionService.getOne(contractLambdaQueryWrapper,false); + payCondition.setFinishedFlag(0); + activityPayConditionService.updateById(payCondition); } //更新活动统计金额 + //更新活动状态 + //如果为最后的活动,更变费用申请状态 + costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)); } private void removeWithVerification(Long verificationId){