居民端：话题转议题申请详情- 审核历史查询

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationHistoryDTO.java

@@ -96,4 +96,14 @@ public class IssueApplicationHistoryDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	//扩展属性
+    /**
+     * =id
+     */
+    private String historyId;
+
+    /**
+     * createdTime 对应时间戳
+     */
+    private Long operateTime;
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueApplicationIdFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 根据issue_application.id查询审核历史
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/11/18 16:55
+ */
+@Data
+public class IssueApplicationIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 3222664262617695211L;
+    @NotBlank(message = "issueApplicationId不能为空")
+    private String issueApplicationId;
+
+    public IssueApplicationIdFormDTO(String issueApplicationId) {
+        this.issueApplicationId = issueApplicationId;
+    }
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -3,8 +3,10 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
+import com.epmet.dto.form.IssueApplicationIdFormDTO;
 import com.epmet.dto.form.UserIssueSuggestionFormDTO;
 import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
 import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
@@ -81,6 +83,15 @@ public interface GovIssueOpenFeignClient {
 	 * @description  分页按条件查询issue_application
 	 * @Date 2020/11/18 16:40
 	 **/
-	@PostMapping(value = "/gov/issue/issueapplication/listIssueApp",consumes =  MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/gov/issue/issueapplication/listissueapp",consumes =  MediaType.APPLICATION_JSON_VALUE)
 	Result<List<IssueApplicationDTO>> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO);
+
+	/**
+	 * @param formDTO
+	 * @author yinzuomei
+	 * @description 根据issue_application.id查询审核历史
+	 * @Date 2020/11/18 17:03
+	 **/
+	@PostMapping(value = "/gov/issue/issueapplicationhistory/querybyissueapplicationid",consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<List<IssueApplicationHistoryDTO>> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
+import com.epmet.dto.form.IssueApplicationIdFormDTO;
 import com.epmet.dto.form.UserIssueSuggestionFormDTO;
 import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
@@ -96,4 +98,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<IssueApplicationDTO>> listIssueApp(IssueAppQueryFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "listIssueApp", formDTO);
 	}
+
+	/**
+	 * @param formDTO
+	 * @author yinzuomei
+	 * @description 根据issue_application.id查询审核历史
+	 * @Date 2020/11/18 17:03
+	 **/
+	@Override
+	public Result<List<IssueApplicationHistoryDTO>> queryByIssueApplicationId(IssueApplicationIdFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryByIssueApplicationId", formDTO);
+	}
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationController.java

@@ -90,7 +90,7 @@ public class IssueApplicationController {
      * @description 分页按条件查询issue_application
      * @Date 2020/11/18 16:26
      **/
-    @PostMapping("listIssueApp")
+    @PostMapping("listissueapp")
     public Result<List<IssueApplicationDTO>> listIssueApp(@RequestBody IssueAppQueryFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         List<IssueApplicationDTO> list=issueApplicationService.listIssueApp(formDTO);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueApplicationHistoryController.java

@@ -18,19 +18,18 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueApplicationHistoryDTO;
+import com.epmet.dto.form.IssueApplicationIdFormDTO;
 import com.epmet.service.IssueApplicationHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -84,4 +83,15 @@ public class IssueApplicationHistoryController {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 根据issue_application.id查询审核历史
+     * @Date 2020/11/18 16:57
+     **/
+    @PostMapping("querybyissueapplicationid")
+    public Result<List<IssueApplicationHistoryDTO>> queryByIssueApplicationId(@RequestBody IssueApplicationIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<IssueApplicationHistoryDTO>>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId()));
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java

@@ -18,9 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.entity.IssueApplicationHistoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 话题转议题审核历史表
  *
@@ -29,5 +32,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueApplicationHistoryDao extends BaseDao<IssueApplicationHistoryEntity> {
-	
+
+    /**
+     * @param issueApplicationId
+     * @author yinzuomei
+     * @description 根据issue_application.id查询审核历史
+     * @Date 2020/11/18 16:59
+     **/
+    List<IssueApplicationHistoryDTO> selectListByIssueApplicationId(String issueApplicationId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java

@@ -92,4 +92,12 @@ public interface IssueApplicationHistoryService extends BaseService<IssueApplica
      * @date 2020-11-17
      */
     void delete(String[] ids);
+
+    /**
+     * @param issueApplicationId
+     * @author yinzuomei
+     * @description 根据issue_application.id查询审核历史
+     * @Date 2020/11/18 16:57
+     **/
+    List<IssueApplicationHistoryDTO> queryByIssueApplicationId(String issueApplicationId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java

@@ -96,4 +96,15 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param issueApplicationId
+     * @author yinzuomei
+     * @description 根据issue_application.id查询审核历史
+     * @Date 2020/11/18 16:57
+     **/
+    @Override
+    public List<IssueApplicationHistoryDTO> queryByIssueApplicationId(String issueApplicationId) {
+        return baseDao.selectListByIssueApplicationId(issueApplicationId);
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml

@@ -2,6 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.IssueApplicationHistoryDao">
-
+    <!--   根据issue_application.id查询审核历史 -->
+    <select id="selectListByIssueApplicationId" resultType="com.epmet.dto.IssueApplicationHistoryDTO">
+        SELECT
+            iah.ID,
+            iah.ACTION_TYPE,
+            unix_timestamp( iah.CREATED_TIME ) AS operateTime,
+            iah.REASON,
+            iah.STAFF_NAME
+        FROM
+            issue_application_history iah
+        WHERE
+            iah.DEL_FLAG = '0'
+            AND iah.ISSUE_APPLICATION_ID = #{issueApplicationId}
+        ORDER BY
+            iah.CREATED_TIME DESC
+    </select>
 
 </mapper>

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

@@ -48,9 +48,9 @@ public class GroupIssueController {
 	 * @date 2020/11/17 10:45 上午
 	 */
 	@PostMapping("applicationhistory")
-	public Result<ApplicationHistoryResultDTO> applicationHistory(@RequestBody ApplicationHistoryFormDTO applicationHistoryFormDTO){
+	public Result<List<ApplicationHistoryResultDTO>> applicationHistory(@RequestBody ApplicationHistoryFormDTO applicationHistoryFormDTO){
 		ValidatorUtils.validateEntity(applicationHistoryFormDTO, ApplicationHistoryFormDTO.ApplicationHistory.class);
-		return new Result<ApplicationHistoryResultDTO>().ok(groupIssueService.applicationHistory(applicationHistoryFormDTO));
+		return new Result<List<ApplicationHistoryResultDTO>>().ok(groupIssueService.applicationHistory(applicationHistoryFormDTO));
 	}
 
 	/**

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

@@ -29,7 +29,7 @@ public interface GroupIssueService {
      * @author zxc
      * @date 2020/11/17 10:45 上午
      */
-    ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO);
+    List<ApplicationHistoryResultDTO> applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO);
 
     /**
      * @Description  待审核||已驳回  申请列表

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

@@ -4,7 +4,9 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
+import com.epmet.dto.form.IssueApplicationIdFormDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.group.service.GroupIssueService;
 import com.epmet.modules.topic.service.ResiTopicService;
@@ -47,14 +49,19 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     }
 
     /**
-     * @Description  话题转议题申请详情- 审核历史查询
+     * @Description 话题转议题申请详情- 审核历史查询
      * @Param applicationHistoryFormDTO
      * @author zxc
      * @date 2020/11/17 10:45 上午
      */
     @Override
-    public ApplicationHistoryResultDTO applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) {
+    public List<ApplicationHistoryResultDTO> applicationHistory(ApplicationHistoryFormDTO applicationHistoryFormDTO) {
-        return null;
+        Result<List<IssueApplicationHistoryDTO>> result = govIssueOpenFeignClient.queryByIssueApplicationId(new IssueApplicationIdFormDTO(applicationHistoryFormDTO.getIssueApplicationId()));
+        if (result.success() && CollectionUtils.isNotEmpty(result.getData())) {
+            List<ApplicationHistoryResultDTO> list=ConvertUtils.sourceToTarget(result.getData(),ApplicationHistoryResultDTO.class);
+            return list;
+        }
+        return new ArrayList<>();
     }
 
     /**