Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java

@@ -42,7 +42,7 @@ public class IcMessageDTO implements Serializable {
 	private String app;
 
     /**
-     * 消息分类  党建小助手:party
+     * 消息分类   党建活动：party_act   党建日程：party_schedule
      */
 	private String messageType;
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java

@@ -42,7 +42,7 @@ public class IcMessageEntity extends BaseEpmetEntity {
 	private String app;
 
     /**
-     * 消息分类  党建小助手:party
+     * 消息分类   党建活动：party_act   党建日程：party_schedule
      */
 	private String messageType;
 

epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql

@@ -0,0 +1,2 @@
+ALTER TABLE epmet_message.`ic_message`
+MODIFY COLUMN `message_type`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息分类  \r\n党建活动：party_act  \r\n党建日程：party_schedule \r\n' AFTER `app`;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             // 说明数据库已存在此楼栋，不需添加
             nums.add(num);
             disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
+            return;
         }
         if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
             List<String> gridIds = new ArrayList<>();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             // 说明数据库已存在此楼栋，不需添加
             nums.add(num);
             disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
+            return;
         }
         if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
             List<String> gridIds = new ArrayList<>();

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java

@@ -26,4 +26,8 @@ public class GroupDetailResultDTO {
     private String leaderId;
     /** 当前用户是否是群主 */
     private String groupLeaderFlag;
+    /**
+     * 所属党组织
+     */
+    private String partyOrgId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1473,6 +1473,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 		// 1.拼装组基本信息
 		GroupEditSubmitRecordEntity ler = groupEditSubmitRecordDao.getLatestEditSubmitRecord(groupId);
+		ResiGroupEntity group = baseDao.selectById(groupId);
+		if (null != group) {
+			groupDetail.setGroupType(group.getGroupType());
+		}
 
 		if (ler != null) {
 			groupDetail.setAuditStatus(ler.getAuditStatus());
@@ -1484,13 +1488,14 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			groupDetail.setGroupHeadPhoto(ler.getGroupHeadPhoto());
 			groupDetail.setGroupName(ler.getGroupName());
 			groupDetail.setGroupIntroduction(ler.getGroupIntroduction());
+			groupDetail.setPartyOrgId(ler.getPartyOrgId());
 		} else {
 			// 不在审核中，直接显示组信息
 			ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupId);
 			if (resiGroupEntity == null) {
 				return null;
 			}
-
+			groupDetail.setPartyOrgId(resiGroupEntity.getPartyOrgId());
 			groupDetail.setGroupHeadPhoto(resiGroupEntity.getGroupHeadPhoto());
 			groupDetail.setGroupName(resiGroupEntity.getGroupName());
 			groupDetail.setGroupIntroduction(resiGroupEntity.getGroupIntroduction());

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml

@@ -8,6 +8,7 @@
        group_id,
        customer_id,
        grid_id,
+       PARTY_ORG_ID,
        group_head_photo,
        group_name,
        group_introduction,

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -572,7 +572,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
                 StringBuffer str = new StringBuffer();
                 str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
                 msg.setMessageContent(str.toString());
-                msg.setMessageType("party");
+                msg.setMessageType("party_act");
                 msg.setTargetId(formDTO.getIcPartyActId());
                 msg.setUserId(id);
                 msgList.add(msg);
@@ -586,7 +586,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_act");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(entity.getPublishStaffId());
             msgList.add(msg);
@@ -601,7 +601,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_act");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(entity.getPublishStaffId());
             msgList.add(msg);
@@ -616,7 +616,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("日程：").append(schedule.getTitle()).append("\n").append("时间：").append(DateUtils.format(schedule.getHappenedTime(), "yyyy年MM月dd日 HH:mm:ss"));
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_schedule");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(schedule.getStaffId());
             msgList.add(msg);