diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 28e9fae188..d40f38cbd4 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.1.140:3306/epmet_gov_voice?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: root #oracle配置 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileDownloadHelper.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileDownloadHelper.java new file mode 100644 index 0000000000..8b5daf0b28 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileDownloadHelper.java @@ -0,0 +1,29 @@ +package com.epmet.commons.tools.utils; + +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +/** + * @Description 文件下载工具类 + * @Author wangxianzhang + * @Time 2023/5/25 2:23 PM + */ +public class FileDownloadHelper { + + /** + * @Description: 为下载xlsx文件设置response + * @param response: + * @param fileName: + * @Return void + * @Author: wangxianzhang + * @Date: 2023/5/25 2:23 PM + */ + public static void setResponseForXlsx(HttpServletResponse response, String fileName) throws UnsupportedEncodingException { + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + // response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8")); + } + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index ae22f9570e..b90800f2e1 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -218,4 +218,5 @@ public class IcEventDTO implements Serializable { */ private Date updatedTime; + private Integer replyStatus; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java index bb23c45258..0d781e06c2 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java @@ -206,6 +206,8 @@ public class IcEventListResultDTO implements Serializable { */ private String difficultPointName; + private Integer replyStatus; + /** * 事件附件 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 26e2b2895f..327c768be2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -624,6 +624,13 @@ public class IcEventController { @PostMapping("updateReply") public Result updateReply(@RequestBody IcEventReplyFormDTO formDTO) { icEventReplyService.updateByReplyId(formDTO); + if (null != formDTO.getIcEventId()) { + IcEventDTO entity = icEventService.get(formDTO.getId()); + if (formDTO.getManageStatus() > entity.getReplyStatus()) { + entity.setReplyStatus(formDTO.getManageStatus()); + icEventService.update(entity); + } + } return new Result(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index 3cb9cd00b9..0ec2bff965 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java @@ -186,4 +186,6 @@ public class IcEventEntity extends BaseEpmetEntity { */ private String difficultPoint; + private Integer replyStatus; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index c61a8cbbde..eacefe3c01 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -798,6 +798,14 @@ public class IcEventServiceImpl extends BaseServiceImpl formDTO.getManageStatus()) { + //如果事件已经存在处理流程,且当前处理流程状态大于之前的状态则更新最新的处理状态 + entity.setReplyStatus(formDTO.getManageStatus()); + } baseDao.updateById(entity); //3.新增回复数据 diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 2aeae5034d..9f5c3ba791 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -133,6 +133,7 @@ +