diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 7d567721d..1572d59c3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -342,6 +342,7 @@ public class WxAllBillController extends BillBaseController { typeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode()); typeList.add(EnumBillAllType.ADVANCE.getCode()); record.setBillTypeList(typeList); + record.setIsDel(EnumYesOrNo.NO.getCode()); PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index ee35acba1..4668361d7 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -75,7 +75,7 @@ and `endtime` = #{endtimeEqual} and `extra_create_from` = #{extraCreateFrom} and `extra_create_from` is null - and bill_type = 9 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0 + and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') > 0 and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month}