From 7a6e48263978aeab69900b7bf195d32fe74d1b06 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 3 Nov 2020 15:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=BB=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC=E5=86=85=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=98=E5=9C=A8=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/group/dao/ResiGroupDao.java | 13 ++++++++++++
 .../service/impl/ResiGroupServiceImpl.java    |  7 ++++++-
 .../resources/mapper/group/ResiGroupDao.xml   | 21 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index 867a3d11ba..57fd94d9ab 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -188,4 +188,17 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @date 2020.05.22 09:54
 	**/
 	List<ResiGroupDTO> selectGroupListByGridIds(@Param("gridIds") List<String> gridIds);
+
+	/**
+	 * 编辑提交的时候，检查组名是否存在。网格内检查，
+	 * 		检查resi_group中已审核通过的和待审核的
+	 * 		检查submit_record中待审核的。已审核的不用检查，因为已经更新到resi_group中了
+	 * @param groupId
+	 * @param gridId
+	 * @param groupName
+	 * @return
+	 */
+	int countExistsGroupNameBeforeEdit(@Param("groupId") String groupId,
+									   @Param("gridId") String gridId,
+									   @Param("groupName") String groupName);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index b3bb7d4a5e..624f0f73ef 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -1064,8 +1064,13 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), "该组已提交编辑，处于待审核状态，完成审核前不可再次提交");
 		}
 
+		if (resiGroupDao.countExistsGroupNameBeforeEdit(groupId, group.getGridId(), groupName) > 0) {
+			// 已存在组名，拒绝提交
+			throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), "组名已存在");
+		}
+
 		// 2.内容检查
-		scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto);
+		//scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto);
 
 		String app = loginUserUtil.getLoginUserApp();
 		String userId = loginUserUtil.getLoginUserId();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 119db46b30..94c2422159 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -397,4 +397,25 @@
                 GRID_ID = #{gridId}
             </foreach>
     </select>
+
+    <select id="countExistsGroupNameBeforeEdit" resultType="java.lang.Integer">
+        select sum(t.c) num
+        from (
+                 select count(1) c
+                 from resi_group g
+                 where g.GROUP_NAME = #{groupName}
+                   and g.DEL_FLAG = 0
+                   and g.GRID_ID = #{gridId}
+                   and g.ID != #{groupId}
+                   and g.STATE in ('approved', 'under_auditting')
+                 union all
+                 select count(1) c
+                 from group_edit_submit_record esr
+                 where esr.GROUP_ID != #{groupId}
+                   and esr.GRID_ID = #{gridId}
+                   and esr.GROUP_NAME = #{groupName}
+                   and esr.AUDIT_STATUS = 'under_auditting'
+                   and esr.DEL_FLAG = 0
+             ) t
+    </select>
 </mapper>