Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
dac3469bd6
2 zmienionych plików z 2 dodań i 1 usunięć
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Wyświetl plik

@@ -342,6 +342,7 @@ public class WxAllBillController extends BillBaseController {
typeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode()); typeList.add(EnumBillAllType.OTHER_DEPOSIT.getCode());
typeList.add(EnumBillAllType.ADVANCE.getCode()); typeList.add(EnumBillAllType.ADVANCE.getCode());
record.setBillTypeList(typeList); record.setBillTypeList(typeList);
record.setIsDel(EnumYesOrNo.NO.getCode());
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false);
return new ResultData(page); return new ResultData(page);
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Wyświetl plik

@@ -75,7 +75,7 @@
<if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if> <if test=" null != endtimeEqual">and `endtime` = #{endtimeEqual}</if>
<if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</if> <if test=" null != extraCreateFrom">and `extra_create_from` = #{extraCreateFrom}</if>
<if test=" null != noExtraCreateFrom">and `extra_create_from` is null</if> <if test=" null != noExtraCreateFrom">and `extra_create_from` is null</if>
<if test=" null != advanceHasMoney">and bill_type = 9 and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') &gt; 0</if>
<if test=" null != advanceHasMoney">and IFNULL(`pay`,'0') - IFNULL(`use_money`,'0') &gt; 0</if>
<if test=" null != month and '' != month"> <if test=" null != month and '' != month">
and date_format(starttime,'%Y-%m') &lt;= #{month} and date_format(endtime,'%Y-%m') &gt;= #{month} and date_format(starttime,'%Y-%m') &lt;= #{month} and date_format(endtime,'%Y-%m') &gt;= #{month}
</if> </if>


Ładowanie…
Anuluj
Zapisz