diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 0258f22..4ae3677 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 cn.palmte.work.utils.InterfaceUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -1310,7 +1311,16 @@ public class ProjectBudgetService { o1 = m.get(key); String category = (String) o1; ProcurementType procurementType = procurementTypeRepository.findByName(category); - if (procurementType != null && (procurementType.getType() == temp.getType() && temp.getType()!=4)) { + if (procurementType==null){ + procurementType=new ProcurementType(); + procurementType.setName(category); + procurementType.setType(temp.getType()); + procurementType.setEnabled(1); + procurementType.setCreatedBy(InterfaceUtil.getAdmin().getRealName()); + procurementType.setCreatedTime(new Date()); + procurementTypeRepository.saveAndFlush(procurementType); + } + if (procurementType != null && procurementType.getType() == temp.getType()) { temp.setCategory(procurementType.getId().toString()); temp.setCategoryStr(category); } else {