diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index c8b52524f2..5d461dbe41 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/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 = "政协委员徽章"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java index c36124dd7b..be4411c28e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/BadgeEntity.java +++ b/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 = ""; + } 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 4734770a3a..de2f864ff0 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 @@ -253,9 +253,20 @@ public class BadgeServiceImpl extends BaseServiceImpl 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); diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.17__badge_type_update.sql new file mode 100644 index 0000000000..3b1201d8a6 --- /dev/null +++ b/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'; \ No newline at end of file