From 3e1e89ff3dd315ad546d7dd55265fa274c367408 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 2 Nov 2023 18:58:23 +0800
Subject: [PATCH 1/3] fix: 78112
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

企标计划导出，新企标编号在最后了，能否放在原企标编号后边
---
 .../laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
index e928bf97..cdb9abf1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
@@ -34,7 +34,7 @@ public class EnterpriseStandardPlanVo {
     @ApiModelProperty(value = "原企标编号")
     private String originEnStandardNo;
 
-    @Excel(name = "新企标编号", width = 15, orderNum = "2")
+    @Excel(name = "新企标编号", width = 15, orderNum = "1")
     @ApiModelProperty(value = "新企标编号")
     private String newEnStandardNo;
 

From 8436a8e541ff46730c76a1399e71bb80b95c5c36 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 3 Nov 2023 09:47:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=80=81=E6=B3=95=E8=A7=84=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=AF=BC=E5=85=A5=E5=9B=BD=E6=A0=87=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsEnterpriseStandardServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
index 54eb4e15..33013f9f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
@@ -179,7 +179,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
         if (esDatalist.isEmpty()) {
             log.info("企标数据为空，跳过导入");
         } else {
-            this.oldSysESImport(esDatalist);
+//            this.oldSysESImport(esDatalist);
         }
         // 导入国标
         // 判断是否需要跳过
@@ -214,7 +214,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             gb.setReleaseDate(dto.getFbrq());
             gb.setImplementationDate(dto.getSsrq());
             String standardState = dto.getBzzt();
-            gb.setStandardState(standardState.equals("现行有效") ? "8" : "9");
+            gb.setStandardState(standardState.equals("现行有效") ? "6" : "7");
             // 代替被代替特殊逻辑
             gb.setSubstituteStandardNumber(dto.getTdbzh());
             gb.setReplacedByStandardNumber(dto.getBtdbzh());

From 42d774e3a550189508e802f452dd5861a9eb2566 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 3 Nov 2023 11:18:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update=20=E7=94=9F=E6=88=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8A=82=E7=82=B9=E6=97=B6=EF=BC=8C=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/activiti/service/ProcessModelNodeService.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
index 1add4db2..ef1d15ab 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessModelNodeService.java
@@ -318,6 +318,8 @@ public class ProcessModelNodeService extends ServiceImpl<ProcessModelNodeMapper,
         userTaskNode.setNodeName(userTask.getName());
         userTaskNode.setNodeType("userTask");
         userTaskNode.setXmlNodeId(userTask.getId());
+        userTaskNode.setVariableType("string");
+        userTaskNode.setVariableName(userTask.getId());
         userTaskNode.setSort(sort);
         userTaskNode.setIsApprovalNode(1);
         userTaskNode.setIsCanDeleted(1);