From 65c1b4b904164b9275cdf59c7b3b26108492bba9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 16 Mar 2022 10:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=9C=AA=E5=AE=A1=E6=A0=B8=E7=9A=84=E5=BE=BD?=
 =?UTF-8?q?=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/BadgeController.java     | 12 ++++++++++++
 .../src/main/java/com/epmet/dao/BadgeDao.java     |  9 +++++++++
 .../main/java/com/epmet/service/BadgeService.java |  9 +++++++++
 .../com/epmet/service/impl/BadgeServiceImpl.java  | 15 +++++++++++++++
 .../src/main/resources/mapper/BadgeDao.xml        | 10 ++++++++++
 5 files changed, 55 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
index e25083f669..7c02a9df9d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
@@ -206,4 +206,16 @@ public class BadgeController {
 		List<ListUserByBadgeResultDTO> users = badgeService.listUsersByBadge(customerId, badgeKey);
 		return new Result<List<ListUserByBadgeResultDTO>>().ok(users);
 	}
+
+	/**
+	 * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+	 * @param gridId
+	 * @author zxc
+	 * @date 2022/3/16 9:42 上午
+	 */
+	@PostMapping("audit-reset")
+	public Result<Boolean> badgeAuditReset(@RequestParam("gridId")String gridId){
+		return new Result<Boolean>().ok(badgeService.badgeAuditReset(gridId));
+	}
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
index d2a10f7026..113ed28dee 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java
@@ -204,4 +204,13 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2021.08.02 10:40
 	*/
     List<ListUserByBadgeResultDTO> listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey);
+
+    /**
+     * Desc: 查询网格下的徽章审核个数
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/16 9:52 上午
+     */
+	Integer badgeAuditReset(@Param("gridId") String gridId);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
index fc06714fd9..4b2252b51c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
@@ -200,4 +200,13 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @date 2021.08.02 10:39
     */
     List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey);
+
+    /**
+     * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/16 9:42 上午
+     */
+    Boolean badgeAuditReset(String gridId);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
index de2f864ff0..5667c6d401 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
@@ -495,4 +495,19 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     public List<ListUserByBadgeResultDTO> listUsersByBadge(String customerId, String badgeKey) {
         return baseDao.listUsersByBadge(customerId, badgeKey);
     }
+
+    /**
+     * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+     * @param gridId
+     * @author zxc
+     * @date 2022/3/16 9:42 上午
+     */
+    @Override
+    public Boolean badgeAuditReset(String gridId) {
+        Integer badgeAuditCount = baseDao.badgeAuditReset(gridId);
+        if (badgeAuditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
index 09c84bde81..275babd61f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
@@ -330,4 +330,14 @@
                             and user_base_info.DEL_FLAG = 0)
 
     </select>
+
+    <!-- 查询网格下的徽章审核个数 -->
+    <select id="badgeAuditReset" resultType="java.lang.Integer">
+        SELECT
+            COUNT(ID)
+        FROM user_badge_certificate_record
+        WHERE DEL_FLAG = '0'
+          AND AUDIT_STATUS = 'auditing'
+          AND GRID_ID = #{gridId}
+    </select>
 </mapper>
\ No newline at end of file