小组详情

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,10 +1473,15 @@ 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());
 			groupDetail.setRemark(ler.getRemark());
+			groupDetail.setPartyOrgId(ler.getPartyOrgId());
 		}
 
 		if (ler != null && GroupAuditStatusConstant.UNDER_AUDITING.equals(ler.getAuditStatus())) {

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,