Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
409e830e5e
2 zmienionych plików z 6 dodań i 4 usunięć
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Wyświetl plik

@@ -264,6 +264,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode()); wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode());
List<WxBillProperty> retList = wxBillPropertyMapper.findList(wxBillRent); List<WxBillProperty> retList = wxBillPropertyMapper.findList(wxBillRent);
//非一次性的有这个属性 //非一次性的有这个属性
wxBillRent.setHasFeesStardarsId(EnumYesOrNo.YES.getCode());
wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode());
List<WxBillProperty> unFixedList = wxBillPropertyMapper.findList(wxBillRent); List<WxBillProperty> unFixedList = wxBillPropertyMapper.findList(wxBillRent);
Map<Long,List<WxBillProperty>> childMap = null; Map<Long,List<WxBillProperty>> childMap = null;
@@ -275,6 +276,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
List<WxBillProperty> childList = childMap.get(ub.getParentBillId()); List<WxBillProperty> childList = childMap.get(ub.getParentBillId());
if (null == childList) { if (null == childList) {
childList = new ArrayList<WxBillProperty>(); childList = new ArrayList<WxBillProperty>();
childMap.put(ub.getParentBillId(), childList);
} }
childList.add(ub); childList.add(ub);
} }


+ 4
- 4
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Wyświetl plik

@@ -93,9 +93,9 @@
<if test=" null != parentBillId ">and `parent_bill_id` = #{parentBillId}</if> <if test=" null != parentBillId ">and `parent_bill_id` = #{parentBillId}</if>
<if test=" null != feesStandarsId ">and `fees_standars_id` = #{feesStandarsId}</if> <if test=" null != feesStandarsId ">and `fees_standars_id` = #{feesStandarsId}</if>
<if test=" 1 == hasParentBillId ">and `parent_bill_id` is not null</if> <if test=" 1 == hasParentBillId ">and `parent_bill_id` is not null</if>
<if test=" 0 == hasParentBillId ">and `parent_bill_id` null</if>
<if test=" 0 == hasParentBillId ">and `parent_bill_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and `fees_standars_id` is not null</if> <if test=" 1 == hasFeesStardarsId ">and `fees_standars_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and `fees_standars_id` null</if>
<if test=" 0 == hasFeesStardarsId ">and `fees_standars_id` is null</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if> <if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != propertyContractIds "> <if test=" null != propertyContractIds ">
@@ -172,9 +172,9 @@
<if test=" null != parentBillId ">and br.`parent_bill_id` = #{parentBillId}</if> <if test=" null != parentBillId ">and br.`parent_bill_id` = #{parentBillId}</if>
<if test=" null != feesStandarsId ">and br.`fees_standars_id` = #{feesStandarsId}</if> <if test=" null != feesStandarsId ">and br.`fees_standars_id` = #{feesStandarsId}</if>
<if test=" 1 == hasParentBillId ">and br.`parent_bill_id` is not null</if> <if test=" 1 == hasParentBillId ">and br.`parent_bill_id` is not null</if>
<if test=" 0 == hasParentBillId ">and br.`parent_bill_id` null</if>
<if test=" 0 == hasParentBillId ">and br.`parent_bill_id` is null</if>
<if test=" 1 == hasFeesStardarsId ">and br.`fees_standars_id` is not null</if> <if test=" 1 == hasFeesStardarsId ">and br.`fees_standars_id` is not null</if>
<if test=" 0 == hasFeesStardarsId ">and br.`fees_standars_id` null</if>
<if test=" 0 == hasFeesStardarsId ">and br.`fees_standars_id` is null</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if> <if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != propertyContractIds "> <if test=" null != propertyContractIds ">


Ładowanie…
Anuluj
Zapisz