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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/CommonGridAndPageFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.resi.group.dto.group.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 通用网格分页传参DTO
+ * @ClassName CommonGridAndPageFormDTO
+ * @Auth wangc
+ * @Date 2020-11-02 17:22
+ */
+@Data
+public class CommonGridAndPageFormDTO implements Serializable {
+    private static final long serialVersionUID = -7916909736115741017L;
+
+    public interface GridPageGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格Id不能为空" , groups = GridPageGroup.class)
+    private String gridId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页多少条数
+     */
+    private Integer pageSize;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupEditionAuditFormDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.resi.group.dto.group.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 组信息修改审核入参DTO
+ * @ClassName GroupEditionAuditFormDTO
+ * @Auth wangc
+ * @Date 2020-11-02 17:30
+ */
+@Data
+public class GroupEditionAuditFormDTO implements Serializable {
+    private static final long serialVersionUID = 3851649860177395296L;
+
+    public interface GroupEditionAuditGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 组Id
+     */
+    @NotBlank(message = "组Id不能为空",groups = GroupEditionAuditGroup.class)
+    private String groupId;
+
+    /**
+     * 审核结果 审核结果。approved：支持;rejected:拒绝
+     */
+    @NotBlank(message = "审核结果不能为空",groups = GroupEditionAuditGroup.class)
+    private String auditResult;
+
+    /**
+     * 拒绝时的备注
+     */
+    private String remark;
+
+    /**
+     * 工作人员Id
+     */
+    @NotBlank(message = "工作人员Id不能为空",groups = GroupEditionAuditGroup.class)
+    private String staffId;
+}

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

@@ -0,0 +1,46 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 工作端 - 群组审核列表返参DTO
+ * @ClassName GroupEditionApplyResultDTO
+ * @Auth wangc
+ * @Date 2020-11-03 09:06
+ */
+@Data
+public class GroupEditionApplyResultDTO implements Serializable {
+    private static final long serialVersionUID = 437035656436226205L;
+
+    /**
+     * 组Id
+     */
+    private String groupId;
+
+    /**
+     * 原始组姓名
+     */
+    private String groupName;
+
+    /**
+     * 原始组头像
+     */
+    private String groupHeadPhoto;
+
+    /**
+     * 已读 未读
+     */
+    private String readFlag;
+
+    /**
+     * 审核人员查看待审核列表时的文案 如:党员李华申请变更小组【原小组名】，请审核。
+     */
+    private String messageText;
+
+    /**
+     * yyyy-MM-dd HH:mm:ss
+     */
+    private String submitTime;
+}

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

@@ -0,0 +1,42 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description 工作端 群信息修改申请详情
+ * @ClassName GroupEditionDetailResultDTO
+ * @Auth wangc
+ * @Date 2020-11-02 17:54
+ */
+@Data
+public class GroupEditionDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -784043668974222480L;
+
+    /**
+     * 待审核的小组Id
+     */
+    private String groupId;
+
+    /**
+     * 待审核小组名称     是提交的名称，如果没有更改群名称则还是原来的
+     */
+    private String groupName;
+
+    /**
+     * 待审核小组图片     是提交的群头像，如果没有更改群头像则还是原来的
+     */
+    private String groupHeadPhoto;
+
+    /**
+     * 待审核小组的介绍    是提交的群介绍，如果没有更改群介绍则还是原来的
+     */
+    private String groupIntroduction;
+
+    /**
+     * 群主的昵称    xx路-xx先生/女士
+     */
+    private String groupLeaderName;
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java

@@ -88,4 +88,14 @@ public class GroupEditSubmitRecordEntity extends BaseEpmetEntity {
      */
 	private Date auditTime;
 
+	/**
+	 * 审核人员查看待审核列表时的文案 如:党员李华申请变更小组【原小组名】，请审核。
+	 */
+	private String messageText;
+
+	/**
+	 * 已读read 未读unread
+	 */
+	private String readFlag;
+
 }

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

@@ -15,6 +15,8 @@
        staff_id,
        remark,
        audit_time,
+       read_flag,
+       message_text,
        del_flag,
        revision,
        created_by,
@@ -35,6 +37,8 @@
         <result property="staffId" column="STAFF_ID"/>
         <result property="remark" column="REMARK"/>
         <result property="auditTime" column="AUDIT_TIME"/>
+        <result property="messageText" column="MESSAGE_TEXT" />
+        <result property="readFlag" column="READ_FLAG" />
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>