|
|
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.hz.pm.api.App; |
|
|
|
import com.hz.pm.api.common.exception.ReturnException; |
|
|
|
import com.hz.pm.api.common.helper.UserInfoHelper; |
|
|
|
import com.hz.pm.api.common.util.DecimalUtil; |
|
|
@@ -63,8 +62,6 @@ public class AmountApprovalManage { |
|
|
|
private final IProjectService projectService; |
|
|
|
private final UserInfoHelper userInfoHelper; |
|
|
|
private final MhUnitCache mhUnitCache; |
|
|
|
private final App app; |
|
|
|
|
|
|
|
|
|
|
|
private boolean projectQueryPermission(LambdaQueryWrapper<Project> query, UserFullInfoDTO user) { |
|
|
|
boolean queryState = true; |
|
|
@@ -184,7 +181,7 @@ public class AmountApprovalManage { |
|
|
|
BigDecimal reviewAmount = approved ? project.getReviewAmount() : req.getReviewAmount(); |
|
|
|
BigDecimal currTotalApprovalAmount = NumberUtil.add(project.getApprovalAmount(), req.getApprovalAmount()); |
|
|
|
if (req.getApprovalAmount() != null && NumberUtil.isGreater(currTotalApprovalAmount, reviewAmount)) { |
|
|
|
throw ReturnException.wrap("暂不允许下达资金"); |
|
|
|
throw ReturnException.wrap("历年资金之和大于评审项目总投资,无法提交"); |
|
|
|
} |
|
|
|
Integer nextYear = null; |
|
|
|
if (approved) { |
|
|
|