feat(ProjectBudgetService): 优化采购类型匹配逻辑
- 增加了对采购类型不存在的情况的处理 - 当采购类型不存在时,自动创建新的采购类型 - 优化了采购类型匹配条件,去除了不必要的类型判断dev_2.0.2
parent
03ab45f7b8
commit
b7790d36fb
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue