clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-14 16:47:04 +08:00
parent fc01b80f7b
commit 9acc82b9c1
6 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java
View File

@ -43,16 +43,7 @@ public class InventoryApplyController extends BaseController {
@RequestMapping("/list")
public Result<Page> list() {
ApplyOrderQuery query = parmsUtil.getObject("query", ApplyOrderQuery.class);
if (query == null){
return error("没有带查询条件");
}
QueryWrapper<InventoryApply> 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<InventoryApply> inventoryApplyPage = inventoryApplyService.listPage(query);
return success(inventoryApplyPage);
}

4
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java
View File

@ -26,9 +26,7 @@ public class InventoryCheckController extends BaseController {
@RequestMapping("/list")
public Result<Page<InventoryCheck>> list() {
CheckQuery query= parmsUtil.getObject("query", CheckQuery.class);
if (query == null){
return error("没有带查询条件");
}
return success(inventoryCheckService.listPage(query));
}

2
src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/ApplyOrderQuery.java
View File

@ -8,4 +8,6 @@ import lombok.Setter;
public class ApplyOrderQuery {
private Integer pageNum;
private Integer pageSize;
private String beginTime;
private String endTime;
}

2
src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/CheckQuery.java
View File

@ -8,4 +8,6 @@ import lombok.Setter;
public class CheckQuery {
private Integer pageNum;
private Integer pageSize;
private String beginTime;
private String endTime;
}

19
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryApplyService.java
View File

@ -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<InventoryApply> 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<InventoryApply> 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);

13
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryCheckService.java
View File

@ -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<InventoryCheck> listPage(CheckQuery query) {
if (query == null){
throw new MessageException("没有带查询条件");
}
QueryWrapper<InventoryCheck> 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);
}