功能修改

master
sunjianxi 1 month ago
parent 4cff55e17c
commit 77416b4fec
  1. 4
      src/main/java/com/nov/KgLowDurable/service/Impl/LdConsumerFormServiceImpl.java
  2. 4
      src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java

@ -53,7 +53,7 @@ public class LdConsumerFormServiceImpl extends ServiceImpl<LdConsumerFormMapper,
} }
@Override @Override
public PageInfo<LdConsumerForm> getConsumerFormList(String departmentId, String materialName, Integer num, Integer pageNum, Integer pageSize) { public PageInfo<LdConsumerForm> getConsumerFormList(String department, String materialName, Integer num, Integer pageNum, Integer pageSize) {
// User user = userService.getById(userId); // User user = userService.getById(userId);
// if(null == user){ // if(null == user){
// throw new CustomerException("用户信息不存在"); // throw new CustomerException("用户信息不存在");
@ -83,7 +83,7 @@ public class LdConsumerFormServiceImpl extends ServiceImpl<LdConsumerFormMapper,
// } // }
PageHelper.startPage(pageNum,pageSize); PageHelper.startPage(pageNum,pageSize);
List<LdConsumerForm> ldConsumerFormList = consumerFormMapper.selectConsumerFormList(departmentId,materialName,num); List<LdConsumerForm> ldConsumerFormList = consumerFormMapper.selectConsumerFormList(department,materialName,num);
PageInfo<LdConsumerForm> pageInfo = new PageInfo<>(ldConsumerFormList); PageInfo<LdConsumerForm> pageInfo = new PageInfo<>(ldConsumerFormList);
return pageInfo; return pageInfo;
} }

@ -58,10 +58,10 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl<LdTwoPutStorageMappe
LdOneFormMapper oneFormMapper; LdOneFormMapper oneFormMapper;
@Override @Override
public PageInfo<LdTwoPutStorageVO> getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartment, Integer pageNum, Integer pageSize) { public PageInfo<LdTwoPutStorageVO> getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartmentName, Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum,pageSize); PageHelper.startPage(pageNum,pageSize);
List<LdTwoPutStorageVO> ldTwoPutStorageList = twoPutStorageMapper.selectTwoPutStorageList(startTime,endTime,inOperator,demandDepartment); List<LdTwoPutStorageVO> ldTwoPutStorageList = twoPutStorageMapper.selectTwoPutStorageList(startTime,endTime,inOperator,demandDepartmentName);
// 返回结果 // 返回结果
PageInfo<LdTwoPutStorageVO> pageInfo = new PageInfo<>(ldTwoPutStorageList); PageInfo<LdTwoPutStorageVO> pageInfo = new PageInfo<>(ldTwoPutStorageList);
return pageInfo; return pageInfo;

Loading…
Cancel
Save