|
|
@ -39,8 +39,8 @@ public class DmYdjhController {
|
|
|
|
List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
|
|
|
|
List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
|
|
|
|
.eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
|
|
|
|
.eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
|
|
|
|
.eq(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
|
|
|
|
.eq(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
|
|
|
|
.ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))))
|
|
|
|
.ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
|
|
|
|
.le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))))
|
|
|
|
.le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
|
|
|
|
.orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
|
|
|
|
.orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
|
|
|
|
);
|
|
|
|
);
|
|
|
|
return new ResultBean(list);
|
|
|
|
return new ResultBean(list);
|
|
|
|