From 4c87d13f6c481fb6214aae5ab5cbe81972864b7f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 11 Aug 2020 16:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/CodeOperationHistoryService.java | 5 +++-- .../epmet/service/impl/CodeOperationHistoryServiceImpl.java | 4 ++-- .../main/java/com/epmet/service/impl/CodeServiceImpl.java | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java index 094baed605..7f0ba1752c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java @@ -98,10 +98,11 @@ public interface CodeOperationHistoryService extends BaseService getHistoryList(String codeId); + List getHistoryList(String customerId, String clientType); /** * 更新描述 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java index c75f01637f..c50199c644 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java @@ -103,8 +103,8 @@ public class CodeOperationHistoryServiceImpl extends BaseServiceImpl getHistoryList(String codeId) { - return baseDao.selectHistoryListByCode(codeId); + public List getHistoryList(String customerId, String clientType) { + return baseDao.selectHistoryList(customerId, clientType); } @Override 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 e282dddf7a..d07bf811bf 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 @@ -492,7 +492,9 @@ public class CodeServiceImpl implements CodeService { public PageData history(CodeCommonFormDTO formDTO) { PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); //获取上传代码信息 - List list = codeOperationHistoryService.getHistoryList(formDTO.getCodeId()); + CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId()); + //获取上传代码信息 + List list = codeOperationHistoryService.getHistoryList(code.getCustomerId(), code.getClientType()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); }