|
|
|
@ -31,8 +31,9 @@ public class SCKbanController {
|
|
|
|
|
String end=DateUtil.endOfMonth(date).offsetNew(DateField.DAY_OF_YEAR,1).toString("yyyy/MM/dd");
|
|
|
|
|
List<DmYdjh> between = service.list(Wrappers.<DmYdjh>lambdaQuery()
|
|
|
|
|
.select(DmYdjh::getKw,DmYdjh::getQgfkrq,DmYdjh::getZyq1,DmYdjh::getBcshzl,DmYdjh::getQgjhrq)
|
|
|
|
|
.between(DmYdjh::getQgfkrq, begin, end)
|
|
|
|
|
.or(it->it.between(DmYdjh::getQgjhrq,begin,end))
|
|
|
|
|
.eq(DmYdjh::getYlbs,"N").and(it->
|
|
|
|
|
it.between(DmYdjh::getQgfkrq, begin, end).or().between(DmYdjh::getQgjhrq,begin,end)
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
return new ResultBean<>(JSONArray.toJSONString(between));
|
|
|
|
|
}
|
|
|
|
|