From 908015530d6b6adecc755316d5226752f4474543 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Aug 2021 15:54:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/BadgeConstant.java | 14 ++++++++++++++ .../com/epmet/service/impl/BadgeServiceImpl.java | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) 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 3be3ce02c3..2a1f89b16c 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 @@ -42,4 +42,18 @@ public interface BadgeConstant { String DEFAULT = "default"; + /** + * 人大代表的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/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index dcdd39d4f1..bb28900479 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); From 41e9130165ccb89ed2eb5c6baa0a071273d80253 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Aug 2021 16:05:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?badgeKey=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/BadgeEntity.java | 2 ++ 1 file changed, 2 insertions(+) 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 = ""; + } From 346adcef6b7b7bde3f22a77fcf5c2d7f307b8cbe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 9 Aug 2021 16:20:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E8=BD=AC=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E5=86=85=E9=83=A8=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/EventToProjectFormDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java index 758b7acbbb..560ebfe2d8 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventToProjectFormDTO.java @@ -38,8 +38,9 @@ public class EventToProjectFormDTO implements Serializable { private String publicReply; /** * 内部备注 1000 + * 21.08.09 直接立项的内部备注是必填的，然后议题转项目和我要直报转项目的都是非必填的 */ - @Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class}) + //@Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class}) private String internalRemark; /**