QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 88254 企业标准-新增 不选择标准分类代码和顺序号，新增成功一个后再新增提示编号已存在

Browse Source
This commit is contained in:
mzaxd
2024-08-07 19:42:45 +08:00
parent 198412e704
commit 778d79ac83
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+13 -2
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.enterprise.util; package com.jero.modules.laws.enterprise.util;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.ResultCommon; import com.jero.common.api.vo.ResultCommon;
import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.constant.enums.YesOrNoEnum;
@@ -103,7 +104,12 @@ public class EnterpriseStandardUtil {
String categoryCode = this.transCategoryCode(categoryCodeDictValue); String categoryCode = this.transCategoryCode(categoryCodeDictValue);
// 最后生成的企标编号 // 最后生成的企标编号
String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; String standardNumber = "";
if (StrUtil.isNotBlank(categoryCode)) {
standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber;
} else {
standardNumber = esCode + "/" + esNameCode + " " + sequenceNumber + "-" + yearNumber;
}
log.info("生成企标标准号：{}", standardNumber); log.info("生成企标标准号：{}", standardNumber);
return standardNumber; return standardNumber;
} }
@@ -127,7 +133,12 @@ public class EnterpriseStandardUtil {
String categoryCode = this.transCategoryCode(categoryCodeDictValue); String categoryCode = this.transCategoryCode(categoryCodeDictValue);
// 最后生成的企标编号 // 最后生成的企标编号
String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber; String standardNumber = "";
if (StrUtil.isNotBlank(categoryCode)) {
standardNumber = esCode + "/" + esNameCode + " " + categoryCode + "-" + sequenceNumber + "-" + yearNumber;
} else {
standardNumber = esCode + "/" + esNameCode + " " + sequenceNumber + "-" + yearNumber;
}
log.info("组合企标标准号：{}", standardNumber); log.info("组合企标标准号：{}", standardNumber);
return standardNumber; return standardNumber;
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+2 -1
View File
@@ -82,7 +82,8 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
LambdaQueryWrapper<LawsEnterpriseStandard> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsEnterpriseStandard> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(LawsEnterpriseStandard::getStandardCode, esCodeDictValue); lambdaQueryWrapper.eq(LawsEnterpriseStandard::getStandardCode, esCodeDictValue);
lambdaQueryWrapper.eq(LawsEnterpriseStandard::getNameCode, esNameCodeDictValue); lambdaQueryWrapper.eq(LawsEnterpriseStandard::getNameCode, esNameCodeDictValue);
lambdaQueryWrapper.eq(LawsEnterpriseStandard::getCategoryCode, categoryCodeDictValue); lambdaQueryWrapper.eq(StrUtil.isNotBlank(categoryCodeDictValue), LawsEnterpriseStandard::getCategoryCode, categoryCodeDictValue);
lambdaQueryWrapper.isNull(StrUtil.isBlank(categoryCodeDictValue) ,LawsEnterpriseStandard::getCategoryCode);
List<LawsEnterpriseStandard> esList = this.list(lambdaQueryWrapper); List<LawsEnterpriseStandard> esList = this.list(lambdaQueryWrapper);