|
|
|
@ -55,7 +55,7 @@ public class DmSygdMxController {
|
|
|
|
|
.eq(StrUtil.isNotEmpty(sygd.getDcPl()),"dc_pl",sygd.getDcPl())
|
|
|
|
|
.ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"jssj",sygd.getBeginTime())
|
|
|
|
|
.le(StrUtil.isNotEmpty(sygd.getEndTime()),"jssj",
|
|
|
|
|
DateUtil.endOfMonth(DateUtil.parseDate(sygd.getEndTime())))
|
|
|
|
|
sygd.getEndTime())
|
|
|
|
|
.orderByAsc("jssj,dc_ch,dc_pl")
|
|
|
|
|
);
|
|
|
|
|
return new ResultBean(list);
|
|
|
|
|