| @@ -335,6 +335,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); | wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); | ||||
| wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); | wxBillAllVo.setRentStartTime(DateUtils.format(wxBillAllVo.getStarttime())); | ||||
| wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); | wxBillAllVo.setRentEndTime(DateUtils.format(wxBillAllVo.getEndtime())); | ||||
| //status不是欠缴,都展示0,与前端保持一致 | |||||
| if(!EnumBillRentStatus.NOT_PAID.getCode().equals(wxBillAllVo.getStatus())){ | |||||
| wxBillAllVo.setOwe(0l); | |||||
| wxBillAllVo.setOweStr("0"); | |||||
| } | |||||
| datalist.add(wxBillAllVo); | datalist.add(wxBillAllVo); | ||||
| } | } | ||||
| } | } | ||||
| @@ -490,10 +490,10 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != userName "> | <if test=" null != userName "> | ||||
| and c.`nick_name` like concat('%', #{userName},'%') | |||||
| and mb.`name` like concat('%', #{userName},'%') | |||||
| </if> | </if> | ||||
| <if test=" null != phone "> | <if test=" null != phone "> | ||||
| and c.`phone` like concat('%', #{phone},'%') | |||||
| and mb.`phone` like concat('%', #{phone},'%') | |||||
| </if> | </if> | ||||
| <if test=" null != couponName "> | <if test=" null != couponName "> | ||||
| and co.`title` like concat('%', #{couponName},'%') | and co.`title` like concat('%', #{couponName},'%') | ||||