1.修复查询错误及默认日期写死问题

master
董哲奇 1 year ago
parent 88792abb73
commit fe57811fcc

@ -46,8 +46,8 @@ public class DmSygdxqController {
public ResultBean getList(@RequestBody Map<String, String> map) { public ResultBean getList(@RequestBody Map<String, String> map) {
List<DmSygdxq> list = service.list(new QueryWrapper<DmSygdxq>() List<DmSygdxq> list = service.list(new QueryWrapper<DmSygdxq>()
.ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("beginTime")))) .ge(StrUtil.isNotEmpty(map.get("beginTime")), "xzglxq", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("beginTime"))).toString("yyyy/MM/dd"))
.le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", DateUtil.endOfMonth(DateUtil.parseDate(map.get("endTime")))) .le(StrUtil.isNotEmpty(map.get("endTime")), "xzglxq", DateUtil.endOfMonth(DateUtil.parseDate(map.get("endTime"))).toString("yyyy/MM/dd"))
.orderByAsc("dc_ch, cast(dc_pl as int),xzglxq")); .orderByAsc("dc_ch, cast(dc_pl as int),xzglxq"));
return new ResultBean(list); return new ResultBean(list);
} }

@ -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);

Loading…
Cancel
Save