From c612aaf797824c81a7125a10d21e9264c6be220e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 12 Oct 2023 11:34:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProcessESInitChangeController.java             | 1 +
 .../service/impl/ProcessEsInitChangeServiceImpl.java          | 4 ++--
 .../modules/laws/enterprise/util/EnterpriseStandardUtil.java  | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
index 2ee70b2c..e411ca2d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
@@ -46,6 +46,7 @@ public class ProcessESInitChangeController {
         map.put(FieldCommon.ENTERPRISE_STANDARD_CODE, esInitChange.getEnStandardCode());
         map.put(FieldCommon.ENTERPRISE_NAME_CODE, esInitChange.getEnNameCode());
         map.put(FieldCommon.STANDARD_CATEGORY_CODE, esInitChange.getStandardCategoryCode());
+        map.put(FieldCommon.YEAR_NUMBER, esInitChange.getDecadeCode());
         return Result.OK(esUtil.generateStandardNumber(map));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index b6da6493..809741e6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -1,6 +1,5 @@
 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.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
@@ -142,8 +141,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         }
         // 设置流程变量
         map.put("pass", pass);
-        // TODO 保存流程审批信息
         actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId, map);
+        // TODO 保存流程审批信息
+
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
index 2f7a470d..1f752193 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
@@ -74,6 +74,7 @@ public class EnterpriseStandardUtil {
         String esCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_STANDARD_CODE);
         String esNameCodeDictValue = (String) parameterMap.get(FieldCommon.ENTERPRISE_NAME_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);
@@ -82,8 +83,6 @@ public class EnterpriseStandardUtil {
         String esNameCode = this.transEsNameCode(esNameCodeDictValue);
         String categoryCode = this.transCategoryCode(categoryCodeDictValue);
 
-        String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER);
-
         // 最后生成的企标编号
         String standardNumber = esCode + "/" + esNameCode + " " + categoryCode + sequenceNumber + "-" + yearNumber;
         log.info("生成企标标准号：{}", standardNumber);