Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/BadgeDTO.java

@@ -63,6 +63,11 @@ public class BadgeDTO implements Serializable {
      */
 	private String badgeStatus;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
     /**
      * 删除标识 1删除；0未删除
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java

@@ -28,4 +28,8 @@ public class BadgeListResultDTO {
 	 * 徽章状态 上线:online;下线:offline;
 	 */
 	private String badgeStatus;
+	/**
+	 * 固有徽章类型 党员徽章：party;无：none
+	 */
+	private String type;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java

@@ -43,12 +43,13 @@ public class UserBadgeListResultDTO implements Serializable {
     @JsonIgnore
     private Integer sort;
     @JsonIgnore
-    private Date updatedTime;
+    private Long updatedTime;
 
     public UserBadgeListResultDTO() {
         this.badgeId = "";
         this.badgeIcon = "";
         this.isOpened = "0";
         this.status = false;
+        this.updatedTime = 0L;
     }
 }

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

@@ -153,7 +153,7 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	/**
 	 * 插入数据
 	 *
-	 * @param entity
+	 * @param dto
 	 * @return void
 	 * @author zhaoqifeng
 	 * @date 2020/11/6 14:46

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

@@ -24,6 +24,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.exception.ValidateException;
@@ -268,6 +269,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
             BadgeDTO badgeDTO = ConvertUtils.sourceToTarget(badgeEntity, BadgeDTO.class);
             badgeDTO.setCustomerId(tokenDto.getCustomerId());
             badgeDTO.setDelFlag(NumConstant.ONE_STR);
+            badgeDTO.setRevision(NumConstant.ZERO);
             badgeDTO.setCreatedBy(tokenDto.getUserId());
             badgeDTO.setCreatedTime(new Date());
             badgeDTO.setUpdatedBy(tokenDto.getUserId());

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

@@ -99,7 +99,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             }
         });
         if (!CollectionUtils.isEmpty(noOpenBadge)){
-            userBadgeListResultDTOS.addAll(noOpenBadge.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList()));
+            userBadgeListResultDTOS.addAll(noOpenBadge);
         }
         return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened).reversed().thenComparing(UserBadgeListResultDTO::getUpdatedTime).reversed().thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
     }

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

@@ -25,6 +25,7 @@
              `BADGE_ICON`,
              `FIXATION_BADGE_TYPE`,
              `BADGE_STATUS`,
+             `SORT`,
              `DEL_FLAG`,
              `REVISION`,
              `CREATED_BY`,
@@ -38,6 +39,7 @@
             #{badgeIcon},
             #{fixationBadgeType},
             #{badgeStatus},
+            #{sort},
             #{delFlag},
             #{revision},
             #{createdBy},
@@ -64,7 +66,8 @@
             ID AS "badgeId",
             BADGE_NAME,
             BADGE_ICON,
-            BADGE_STATUS
+            BADGE_STATUS,
+            FIXATION_BADGE_TYPE AS "type"
         FROM
             (
                 SELECT * FROM badge
@@ -138,7 +141,8 @@
         WHERE BADGE_NAME = #{badgeName} AND badgeId != #{badgeId}
     </select>
     <select id="selectBadgeInfo" resultType="com.epmet.entity.BadgeEntity">
-        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 ID,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

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

@@ -29,7 +29,7 @@
             ub.IS_OPENED,
             b.FIXATION_BADGE_TYPE as badgeType,
             b.sort,
-            ub.UPDATED_TIME
+            UNIX_TIMESTAMP(ub.updated_time) AS updatedTime
         FROM resi_user_badge ub
         LEFT JOIN badge b ON b.ID = ub.BADGE_ID
         WHERE ub.DEL_FLAG = '0'