Commit df166b35 authored by 周健威's avatar 周健威

修改省bug

parent bff6c41b
...@@ -7,4 +7,6 @@ import lombok.Data; ...@@ -7,4 +7,6 @@ import lombok.Data;
public class CustomQueryDTO extends PageParam { public class CustomQueryDTO extends PageParam {
private Integer type; private Integer type;
private Integer status; private Integer status;
private String startDate;
private String endDate;
} }
\ No newline at end of file
package com.upyuns.platform.rs.website.controller; package com.upyuns.platform.rs.website.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
...@@ -27,6 +29,12 @@ public class CustomFormController extends BaseController<CustomFormBiz,CustomFor ...@@ -27,6 +29,12 @@ public class CustomFormController extends BaseController<CustomFormBiz,CustomFor
if(null != dto.getStatus()) { if(null != dto.getStatus()) {
w.andEqualTo(CustomForm::getStatus, dto.getStatus()); w.andEqualTo(CustomForm::getStatus, dto.getStatus());
} }
if(StrUtil.isNotBlank(dto.getStartDate())) {
w.andGreaterThanOrEqualTo(CustomForm::getCrtTime, DateUtil.beginOfDay(DateUtil.parseDate(dto.getStartDate())));
}
if(StrUtil.isNotBlank(dto.getEndDate())) {
w.andLessThanOrEqualTo(CustomForm::getCrtTime, DateUtil.endOfDay(DateUtil.parseDate(dto.getEndDate())));
}
return w; return w;
}, " 'status' asc, crt_time desc"))); }, " 'status' asc, crt_time desc")));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment