Merge remote-tracking branch 'origin/develop' into release_temp

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;
 
     /**

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

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

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);