Merge remote-tracking branch 'origin/dev_issue_audit' into dev_issue_audit

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

@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:10 上午
+ */
+@Data
+public class ApplicationDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1123940740606412101L;
+
+    public interface ApplicationDetail{}
+
+    /**
+     * 申请详情，在列表接口返参里有
+     */
+    @NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationDetail.class})
+    private String issueApplicationId;
+}

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

@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:10 上午
+ */
+@Data
+public class ApplicationHistoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1123940740606412101L;
+
+    public interface ApplicationHistory{}
+
+    /**
+     * 申请详情，在列表接口返参里有
+     */
+    @NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationHistory.class})
+    private String issueApplicationId;
+}

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

@@ -0,0 +1,43 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:26 上午
+ */
+@Data
+public class ApplicationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7535577263406351310L;
+
+    public interface ApplicationList{}
+
+    /**
+     * 小组id
+     */
+    @NotBlank(message = "小组id不能为空",groups = {ApplicationList.class})
+    private String groupId;
+
+    /**
+     * under_auditing:审核中,rejected:驳回
+     */
+    @NotBlank(message = "审核状态不能为空",groups = {ApplicationList.class})
+    private String applyStatus;
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空",groups = {ApplicationList.class})
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    @NotNull(message = "每页数量不能为空",groups = {ApplicationList.class})
+    private Integer pageSize;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:12 上午
+ */
+@Data
+public class ApplicationDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1121268898544759693L;
+
+    /**
+     * 申请ID
+     */
+    private String issueApplicationId;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 所属网格名称
+     */
+    private String gridName;
+
+    /**
+     * 议题发起人
+     */
+    private String issuePublisher;
+
+    /**
+     * 话题相关信息
+     */
+    private TopicInfoResultDTO topicInfo;
+
+    public ApplicationDetailResultDTO() {
+        this.issueTitle = "";
+        this.gridName = "";
+        this.issuePublisher = "";
+        this.topicInfo = new TopicInfoResultDTO();
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:21 上午
+ */
+@Data
+public class ApplicationHistoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3235513565728092491L;
+
+    /**
+     * 审核历史表id
+     */
+    private String historyId;
+
+    /**
+     * under_auditing:待审核； approved:已通过， rejected:已驳回
+     */
+    private String actionType;
+
+    /**
+     * 操作时间戳
+     */
+    private Long operateTime;
+
+    /**
+     * 驳回理由或者审核通过理由
+     */
+    private String reason;
+
+    /**
+     * 工作人员姓名；居民端不展示此列
+     */
+    private String staffName;
+
+}

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

