From 391618f6b9750a7f9441c86c98e60ac2b0f03372 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:28:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CodeAuditResultDao.java | 5 +++-- .../com/epmet/service/CodeAuditResultService.java | 5 +++-- .../service/impl/CodeAuditResultServiceImpl.java | 4 ++-- .../com/epmet/service/impl/CodeServiceImpl.java | 3 ++- .../db/migration/V0.0.7__thirdUpdate.sql | 5 +++++ .../main/resources/mapper/CodeAuditResultDao.xml | 15 +++++++++++---- 6 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java index 691f8cd708..a72e0756b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java @@ -46,10 +46,11 @@ public interface CodeAuditResultDao extends BaseDao { * 获取审核失败列表 * @author zhaoqifeng * @date 2020/8/5 11:11 - * @param codeId + * @param customerId + * @param clientType * @return java.util.List */ - List selectAuditFailedList(@Param("codeId") String codeId); + List selectAuditFailedList(@Param("customerId") String customerId, @Param("clientType") String clientType); /** * @Description 更新 代码审核结果中的审核状态 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java index 9fff9570dd..4ecb436796 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java @@ -106,10 +106,11 @@ public interface CodeAuditResultService extends BaseService getAuditFailedList(String codeId); + List getAuditFailedList(String customerId, String clientType); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java index dfcd1cb87c..534aba66b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java @@ -107,8 +107,8 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl getAuditFailedList(String codeId) { - return baseDao.selectAuditFailedList(codeId); + public List getAuditFailedList(String customerId, String clientType) { + return baseDao.selectAuditFailedList(customerId, clientType); } } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 216330a6e3..ce3a43181d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -420,7 +420,8 @@ public class CodeServiceImpl implements CodeService { throw new RenException("未授权"); } //获取审核结果信息 - List codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId()); + List codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(), + codeCustomerDTO.getClientType()); codeAuditResultList.forEach(dto -> { ReasonResultDTO result = new ReasonResultDTO(); result.setReason(dto.getReason()); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql new file mode 100644 index 0000000000..6cf941f4ee --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql @@ -0,0 +1,5 @@ +alter table code_audit_result add FEEDBACK_INFO varchar(255) NULL comment '反馈内容' after SCREEN_SHOT_URL; +alter table code_audit_result add FEEDBACK_STUFF tinytext NULL comment '反馈素材' after FEEDBACK_INFO; + + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml index 7fdba9ef6f..2c3146763a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml @@ -22,10 +22,17 @@ ORDER BY CREATED_TIME DESC From 9b4b4a49f0ab4123ecd1d88c3944b8a60abf9a64 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:30:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 6bc39da836..4dcb903831 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.127 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index f8a5371837..ad595a9de5 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.126 + 0.0.127 com.epmet