mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预算毛利率取值错误，应该取预算信息中的利润率

master
Harry Yang 2023-01-04 17:52:51 +08:00
parent 6a6d10a090
commit 088f6fb616
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/cn/palmte/work/controller/backend/ProcessController.java
View File

@ -48,6 +48,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import cn.palmte.work.ErrorMessageException; import cn.palmte.work.ErrorMessageException;
import cn.palmte.work.bean.BudgetBean;
import cn.palmte.work.config.activiti.ActApproveTypeEnum; import cn.palmte.work.config.activiti.ActApproveTypeEnum;
import cn.palmte.work.config.activiti.ActProjectTypeEnum; import cn.palmte.work.config.activiti.ActProjectTypeEnum;
import cn.palmte.work.model.Admin; import cn.palmte.work.model.Admin;
@ -312,6 +313,9 @@ public class ProcessController {
else if (processType == ProcessType.procurement_contract) { else if (processType == ProcessType.procurement_contract) {
procurementDetails = processService.getProcurementDetails(id, null); procurementDetails = processService.getProcurementDetails(id, null);
} }
BudgetBean budgetBean = projectBudgetService.getBudget(project);
return ProjectReturnValue.builder() return ProjectReturnValue.builder()
.isPrepaid(isPrepaid(project)) .isPrepaid(isPrepaid(project))
.projectId(project.getId()) .projectId(project.getId())
@ -319,7 +323,7 @@ public class ProcessController {
.procurementDetails(procurementDetails) .procurementDetails(procurementDetails)
.projectName(project.getName()) .projectName(project.getName())
.repaidAmount(repaidAmount + "元") .repaidAmount(repaidAmount + "元")
.budgetGrossMargin(project.getGrossProfitMargin()) .budgetGrossMargin(budgetBean.getProjectGrossProfitRate())
.projectNo(project.getProjectNo()) .projectNo(project.getProjectNo())
.applyPersonName(admin.getRealName()) .applyPersonName(admin.getRealName())
.contractAmount(project.getContractAmount()) .contractAmount(project.getContractAmount())