From 6a43980db548010933d565cc9c2360a74f029b88 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Feb 2024 15:06:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081770=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92--=E5=AF=BC=E5=85=A5--?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E9=83=BD=E6=98=AF=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java          | 4 +---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java        | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 23f54fe9..f92bd370 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -547,15 +547,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
                     item.setDecadeCode(curYearNumber);
                 }
-                // 设置变更状态 制定是新增 修订是变更
-                item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
-                item.setChangeStatus(ESPChangeType.CHANGE.getValue());
                 List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
                 if (esList != null && !esList.isEmpty()) {
                     item.setOriginEnStandardName(esList.get(0).getStandardName());
                 }
             }
+            item.setChangeStatus(ESPChangeType.ADD.getValue());
         });
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 330b11d8..9c8dddb5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -450,15 +450,13 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
                     item.setDecadeCode(curYearNumber);
                 }
-                // 设置变更状态 制定是新增 修订是变更
-                item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
-                item.setChangeStatus(ESPChangeType.CHANGE.getValue());
                 List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
                 if (esList != null && !esList.isEmpty()) {
                     item.setOriginEnStandardName(esList.get(0).getStandardName());
                 }
             }
+            item.setChangeStatus(ESPChangeType.ADD.getValue());
         });
     }