diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java index 58870e1..e68153e 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java @@ -43,16 +43,7 @@ public class InventoryApplyController extends BaseController { @RequestMapping("/list") public Result list() { ApplyOrderQuery query = parmsUtil.getObject("query", ApplyOrderQuery.class); - if (query == null){ - return error("没有带查询条件"); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - if(query.getPageNum() == null || query.getPageNum() == 0){ - query.setPageNum(1); - } - if (query.getPageSize() == null || query.getPageSize() == 0){ - query.setPageSize(Constants.DetailPageSize); - } + Page inventoryApplyPage = inventoryApplyService.listPage(query); return success(inventoryApplyPage); } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java index 9356d1e..fb4448d 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java @@ -26,9 +26,7 @@ public class InventoryCheckController extends BaseController { @RequestMapping("/list") public Result> list() { CheckQuery query= parmsUtil.getObject("query", CheckQuery.class); - if (query == null){ - return error("没有带查询条件"); - } + return success(inventoryCheckService.listPage(query)); } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java index b03925b..7b8e8a9 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java @@ -8,4 +8,6 @@ import lombok.Setter; public class ApplyOrderQuery { private Integer pageNum; private Integer pageSize; + private String beginTime; + private String endTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java index 657cda1..47a87b3 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java @@ -8,4 +8,6 @@ import lombok.Setter; public class CheckQuery { private Integer pageNum; private Integer pageSize; + private String beginTime; + private String endTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java index 77bea13..e658204 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java @@ -7,6 +7,7 @@ import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum; import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum; import com.syjiaer.clinic.server.common.enums.Type; import com.syjiaer.clinic.server.common.exception.MessageException; +import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.inventory.InventoryApply; import com.syjiaer.clinic.server.entity.inventory.InventoryApplyLog; @@ -95,7 +96,25 @@ public class InventoryApplyService extends BaseService { * 分页查询领用单 */ public Page listPage(ApplyOrderQuery query) { + if (query == null){ + throw new MessageException("没有带查询条件"); + } + if(query.getPageNum() == null || query.getPageNum() == 0){ + query.setPageNum(1); + } + if (query.getPageSize() == null || query.getPageSize() == 0){ + query.setPageSize(Constants.DetailPageSize); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (query.getBeginTime() != null && !query.getBeginTime().isEmpty()) { + LocalDateTime beginTime = DateUtil.getDateTime(query.getBeginTime()); + queryWrapper.ge("create_datetime", beginTime); + } + if (query.getEndTime() != null && !query.getEndTime().isEmpty()) { + LocalDateTime endTime = DateUtil.getDateTime(query.getEndTime()); + queryWrapper.le("create_datetime", endTime); + } return pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, inventoryApplyMapper, "create_datetime", false); diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java index 732331e..9c661f0 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum; import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum; +import com.syjiaer.clinic.server.common.exception.MessageException; +import com.syjiaer.clinic.server.common.util.DateUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.inventory.InventoryCheck; import com.syjiaer.clinic.server.entity.inventory.InventoryCheckLog; @@ -35,7 +37,18 @@ public class InventoryCheckService extends BaseService { @Autowired private InventoryCheckLogMapper inventoryCheckLogMapper; public Page listPage(CheckQuery query) { + if (query == null){ + throw new MessageException("没有带查询条件"); + } QueryWrapper queryWrapper = new QueryWrapper<>(); + if (query.getBeginTime() != null && !query.getBeginTime().isEmpty()) { + LocalDateTime beginTime = DateUtil.getDateTime(query.getBeginTime()); + queryWrapper.ge("create_datetime", beginTime); + } + if (query.getEndTime() != null && !query.getEndTime().isEmpty()) { + LocalDateTime endTime = DateUtil.getDateTime(query.getEndTime()); + queryWrapper.le("create_datetime", endTime); + } return pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, inventoryCheckMapper, "create_datetime", false); }