From 3e542aa0d39ae5c063b4cb86b94f661c2e7df256 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Jun 2020 15:52:21 +0800
Subject: [PATCH] =?UTF-8?q?epdc=5Fgroup=20=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改动 grid 相关代码
---
 .../modules/group/entity/GroupEntity.java     |  4 +--
 .../service/impl/PoliceServiceImpl.java       |  4 +--
 .../impl/PropertyProjectServiceImpl.java      |  6 ++--
 .../main/resources/mapper/group/GroupDao.xml  | 30 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/entity/GroupEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/entity/GroupEntity.java
index 958fbf8..aff8aba 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/entity/GroupEntity.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/entity/GroupEntity.java
@@ -98,12 +98,12 @@ public class GroupEntity extends DeptScope {
     /**
      * 网格
      */
-	private String grid;
+	private String deptName;
 
     /**
      * 网格ID
      */
-	private Long gridId;
+	private Long deptId;
 
     /**
      * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
index 597f80b..a3dcb1c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java
@@ -385,8 +385,8 @@ public class PoliceServiceImpl extends BaseServiceImpl<PoliceDao, PoliceEntity>
         groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
         groupEntity.setGroupName(gridName + "警民群");
         groupEntity.setGroupCategory(GroupConstant.POLICE_GROUP_CATEGORY);
-        groupEntity.setGrid(gridName);
-        groupEntity.setGridId(gridId);
+        groupEntity.setDeptName(gridName);
+        groupEntity.setDeptId(gridId);
         groupDao.insert(groupEntity);
     }
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
index f6a4c44..a843d8c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyProjectServiceImpl.java
@@ -161,8 +161,8 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
         groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR);
         groupEntity.setGroupName(entity.getProjectName() + "群");
         groupEntity.setGroupCategory(GroupConstant.PROPERTY_GROUP_CATEGORY);
-        groupEntity.setGrid(entity.getGrid());
-        groupEntity.setGridId(Long.parseLong(entity.getGridId()));
+        groupEntity.setDeptName(entity.getGrid());
+        groupEntity.setDeptId(Long.parseLong(entity.getGridId()));
         groupDao.insert(groupEntity);
     }
 
@@ -187,7 +187,7 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD
                 ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
                 groupEntity
         );
-        groupEntity.setGrid(parentAndAllDeptDTO.getGrid());
+        groupEntity.setDeptName(parentAndAllDeptDTO.getGrid());
         groupEntity.setGroupName(groupName);
         groupDao.updateById(groupEntity);
     }
diff --git a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
index 73d4ad3..7950939 100644
--- a/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml
@@ -23,7 +23,7 @@
             AND gp.STATE = #{state}
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (gp.GRID_ID = #{gridId}
+            AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
         </if>
         <if test="streetId != null and streetId != ''">
@@ -58,7 +58,7 @@
             AND gp.STATE = #{state}
         </if>
         <if test="gridId != null and gridId != ''">
-            AND (gp.GRID_ID = #{gridId}
+            AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
         </if>
         <if test="streetId != null and streetId != ''">
@@ -74,7 +74,7 @@
     </select>
 
     <select id="selectListOfRepeatGroupName" resultType="long">
-        SELECT COUNT(ID) amount FROM epdc_group WHERE DEL_FLAG = '0' AND GRID_ID = #{gridId} AND GROUP_NAME = #{groupName}
+        SELECT COUNT(ID) amount FROM epdc_group WHERE DEL_FLAG = '0' AND DEPT_ID = #{gridId} AND GROUP_NAME = #{groupName}
     </select>
 
     <select id="selectOneOfGroupDetail" resultType="com.elink.esua.epdc.dto.group.GroupDetailDTO">
@@ -134,7 +134,7 @@
     <!--			AND tp.DEL_FLAG = '0'-->
     <!--        WHERE-->
     <!--            gp.DEL_FLAG = '0'-->
-    <!--            AND gp.GRID_ID = #{gridId}-->
+    <!--            AND gp.DEPT_ID = #{gridId}-->
     <!--            <![CDATA[ AND gp.STATE <> ]]> 20-->
     <!--        GROUP BY-->
     <!--            gp.ID-->
@@ -196,7 +196,7 @@ CASE
 			WHERE
 				gp.DEL_FLAG = '0'
 				AND gp.STATE <![CDATA[ AND gp.STATE <> ]]> 20
-				AND gp.GRID_ID = #{gridId}
+				AND gp.DEPT_ID = #{gridId}
 			)
 		GROUP BY
 			gp.ID
@@ -234,7 +234,7 @@ ORDER BY
     <!--        WHERE-->
     <!--            gp.DEL_FLAG = '0'-->
     <!--            AND gp.STATE IN ( 10, 15 )-->
-    <!--            AND gp.GRID_ID = #{gridId}-->
+    <!--            AND gp.DEPT_ID = #{gridId}-->
     <!--            AND gp.GROUP_CATEGORY = '1'-->
     <!--            AND gp.ID NOT IN ( SELECT ugp.GROUP_ID FROM epdc_user_group ugp WHERE ugp.USER_ID = #{userId} AND ugp.DEL_FLAG = '0' AND ugp.STATE = 10 )-->
     <!--        GROUP BY-->
@@ -258,7 +258,7 @@ ORDER BY
         WHERE
             gp.DEL_FLAG = '0'
             AND gp.STATE IN ( 10, 15 )
-            AND gp.GRID_ID = #{gridId}
+            AND gp.DEPT_ID = #{gridId}
             AND gp.GROUP_CATEGORY = '1'
             AND gp.ID NOT IN ( SELECT ugp.GROUP_ID FROM epdc_user_group ugp WHERE ugp.USER_ID = #{userId} AND ugp.DEL_FLAG = '0' AND ugp.STATE = 10 )
         GROUP BY
@@ -313,13 +313,13 @@ ORDER BY
             DEL_FLAG = '0'
             AND GROUP_CATEGORY = '3'
             AND STATE IN ( 10, 15, 20 )
-            AND GRID_ID = #{deptId}
+            AND DEPT_ID = #{deptId}
     </select>
 
     <select id="selectListOfGroupByDeptId" resultType="com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO">
         SELECT
-        GRID_ID AS deptId,
-	    GRID AS deptName
+        DEPT_ID AS deptId,
+	    DEPT_NAME AS deptName
         FROM
         epdc_group
         WHERE
@@ -352,7 +352,7 @@ ORDER BY
         gp.DEL_FLAG = '0'
         AND gp.STATE IN ( 10, 15 )
         <if test="gridId != null and gridId != ''">
-            AND (gp.GRID_ID = #{gridId}
+            AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
         </if>
         <if test="streetId != null and streetId != ''">
@@ -389,7 +389,7 @@ ORDER BY
         gp.DEL_FLAG = '0'
         AND gp.STATE IN ( 10, 15 )
         <if test="gridId != null and gridId != ''">
-            AND (gp.GRID_ID = #{gridId}
+            AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
         </if>
         <if test="streetId != null and streetId != ''">
@@ -411,12 +411,12 @@ ORDER BY
     </select>
 
     <select id="selectOnePartyGroupInfoByGridId" resultType="com.elink.esua.epdc.dto.group.GroupDTO">
-        SELECT * FROM epdc_group WHERE DEL_FLAG = '0' AND GROUP_CATEGORY = '0' AND GRID_ID = #{gridId}
+        SELECT * FROM epdc_group WHERE DEL_FLAG = '0' AND GROUP_CATEGORY = '0' AND DEPT_ID = #{gridId}
     </select>
 
     <!--   查询已经建立党员群的网格id -->
     <select id="listPartyMemberGridId" resultType="java.lang.String">
-        select distinct eg.GRID_ID
+        select distinct eg.DEPT_ID
         from epdc_group eg
         where eg.DEL_FLAG='0'
         and eg.GROUP_CATEGORY='0'
@@ -445,7 +445,7 @@ ORDER BY
     </select>
 
     <update id="updateGridByDeptId">
-        UPDATE epdc_group SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
+        UPDATE epdc_group SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId}
     </update>
 
     <select id="selectListOfPartyGroups" resultType="com.elink.esua.epdc.dto.group.GroupDTO">