From 20d9017c0cf2dc72aa2eef43f03e82a05cc52f50 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 6 Mar 2023 12:51:26 +0800
Subject: [PATCH] badge-options

---
 .../com/epmet/dto/result/BadgeListResultDTO.java     |  1 +
 .../java/com/epmet/controller/BadgeController.java   |  8 ++++++++
 .../main/java/com/epmet/service/BadgeService.java    |  7 +++++++
 .../com/epmet/service/impl/BadgeServiceImpl.java     | 12 ++++++++++++
 .../src/main/resources/mapper/BadgeDao.xml           |  3 ++-
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java
index 8374a6497e..015f0d9422 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java
@@ -32,4 +32,5 @@ public class BadgeListResultDTO {
 	 * 固有徽章类型 党员徽章：party;无：none
 	 */
 	private String type;
+	private String customerId;
 }
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 9e7f7c1582..151302844d 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
@@ -247,4 +247,12 @@ public class BadgeController {
 		return new Result<Integer>().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId));
 	}
 
+	/**
+	 * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件
+	 * @return
+	 */
+	@PostMapping("badge-options")
+	public Result<List<BadgeListResultDTO>> queryBadgeOptions(@LoginUser TokenDto tokenDto){
+		return new Result<List<BadgeListResultDTO>>().ok(badgeService.queryBadgeOptions(tokenDto.getCustomerId()));
+	}
 }
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 d1c1dde3c2..88cfbfee15 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
@@ -222,4 +222,11 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @return
      */
     PageData<BadgeAuditRecordResultDTO> auditPageList(BadgeAuditPageFormDTO formDTO);
+
+    /**
+     * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件
+     * @param customerId
+     * @return
+     */
+    List<BadgeListResultDTO> queryBadgeOptions(String customerId);
 }
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 3d1ca56f86..e6721412b8 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
@@ -544,4 +544,16 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         PageInfo<BadgeAuditRecordResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    /**
+     * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件
+     *
+     * @param customerId
+     * @return
+     */
+    @Override
+    public List<BadgeListResultDTO> queryBadgeOptions(String customerId) {
+        List<BadgeListResultDTO> list=baseDao.selectList(customerId);
+        return list;
+    }
 }
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 780e87a5c4..2d9d49fd74 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
@@ -67,7 +67,8 @@
             BADGE_NAME,
             BADGE_ICON,
             BADGE_STATUS,
-            FIXATION_BADGE_TYPE AS "type"
+            FIXATION_BADGE_TYPE AS "type",
+            CUSTOMER_ID as customerId
         FROM
             (
                 SELECT * FROM badge