badge-options

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;
 }

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()));
+	}
 }

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);
 }

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;
+    }
 }

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