From 5266e9ee8b52fadfb8cc7de7a759dddba8b6f7bf Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 27 Sep 2022 09:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/ItemHandleProcessDTO.java   |  2 +-
 .../epdc/enums/ItemGridPlatformDictEnum.java  | 48 +++++++++++++++++++
 .../item/entity/ItemHandleProcessEntity.java  |  2 +-
 .../item/service/impl/ItemServiceImpl.java    |  3 +-
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformDictEnum.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java
index 14f8fa20b..e145ade98 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java
@@ -111,7 +111,7 @@ public class ItemHandleProcessDTO implements Serializable {
     private String gridDelayhour;
 
     /**
-     * 网格化平台-延期审核结果，同意/不同意
+     * 网格化平台-延期审核结果，有 1:同意/0:不同意/空String 三种
      */
     private String gridDelayresult;
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformDictEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformDictEnum.java
new file mode 100644
index 000000000..d72801ca5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformDictEnum.java
@@ -0,0 +1,48 @@
+package com.elink.esua.epdc.enums;
+
+/**
+ * 网格化平台枚举类
+ *
+ * @author zhy
+ * @date 2022/9/27 9:43
+ */
+public enum ItemGridPlatformDictEnum {
+
+	HANDLE_SQ("1", "同意"),
+	HANDLE_OTHER("0", "不同意");
+
+
+	private String value;
+	private String name;
+
+	ItemGridPlatformDictEnum(String value, String name) {
+		this.value = value;
+		this.name = name;
+	}
+
+	public static String getValueByName(String name) {
+		ItemGridPlatformDictEnum[] enums = ItemGridPlatformDictEnum.values();
+		for (ItemGridPlatformDictEnum anEnum : enums) {
+			if (anEnum.name.equals(name)) {
+				return anEnum.value;
+			}
+		}
+		return "";
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java
index 20454b307..f28974260 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemHandleProcessEntity.java
@@ -132,7 +132,7 @@ public class ItemHandleProcessEntity extends BaseEpdcEntity {
 	private String gridDelayhour;
 
 	/**
-	 * 网格化平台-延期审核结果，同意/不同意
+	 * 网格化平台-延期审核结果，有 1:同意/0:不同意/空String 三种
 	 */
 	private String gridDelayresult;
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 249633350..27d522355 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -60,6 +60,7 @@ import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
 import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO;
 import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO;
+import com.elink.esua.epdc.enums.ItemGridPlatformDictEnum;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
 import com.elink.esua.epdc.enums.KpiMetaDataEnum;
@@ -2459,7 +2460,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemHandleProcessDto.setGridCantoncode(dto.getCANTONCODE());
                 itemHandleProcessDto.setGridNextcantoncode(dto.getNEXTCANTONCODE());
                 itemHandleProcessDto.setGridDelayhour(dto.getDELAYHOUR());
-                itemHandleProcessDto.setGridDelayresult(dto.getDELAYRESULT());
+                itemHandleProcessDto.setGridDelayresult(ItemGridPlatformDictEnum.getValueByName(dto.getDELAYRESULT()));
                 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
                     Result<String> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
                     String zoneCode = result.getData();