徽章添加 排序

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -177,4 +177,14 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2020/11/18 10:43 上午
 	 */
 	String getPartyBadgeId(@Param("customerId") String customerId);
+
+	/**
+	 * desc: 获取下一次排序号
+	 *
+	 * @param customerId
+	 * @return int
+	 * @author LiuJanJun
+	 * @date 2020/11/19 10:18 上午
+	 */
+	int selectNextSort(@Param("customerId") String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 徽章
  *
@@ -53,14 +50,19 @@ public class BadgeEntity extends BaseEpmetEntity {
      */
 	private String badgeIcon;
 
-    /**
-     * 固有徽章类型 前端页面跳转标识，党员徽章：party;无：none
-     */
+	/**
+	 * 固有徽章类型 前端页面跳转标识，党员徽章：party;无：none
+	 */
 	private String fixationBadgeType;
 
-    /**
-     * 状态 上线:online;下线:offline;
-     */
+	/**
+	 * 状态 上线:online;下线:offline;
+	 */
 	private String badgeStatus;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -163,9 +163,11 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         if (CollectionUtils.isNotEmpty(list)) {
             throw new RenException(EpmetErrorCode.DUPLICATE_BADGE_NAME.getCode());
         }
+        int nextSort = baseDao.selectNextSort(tokenDto.getCustomerId());
         BadgeEntity entity = ConvertUtils.sourceToTarget(formDTO, BadgeEntity.class);
         entity.setCustomerId(tokenDto.getCustomerId());
         entity.setFixationBadgeType(BadgeConstant.NONE);
+        entity.setSort(nextSort);
         insert(entity);
         //保存徽章认证配置
         List<BadgeCertificationConfigEntity> badgeList = new ArrayList<>();
@@ -220,7 +222,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
 
         BadgeEntity badgeEntity = baseDao.selectBadgeInfo(tokenDto.getCustomerId(), formDTO.getBadgeId());
         if (null == badgeEntity) {
-            badgeEntity = baseDao.selectBadgeInfo("default", formDTO.getBadgeId());
+            badgeEntity = baseDao.selectBadgeInfo(BadgeConstant.DEFAULT_CUSTOMER, formDTO.getBadgeId());
             badgeEntity.setCustomerId(tokenDto.getCustomerId());
             badgeEntity.setBadgeName(formDTO.getBadgeName());
             badgeEntity.setBadgeIcon(formDTO.getBadgeIcon());

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -75,7 +75,7 @@
                   AND NOT EXISTS
                     ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)) t
         ORDER BY
-            CREATED_TIME DESC
+                SORT
     </select>
     <select id="getDuplicateName" resultType="com.epmet.dto.result.BadgeListResultDTO">
         SELECT
@@ -138,7 +138,7 @@
         WHERE BADGE_NAME = #{badgeName} AND badgeId != #{badgeId}
     </select>
     <select id="selectBadgeInfo" resultType="com.epmet.entity.BadgeEntity">
-        select * from badge where DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND ID = #{badgeId}
+        select CUSTOMER_ID,BADGE_NAME,BADGE_ICON,FIXATION_BADGE_TYPE,SORT,BADGE_STATUS from badge where DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND ID = #{badgeId}
     </select>
     <select id="selectAuditingList" resultType="com.epmet.dto.result.BadgeAuditingResultDTO">
         SELECT
@@ -284,4 +284,14 @@
             AND FIXATION_BADGE_TYPE = 'party'
         order by CREATED_TIME desc  LIMIT 1
     </select>
+
+    <select id="selectNextSort" resultType="int">
+        SELECT
+            ifnull(max(sort),0)+1
+        FROM
+            badge
+        WHERE
+            DEL_FLAG = '0'
+          AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default')
+    </select>
 </mapper>