@@ -0,0 +1,48 @@
+package com.epmet.resi.group.dto.group.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:31 上午
+ */
+@Data
+public class ApplicationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4042091778432048631L;
+
+    /**
+     * 申请id
+     */
+    private String issueApplicationId;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 建议
+     */
+    private String suggestion;
+
+    /**
+     * 对应issue_application.UPDATED_TIME 对应的秒级时间戳
+     */
+    private Long time;
+
+    /**
+     * 审核状态。under_auditing:审核中,approved:通过，rejected:驳回
+     */
+    private String applyStatus;
+
+    public ApplicationListResultDTO() {
+        this.issueTitle = "";
+        this.suggestion = "";
+        this.time = NumConstant.ZERO_L;
+        this.applyStatus = "";
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.epmet.resi.group.dto.group.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:14 上午
+ */
+@Data
+public class TopicInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3445869627210569553L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题发表人昵称
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间戳
+     */
+    private Long publishedTime;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 话题图片集合
+     */
+    private List<String> topicImgs;
+
+    public TopicInfoResultDTO() {
+        this.publishedUser = "";
+        this.publishedTime = NumConstant.ZERO_L;
+        this.topicContent = "";
+        this.topicImgs = new ArrayList<>();
+    }
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/GroupIssueController.java

@@ -0,0 +1,68 @@
+package com.epmet.modules.group.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.modules.group.service.GroupIssueService;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/17 10:15
+ */
+@Slf4j
+@RestController
+@RequestMapping("groupissue")
+public class GroupIssueController {
+	@Autowired
+	private GroupIssueService groupIssueService;
+
+	/**
+	 * @Description  待审核||已驳回 申请详情
+	 * @Param applicationDetailFormDTO
+	 * @author zxc
+	 * @date 2020/11/17 10:45 上午
+	 */
+	@PostMapping("applicationdetail")
+	public Result<ApplicationDetailResultDTO> applicationDetail(@RequestBody ApplicationDetailFormDTO applicationDetailFormDTO){
+		ValidatorUtils.validateEntity(applicationDetailFormDTO, ApplicationDetailFormDTO.ApplicationDetail.class);
+		return new Result<ApplicationDetailResultDTO>().ok(groupIssueService.applicationDetail(applicationDetailFormDTO));
+	}
+
+	/**
+	 * @Description  话题转议题申请详情- 审核历史查询
+	 * @Param applicationHistoryFormDTO
+	 * @author zxc
+	 * @date 2020/11/17 10:45 上午
+	 */
+	@PostMapping("applicationhistory")
+	public Result<ApplicationHistoryResultDTO> applicationHistory(@RequestBody ApplicationHistoryFormDTO applicationHistoryFormDTO){
+		ValidatorUtils.validateEntity(applicationHistoryFormDTO, ApplicationHistoryFormDTO.ApplicationHistory.class);
+		return new Result<ApplicationHistoryResultDTO>().ok(groupIssueService.applicationHistory(applicationHistoryFormDTO));
+	}
+
+	/**
+	 * @Description  待审核||已驳回  申请列表
+	 * @Param applicationListFormDTO
+	 * @author zxc
+	 * @date 2020/11/17 10:45 上午
+	 */
+	@PostMapping("applicationlist")
+	public Result<List<ApplicationListResultDTO>> applicationList(@RequestBody ApplicationListFormDTO applicationListFormDTO){
+		ValidatorUtils.validateEntity(applicationListFormDTO, ApplicationListFormDTO.ApplicationList.class);
+		return new Result<List<ApplicationListResultDTO>>().ok(groupIssueService.applicationList(applicationListFormDTO));
+	}
+}

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

@@ -0,0 +1,43 @@
+package com.epmet.modules.group.service;
+
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/17 10:16
+ */
+public interface GroupIssueService {
+
+    /**
+     * @Description  待审核||已驳回 申请详情
+     * @Param applicationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    ApplicationDetailResultDTO applicationDetail(ApplicationDetailFormDTO applicationDetailFormDTO);
+
+    /**
+     * @Description  话题转议题申请详情- 审核历史查询
+     * @Param applicationHistoryFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO);
+
+    /**
+     * @Description  待审核||已驳回  申请列表
+     * @Param applicationListFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    List<ApplicationListResultDTO> applicationList(ApplicationListFormDTO applicationListFormDTO);
+
+}

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

@@ -0,0 +1,56 @@
+package com.epmet.modules.group.service.impl;
+
+import com.epmet.modules.group.service.GroupIssueService;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationListFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationHistoryResultDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/17 10:16
+ */
+@Slf4j
+@Service
+public class GroupIssueServiceImpl implements GroupIssueService {
+
+    /**
+     * @Description  待审核||已驳回 申请详情
+     * @Param applicationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    @Override
+    public ApplicationDetailResultDTO applicationDetail(ApplicationDetailFormDTO applicationDetailFormDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  话题转议题申请详情- 审核历史查询
+     * @Param applicationHistoryFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    @Override
+    public ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) {
+        return null;
+    }
+
+    /**
+     * @Description  待审核||已驳回  申请列表
+     * @Param applicationListFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    @Override
+    public List<ApplicationListResultDTO> applicationList(ApplicationListFormDTO applicationListFormDTO) {
+        return null;
+    }
+}