diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java index 421656a..9ed5437 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java @@ -53,7 +53,7 @@ public class LdConsumerFormServiceImpl extends ServiceImpl getConsumerFormList(String departmentId, String materialName, Integer num, Integer pageNum, Integer pageSize) { + public PageInfo getConsumerFormList(String department, String materialName, Integer num, Integer pageNum, Integer pageSize) { // User user = userService.getById(userId); // if(null == user){ // throw new CustomerException("用户信息不存在"); @@ -83,7 +83,7 @@ public class LdConsumerFormServiceImpl extends ServiceImpl ldConsumerFormList = consumerFormMapper.selectConsumerFormList(departmentId,materialName,num); + List ldConsumerFormList = consumerFormMapper.selectConsumerFormList(department,materialName,num); PageInfo pageInfo = new PageInfo<>(ldConsumerFormList); return pageInfo; } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java index 826d33e..b6b9596 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java @@ -58,10 +58,10 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartment, Integer pageNum, Integer pageSize) { + public PageInfo getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartmentName, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum,pageSize); - List ldTwoPutStorageList = twoPutStorageMapper.selectTwoPutStorageList(startTime,endTime,inOperator,demandDepartment); + List ldTwoPutStorageList = twoPutStorageMapper.selectTwoPutStorageList(startTime,endTime,inOperator,demandDepartmentName); // 返回结果 PageInfo pageInfo = new PageInfo<>(ldTwoPutStorageList); return pageInfo;