fix: 立项变更流程企标编号重复生成BUG
This commit is contained in:
+7
@@ -8,7 +8,9 @@ import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange
|
||||
import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
|
||||
import com.jero.modules.laws.common.constant.FieldCommon;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
|
||||
import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
|
||||
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
|
||||
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
||||
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -42,6 +44,9 @@ public class EnterpriseStandardUtil {
|
||||
@Resource
|
||||
private ProcessEsInitChangeService initChangeService;
|
||||
|
||||
@Resource
|
||||
private EnterpriseStandardPlanService espService;
|
||||
|
||||
/**
|
||||
* 生成新序列号
|
||||
*
|
||||
@@ -251,6 +256,8 @@ public class EnterpriseStandardUtil {
|
||||
List<String> numList = new ArrayList<>();
|
||||
// 判断是否和企标库中重复
|
||||
numList.addAll(esService.list().stream().map(LawsEnterpriseStandard::getStandardNumber).collect(Collectors.toList()));
|
||||
// 判断是否和企标计划库中重复
|
||||
numList.addAll(espService.list().stream().map(EnterpriseStandardPlan::getNewEnStandardNo).collect(Collectors.toList()));
|
||||
// 判断是否和立项流程中重复
|
||||
numList.addAll(initChangeService.list().stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList()));
|
||||
return !numList.contains(StandardNumber);
|
||||
|
||||
Reference in New Issue
Block a user