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

fix: 修复获取企标编号Bug

Browse Source
This commit is contained in:
mzaxd
2023-10-12 11:34:28 +08:00
parent 0b5dad2efb
commit c612aaf797
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+1
View File
@@ -46,6 +46,7 @@ public class ProcessESInitChangeController {
map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode()); map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode());
map.put(FieldCommon.ENTERPRISE_NAME_CODE, esInitChange.getEnNameCode()); map.put(FieldCommon.ENTERPRISE_NAME_CODE, esInitChange.getEnNameCode());
map.put(FieldCommon.STANDARD_CATEGORY_CODE, esInitChange.getStandardCategoryCode()); map.put(FieldCommon.STANDARD_CATEGORY_CODE, esInitChange.getStandardCategoryCode());
map.put(FieldCommon.YEAR_NUMBER, esInitChange.getDecadeCode());
return Result.OK(esUtil.generateStandardNumber(map)); return Result.OK(esUtil.generateStandardNumber(map));
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+2 -2
View File
@@ -1,6 +1,5 @@
package com.jero.modules.activiti.process.esInitChange.service.impl; package com.jero.modules.activiti.process.esInitChange.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
@@ -142,8 +141,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
} }
// 设置流程变量 // 设置流程变量
map.put("pass", pass); map.put("pass", pass);
// TODO 保存流程审批信息
actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId, map); actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId, map);
// TODO 保存流程审批信息
} }
@Override @Override
laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+1 -2
View File
@@ -74,6 +74,7 @@ public class EnterpriseStandardUtil {
String esCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_STANDARD_CODE); String esCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_STANDARD_CODE);
String esNameCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_NAME_CODE); String esNameCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_NAME_CODE);
String categoryCodeDictValue = (String) parameterMap.get(FieldCommon.STANDARD_CATEGORY_CODE); String categoryCodeDictValue = (String) parameterMap.get(FieldCommon.STANDARD_CATEGORY_CODE);
String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER);
// 根据 标准代号/名称代号/标准类别 的相关性生成顺序号 // 根据 标准代号/名称代号/标准类别 的相关性生成顺序号
String sequenceNumber = this.generateNewSequenceNumber(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue); String sequenceNumber = this.generateNewSequenceNumber(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue);
@@ -82,8 +83,6 @@ public class EnterpriseStandardUtil {
String esNameCode = this.transEsNameCode(esNameCodeDictValue); String esNameCode = this.transEsNameCode(esNameCodeDictValue);
String categoryCode = this.transCategoryCode(categoryCodeDictValue); String categoryCode = this.transCategoryCode(categoryCodeDictValue);
String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER);
// 最后生成的企标编号 // 最后生成的企标编号
String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + sequenceNumber + "-" + yearNumber; String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + sequenceNumber + "-" + yearNumber;
log.info("生成企标标准号：{}", standardNumber); log.info("生成企标标准号：{}", standardNumber);