查询工作总结添加日期前后判定
This commit is contained in:
parent
fb66e418d8
commit
4ab263f3d5
|
|
@ -780,6 +780,11 @@ public class KateWorkQueryController {
|
||||||
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter())
|
.like(StringUtils.isNotEmpty(workSummaryQuery.getWorkCenter()), WorkSummary::getWorkCenter, workSummaryQuery.getWorkCenter())
|
||||||
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId());
|
.like(StringUtils.isNotEmpty(workSummaryQuery.getGoodsId()), WorkSummary::getGoodsId, workSummaryQuery.getGoodsId());
|
||||||
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) {
|
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() != null) {
|
||||||
|
if(workSummaryQuery.getWorkDate().isBefore(workSummaryQuery.getWorkEndDate())) {
|
||||||
|
response.setCode(ResponseCode.ERROR.getCode());
|
||||||
|
response.setMessage("结束日期不能早于起始日期");
|
||||||
|
return convertJsonString(response);
|
||||||
|
}
|
||||||
workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate());
|
workSummaryQueryWrapper.between(WorkSummary::getWorkDate, workSummaryQuery.getWorkDate(), workSummaryQuery.getWorkEndDate());
|
||||||
}
|
}
|
||||||
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) {
|
if(workSummaryQuery.getWorkDate() != null && workSummaryQuery.getWorkEndDate() == null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user