diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 02ced7e..cd7eb95 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -4,6 +4,7 @@ import cn.palmte.work.bean.*; import cn.palmte.work.config.activiti.ActProcessKeyEnum; import cn.palmte.work.model.*; import cn.palmte.work.utils.DateKit; +import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import top.jfunc.common.utils.CollectionUtil; +import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -931,10 +933,16 @@ public class ProjectBudgetService { return p; } - private void saveProjectBudget(Project p, ProjectBudget projectBudget) { - ProjectBudget budget = projectBudgetRepository.findFirstByProjectId(p.getId()); - projectBudget.setDeptIdBudget(budget.getDeptIdBudget()); - projectBudget.setDeptNameBudget(budget.getDeptNameBudget()); + private void saveProjectBudget(Project p, ProjectBudget budget) { + ProjectBudget projectBudget = projectBudgetRepository.findFirstByProjectId(p.getId()); + try { + BeanUtils.copyProperties(projectBudget, budget); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + projectBudget.setTypeDescBudget(TypeEnum.parseType(projectBudget.getTypeBudget()).getTypeDesc()); projectBudget.setUnderwrittenModeStrBudget(UnderwrittenModeEnum.parseUnderwrittenMode(projectBudget.getUnderwrittenModeBudget()).getUnderwrittenModeStr()); projectBudget.setCooperateTypeStrBudget(CooperateTypeEnum.parseCooperateType(projectBudget.getCooperateTypeBudget()).getCooperateTypeStr());