From 874014e8cd65b5dc6c4c2c2568e899b8611cee20 Mon Sep 17 00:00:00 2001
From: Xia Zekun <xiazekun@sinotruk.com>
Date: Wed, 24 Apr 2024 15:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esInitChange/entity/enums/ESPProjectType.java      | 10 ++++++++++
 .../entity/EnterpriseStandardPlanImport.java           |  6 +++---
 .../impl/EnterpriseStandardPlanServiceImpl.java        |  6 ++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java
index 0a00fb52..875e25d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/enums/ESPProjectType.java
@@ -33,4 +33,14 @@ public enum ESPProjectType {
         this.name = name;
         this.value = value;
     }
+
+    public static String getValueByName(String name) {
+        for (ESPProjectType type : ESPProjectType.values()) {
+            if (type.getName().equals(name)) {
+                return type.getValue();
+            }
+        }
+        return ESPProjectType.ENACT.getValue(); // 返回ENACT枚举值对应的value值
+    }
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java
index 48bb51d7..06143e34 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlanImport.java
@@ -13,7 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class EnterpriseStandardPlanImport {
 
     @Excel(name = "*制修订类型", width = 15, orderNum = "0")
-    private String editType;
+    private String applicationCategory;
 
     @Excel(name = "*原企标编号", width = 15, orderNum = "1")
     private String originEnStandardNo;
@@ -87,7 +87,7 @@ public class EnterpriseStandardPlanImport {
      * 判断是否是无用行
      */
     public boolean isBlankRow() {
-        return StringUtils.isBlank(editType) &&
+        return StringUtils.isBlank(applicationCategory) &&
                 StringUtils.isBlank(originEnStandardNo) &&
                 StringUtils.isBlank(newEnStandardNo) &&
                 StringUtils.isBlank(projectStatus) &&
@@ -99,7 +99,7 @@ public class EnterpriseStandardPlanImport {
      * 判断是否是无用行
      */
     public boolean isUselessRow() {
-        return !"制定".equals(editType) && !"修订".equals(editType);
+        return !"制定".equals(applicationCategory) && !"修订".equals(applicationCategory);
     }
 
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
index b8e621b7..39649726 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
@@ -200,6 +200,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
             }
             EnterpriseStandardPlan esp = new EnterpriseStandardPlan();
             try {
+                esp.setApplicationCategory(ESPProjectType.getValueByName(item.getApplicationCategory()));
                 esp.setOriginEnStandardNo(item.getOriginEnStandardNo());
                 esp.setNewEnStandardNo(item.getNewEnStandardNo());
                 esp.setProjectStatus(ESPProjectStatus.getValueByName(item.getProjectStatus()));
@@ -208,6 +209,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
                 esp.setEnStandardCode(item.getEnStandardCode());
                 esp.setEnNameCode(item.getEnNameCode());
                 esp.setStandardCategoryCode(item.getStandardCategoryCode());
+                esp.setDecadeCode(item.getNewEnStandardNo().substring(item.getNewEnStandardNo().length() - 4));
                 esp.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem(), "3"));
                 esp.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
                 esp.setEnStandardClassification(item.getEnStandardClassification());
@@ -231,7 +233,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
                 continue;
             }
             // 制定的，拿新企标编号在企标表里查，查到的话要报错，不予导入，统计并反馈；查不到的，数据正常录入plan表
-            if ("制定".equals(item.getEditType())) {
+            if ("制定".equals(item.getApplicationCategory())) {
                 ManyStandardSelectionBox singleStandard = lawsCommonService.getSingleStandard(esp.getNewEnStandardNo(), null);
                 if (ObjectUtils.isNotEmpty(singleStandard)) {
                     // 查到的话要报错，不予导入，统计并反馈
@@ -246,7 +248,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
                 }
             }
             // 修订的，拿旧企标编号在企标表里查，查不到的要报错，不予导入，统计并反馈；查得到的，数据正常录入plan表
-            if ("修订".equals(item.getEditType())) {
+            if ("修订".equals(item.getApplicationCategory())) {
                 ManyStandardSelectionBox singleStandard = lawsCommonService.getSingleStandard(esp.getOriginEnStandardNo(), null);
                 if (ObjectUtils.isEmpty(singleStandard)) {
                     //查不到的要报错，不予导入