From 4c95d193732ed4ba9976649472153f256b6695c0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 Jul 2022 19:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/dto/form/ExractGridInfoPingYinFormDTO.java   | 4 +++-
 .../opendata/service/impl/GridInfoPingyinServiceImpl.java | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/ExractGridInfoPingYinFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/ExractGridInfoPingYinFormDTO.java
index d57c25a387..b4324bb2ee 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/ExractGridInfoPingYinFormDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/ExractGridInfoPingYinFormDTO.java
@@ -30,9 +30,11 @@ public class ExractGridInfoPingYinFormDTO implements Serializable {
     private List<String> orgIdList;
 
     /**
-     * 操作类型【新增:add 修改删除:edit  初始化所有数据:all】
+     * 废弃：这个不对。操作类型【新增:add 修改删除:edit  初始化所有数据:all】
+     * 操作类型【组织新增:agency_create 组织变更:agency_change  网格新增:grid_create 网格变更:grid_change  人员新增:staff_create 人员变更:staff_change】
      */
     @NotBlank(message = "操作类型【新增:add 修改删除:edit  初始化所有数据:all】不能为空", groups = {GridInfo.class})
+
     private String type;
 }
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
index d9e505adef..b7a15afd09 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
@@ -80,11 +80,11 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
                 this.insertBatch(list);
             });
 
-        } else if ("add".equals(formDTO.getType())) {
+        } else if (formDTO.getType().contains("create")) {
             // 单独新增组织
             this.insertBatch(gridInfoList);
 
-        } else if ("edit".equals(formDTO.getType())) {
+        } else if (formDTO.getType().contains("change")) {
             // 修改组织时，先根据code查询，如果有数据，更新
             for (GridInfoPingyinEntity entity : gridInfoList) {
 
@@ -153,11 +153,11 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             partition.forEach(list -> {
                 this.insertBatch(list);
             });
-        } else if ("add".equals(formDTO.getType())) {
+        } else if (formDTO.getType().contains("create")) {
             // 单独新增组织
             this.insertBatch(gridInfoList);
 
-        } else if ("edit".equals(formDTO.getType())) {
+        } else if (formDTO.getType().contains("change")) {
             // 修改组织时，先根据code查询，如果有数据，更新
             for (GridInfoPingyinEntity entity : gridInfoList) {