Commit 978f483f by huangjinxin

fix:处理工单列表查询方式

1 parent 39797ca5
...@@ -13,10 +13,12 @@ public class OrderServiceListReq { ...@@ -13,10 +13,12 @@ public class OrderServiceListReq {
private String levelType; private String levelType;
@NotNull @NotNull
private String levelValue; private String levelValue;
// @NotNull
// private String startDate;
// @NotNull
// private String endDate;
@NotNull @NotNull
private String startDate; private String date;
@NotNull
private String endDate;
@NotNull @NotNull
private long page; private long page;
@NotNull @NotNull
......
...@@ -44,15 +44,11 @@ public class OrderServiceListServiceImpl implements OrderServiceListService { ...@@ -44,15 +44,11 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
//分页 //分页
Page<OrderInfo> pg = new Page(reqDTO.getPage(), reqDTO.getSize()); Page<OrderInfo> pg = new Page(reqDTO.getPage(), reqDTO.getSize());
LocalDate startDate = TimeUtils.IsoDate2LocalDate(reqDTO.getStartDate());
LocalDate endDate = TimeUtils.IsoDate2LocalDate(reqDTO.getEndDate());
LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderInfo> lqw = new LambdaQueryWrapper<>();
lqw.eq(reqDTO.getLevelType().equals("cluster"), OrderInfo::getOrgClusterId, reqDTO.getLevelValue()); lqw.eq(reqDTO.getLevelType().equals("cluster"), OrderInfo::getOrgClusterId, reqDTO.getLevelValue());
lqw.eq(reqDTO.getLevelType().equals("branch"), OrderInfo::getOrgBranchId, reqDTO.getLevelValue()); lqw.eq(reqDTO.getLevelType().equals("branch"), OrderInfo::getOrgBranchId, reqDTO.getLevelValue());
lqw.eq(reqDTO.getLevelType().equals("group"), OrderInfo::getOrgGroupId, reqDTO.getLevelValue()); lqw.eq(reqDTO.getLevelType().equals("group"), OrderInfo::getOrgGroupId, reqDTO.getLevelValue());
lqw.ge(OrderInfo::getDt, startDate); //预约开始日期 lqw.eq(OrderInfo::getDt, reqDTO.getDate()); //预约开始日期
lqw.le(OrderInfo::getDt, endDate); //预约开始日期
//筛选项 //筛选项
if (StringUtils.isNotBlank(reqDTO.getOrderId())) { if (StringUtils.isNotBlank(reqDTO.getOrderId())) {
lqw.in(StringUtils.isNotEmpty(reqDTO.getOrderId()), OrderInfo::getOrderId, reqDTO.getOrderId().split(",")); lqw.in(StringUtils.isNotEmpty(reqDTO.getOrderId()), OrderInfo::getOrderId, reqDTO.getOrderId().split(","));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!