From 031e4440eace6412f9470f8b16a965dad6a7794c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jan 2024 11:21:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  | 23 ++++++++++---------
 .../ProcessEsAnnualReportServiceImpl.java     | 20 ++++++++++------
 2 files changed, 25 insertions(+), 18 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 27be26f2..04c75977 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
@@ -15,11 +15,9 @@ import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
 import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO;
-import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitFlowUserVO;
 import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService;
 import com.jero.modules.activiti.process.esAnnualInit.mapper.ProcessEsAnnualInitMapper;
-import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
-import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPChangeType;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
@@ -529,20 +527,25 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) {
                 item.setOriginEnStandardName(null);
                 item.setOriginEnStandardNo(null);
+                String decadeCode = item.getDecadeCode();
+                if (StrUtil.isBlank(decadeCode)) {
+                    // 获取当前年份
+                    Calendar date = Calendar.getInstance();
+                    String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
+                    item.setDecadeCode(curYearNumber);
+                }
                 // 设置变更状态 制定是新增 修订是变更
-                item.setChangeStatus("1");
+                item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
-                item.setChangeStatus("2");
-                item.setOriginEnStandardNo(esMap.get(item.getOriginEnStandardNo()).getStandardName());
-                item.setEnStandardCode(esMap.get(item.getOriginEnStandardNo()).getStandardCode());
-                item.setEnNameCode(esMap.get(item.getOriginEnStandardNo()).getNameCode());
-                item.setStandardCategoryCode(esMap.get(item.getOriginEnStandardNo()).getCategoryCode());
+                item.setChangeStatus(ESPChangeType.CHANGE.getValue());
             }
         });
     }
 
     private void transToDictValue(List<ProcessEsAnnualInit> list, List<SysDictItemCore> listDict) {
         list.forEach(item -> {
+            item.setProjectType(excelUtils.translateDictValue("esp_revision_type", item.getProjectType(), listDict));
+            item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
             item.setAuthDept(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getAuthDept(), listDict));
             item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
             item.setMainDraftingUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUser(), listDict));
@@ -552,10 +555,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             item.setEnStandardSystem(excelUtils.translateDictValue("node_name", "id", "laws_tree_node", item.getEnStandardSystem(), listDict));
             item.setContactUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getContactUser(), listDict));
             item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
-            item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
             item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
             item.setComponentName(excelUtils.translateDictValue("part_name", item.getComponentName(), listDict));
-            item.setProjectType(excelUtils.translateDictValue("esp_revision_type", item.getProjectType(), listDict));
             item.setDraftPlannedCompleteDate(importUtil.convertDate(item.getDraftPlannedCompleteDateString()));
             item.setSolicitationDraftPlanCompleteDate(importUtil.convertDate(item.getSolicitationDraftPlanCompleteDateString()));
             item.setPlanApprovalDate(importUtil.convertDate(item.getPlanApprovalDateString()));
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 b247b658..2a95291e 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
@@ -16,6 +16,7 @@ import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualRe
 import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO;
 import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper;
 import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPChangeType;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
@@ -406,14 +407,17 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) {
                 item.setOriginEnStandardName(null);
                 item.setOriginEnStandardNo(null);
+                String decadeCode = item.getDecadeCode();
+                if (StrUtil.isBlank(decadeCode)) {
+                    // 获取当前年份
+                    Calendar date = Calendar.getInstance();
+                    String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
+                    item.setDecadeCode(curYearNumber);
+                }
                 // 设置变更状态 制定是新增 修订是变更
-                item.setChangeStatus("1");
+                item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
-                item.setChangeStatus("2");
-                item.setOriginEnStandardName(esMap.get(item.getOriginEnStandardNo()).getStandardName());
-                item.setEnStandardCode(esMap.get(item.getOriginEnStandardNo()).getStandardCode());
-                item.setEnNameCode(esMap.get(item.getOriginEnStandardNo()).getNameCode());
-                item.setStandardCategoryCode(esMap.get(item.getOriginEnStandardNo()).getCategoryCode());
+                item.setChangeStatus(ESPChangeType.CHANGE.getValue());
             }
         });
     }
@@ -428,8 +432,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
             item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
             item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
             item.setEnStandardSystem(excelUtils.translateDictValue("node_name", "id", "laws_tree_node", item.getEnStandardSystem(), listDict));
+            item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
+            item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
+            item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
             item.setDraftPlannedCompleteDate(importUtil.convertDate(item.getDraftPlannedCompleteDateString()));
             item.setSolicitationDraftPlanCompleteDate(importUtil.convertDate(item.getSolicitationDraftPlanCompleteDateString()));
             item.setPlanApprovalDate(importUtil.convertDate(item.getPlanApprovalDateString()));

From 9401d3a6afd68a7b63552d198b0c6da06c7c6f59 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jan 2024 11:53:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=2079978=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9--=E8=BE=85=E5=8A=A9=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=B8=8E=E5=8E=9F=E5=9E=8B=E5=AD=97=E6=AE=B5=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esInitChange/entity/ProcessEsInitChange.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
index 209a6a3c..de8fe6d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
@@ -502,6 +502,14 @@ public class ProcessEsInitChange implements Serializable {
     @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;
 
+    /**
+     * 隶属工作组
+     */
+    @Dict(dictTable = "laws_working_group", dicCode = "id", dicText = "name")
+    @ApiModelProperty(value = "隶属工作组")
+    private String workGroup;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1781238971297838971L;
 }
\ No newline at end of file