Merge remote-tracking branch 'remotes/origin/dev_badge_0809' into dev

# Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java

@@ -45,4 +45,18 @@ public interface BadgeConstant {
     // 人大代表徽章KEY
     String BADGE_KEY_NPC = "NPC";
 
+    /**
+     * 人大代表的type
+     */
+    String NPC = "npc";
+
+    /**
+     * 政协委员的type
+     */
+    String CPPCC = "cppcc";
+
+    String PARTY_BADGE = "党员徽章";
+    String NPC_BADGE = "人大代表徽章";
+    String CPPCC_BADGE = "政协委员徽章";
+
 }

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

@@ -65,4 +65,6 @@ public class BadgeEntity extends BaseEpmetEntity {
 	 */
 	private Integer sort;
 
+	private String badgeKey = "";
+
 }

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

@@ -253,9 +253,20 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
             badgeEntity.setBadgeName(formDTO.getBadgeName());
             badgeEntity.setBadgeIcon(formDTO.getBadgeIcon());
             badgeEntity.setBadgeStatus(formDTO.getBadgeStatus());
+            if (badgeEntity.getBadgeName().equals(BadgeConstant.PARTY_BADGE)){
+                badgeEntity.setFixationBadgeType(BadgeConstant.PARTY);
+            }
+            if (badgeEntity.getBadgeName().equals(BadgeConstant.NPC_BADGE)){
+                badgeEntity.setFixationBadgeType(BadgeConstant.NPC);
+            }
+            if (badgeEntity.getBadgeName().equals(BadgeConstant.CPPCC_BADGE)){
+                badgeEntity.setFixationBadgeType(BadgeConstant.CPPCC);
+            }
             baseDao.insert(badgeEntity);
         } else {
-            badgeEntity.setBadgeName(formDTO.getBadgeName());
+            if (!formDTO.getBadgeName().equals(BadgeConstant.PARTY_BADGE) && !formDTO.getBadgeName().equals(BadgeConstant.NPC_BADGE) && !formDTO.getBadgeName().equals(BadgeConstant.CPPCC_BADGE)){
+                badgeEntity.setBadgeName(formDTO.getBadgeName());
+            }
             badgeEntity.setBadgeIcon(formDTO.getBadgeIcon());
             badgeEntity.setBadgeStatus(formDTO.getBadgeStatus());
             baseDao.updateBadge(badgeEntity);

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql

@@ -0,0 +1,11 @@
+UPDATE badge
+SET FIXATION_BADGE_TYPE = 'party'
+WHERE ID = '1';
+
+UPDATE badge
+SET FIXATION_BADGE_TYPE = 'npc'
+WHERE ID = '2';
+
+UPDATE badge
+SET FIXATION_BADGE_TYPE = 'cppcc'
+WHERE ID = '3';