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

预算基本信息表不再新建

master
OathK1per 2023-03-28 17:20:25 +08:00
parent 5771f757c4
commit fcd4a466ac
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -4,9 +4,9 @@ import cn.palmte.work.bean.*;
import cn.palmte.work.config.activiti.ActProcessKeyEnum; import cn.palmte.work.config.activiti.ActProcessKeyEnum;
import cn.palmte.work.model.*; import cn.palmte.work.model.*;
import cn.palmte.work.utils.DateKit; import cn.palmte.work.utils.DateKit;
import org.apache.commons.beanutils.BeanUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -935,13 +935,7 @@ public class ProjectBudgetService {
private void saveProjectBudget(Project p, ProjectBudget budget) { private void saveProjectBudget(Project p, ProjectBudget budget) {
ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(p.getId()); ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(p.getId());
try { BeanUtils.copyProperties(budget, projectBudget, "id");
BeanUtils.copyProperties(projectBudget, budget);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
projectBudget.setTypeDescBudget(TypeEnum.parseType(projectBudget.getTypeBudget()).getTypeDesc()); projectBudget.setTypeDescBudget(TypeEnum.parseType(projectBudget.getTypeBudget()).getTypeDesc());
projectBudget.setUnderwrittenModeStrBudget(UnderwrittenModeEnum.parseUnderwrittenMode(projectBudget.getUnderwrittenModeBudget()).getUnderwrittenModeStr()); projectBudget.setUnderwrittenModeStrBudget(UnderwrittenModeEnum.parseUnderwrittenMode(projectBudget.getUnderwrittenModeBudget()).getUnderwrittenModeStr());

15
src/main/java/cn/palmte/work/service/ProjectEstimateService.java
View File

@ -304,11 +304,19 @@ public class ProjectEstimateService {
} }
private void projectBudgetSave(Project estimateProject) { private void projectBudgetSave(Project estimateProject) {
ProjectBudget projectBudget = new ProjectBudget();
if (projectBudgetRepository.findFirstByProjectId(estimateProject.getId()) != null) { if (projectBudgetRepository.findFirstByProjectId(estimateProject.getId()) != null) {
projectBudget = projectBudgetRepository.findFirstByProjectId(estimateProject.getId()); ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(estimateProject.getId());
projectBudget = copyProjectBudget(estimateProject, projectBudget);
projectBudgetRepository.saveAndFlush(projectBudget);
return;
} }
ProjectBudget projectBudget = new ProjectBudget();
projectBudget.setProjectId(estimateProject.getId()); projectBudget.setProjectId(estimateProject.getId());
projectBudget = copyProjectBudget(estimateProject, projectBudget);
projectBudgetRepository.saveAndFlush(projectBudget);
}
public ProjectBudget copyProjectBudget(Project estimateProject, ProjectBudget projectBudget) {
projectBudget.setProjectNoBudget(estimateProject.getProjectNo()); projectBudget.setProjectNoBudget(estimateProject.getProjectNo());
projectBudget.setNameBudget(estimateProject.getName()); projectBudget.setNameBudget(estimateProject.getName());
projectBudget.setTypeBudget(estimateProject.getType()); projectBudget.setTypeBudget(estimateProject.getType());
@ -351,8 +359,7 @@ public class ProjectEstimateService {
projectBudget.setResolvePlanStrBudget(estimateProject.getResolvePlanStr()); projectBudget.setResolvePlanStrBudget(estimateProject.getResolvePlanStr());
projectBudget.setMainContractResolvePlanBudget(estimateProject.getMainContractResolvePlan()); projectBudget.setMainContractResolvePlanBudget(estimateProject.getMainContractResolvePlan());
projectBudget.setCalculationCollectionBudget(estimateProject.getCalculationCollection()); projectBudget.setCalculationCollectionBudget(estimateProject.getCalculationCollection());
return projectBudget;
projectBudgetRepository.save(projectBudget);
} }
public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception { public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception {