ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 生成新企标编号报错

Browse Source
This commit is contained in:
mzaxd
2023-11-24 13:47:15 +08:00
parent 7439d9bdd7
commit f7afc156a2
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+1
View File
@@ -248,6 +248,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
lambdaQueryWrapper.eq(ProcessEsInitChange::getEnStandardCode, esCodeDictValue); lambdaQueryWrapper.eq(ProcessEsInitChange::getEnStandardCode, esCodeDictValue);
lambdaQueryWrapper.eq(ProcessEsInitChange::getEnNameCode, esNameCodeDictValue); lambdaQueryWrapper.eq(ProcessEsInitChange::getEnNameCode, esNameCodeDictValue);
lambdaQueryWrapper.eq(ProcessEsInitChange::getStandardCategoryCode, categoryCodeDictValue); lambdaQueryWrapper.eq(ProcessEsInitChange::getStandardCategoryCode, categoryCodeDictValue);
lambdaQueryWrapper.isNotNull(ProcessEsInitChange::getNewEnStandardNo);
List<ProcessEsInitChange> list = this.list(lambdaQueryWrapper); List<ProcessEsInitChange> list = this.list(lambdaQueryWrapper);
return list.stream().map(ProcessEsInitChange::getNewEnStandardNo) return list.stream().map(ProcessEsInitChange::getNewEnStandardNo)
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+1
View File
@@ -125,6 +125,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnStandardCode, esCodeDictValue); lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnStandardCode, esCodeDictValue);
lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnNameCode, esNameCodeDictValue); lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnNameCode, esNameCodeDictValue);
lambdaQueryWrapper.eq(EnterpriseStandardPlan::getStandardCategoryCode, categoryCodeDictValue); lambdaQueryWrapper.eq(EnterpriseStandardPlan::getStandardCategoryCode, categoryCodeDictValue);
lambdaQueryWrapper.isNotNull(EnterpriseStandardPlan::getNewEnStandardNo);
List<EnterpriseStandardPlan> espList = this.list(lambdaQueryWrapper); List<EnterpriseStandardPlan> espList = this.list(lambdaQueryWrapper);
return espList.stream().map(EnterpriseStandardPlan::getNewEnStandardNo) return espList.stream().map(EnterpriseStandardPlan::getNewEnStandardNo)
laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+4 -1
View File
@@ -54,7 +54,10 @@ public class EnterpriseStandardUtil {
List<String> allSequenceNumbers = new ArrayList<>(); List<String> allSequenceNumbers = new ArrayList<>();
for (ESSequenceNumberProvider provider : providers) { for (ESSequenceNumberProvider provider : providers) {
allSequenceNumbers.addAll(provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue)); List<String> sequenceNumbers = provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue);
if (sequenceNumbers != null) {
allSequenceNumbers.addAll(sequenceNumbers);
}
} }
// 转换为整数（只取整数部分） // 转换为整数（只取整数部分）