| @@ -292,7 +292,7 @@ public class WxBillDeposit implements Serializable { | |||||
| sb.append(","); | sb.append(","); | ||||
| sb.append(fields[k].toString()); | sb.append(fields[k].toString()); | ||||
| } | } | ||||
| this.sortColumns = sb.toString(); | |||||
| } | } | ||||
| public void setSortColumns(String sortColumns) | public void setSortColumns(String sortColumns) | ||||
| @@ -351,7 +351,7 @@ public class WxBillProperty implements Serializable { | |||||
| sb.append(","); | sb.append(","); | ||||
| sb.append(fields[k].toString()); | sb.append(fields[k].toString()); | ||||
| } | } | ||||
| this.sortColumns = sb.toString(); | |||||
| } | } | ||||
| public void setSortColumns(String sortColumns) | public void setSortColumns(String sortColumns) | ||||
| @@ -6,7 +6,6 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.IdWorker; | import com.iformall.common.IdWorker; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxBillDeposit; | |||||
| import com.iformall.domain.po.WxBillProperty; | import com.iformall.domain.po.WxBillProperty; | ||||
| import com.iformall.domain.po.WxBillPropertyDeposit; | import com.iformall.domain.po.WxBillPropertyDeposit; | ||||
| import com.iformall.enums.EnumBillRentStatus; | import com.iformall.enums.EnumBillRentStatus; | ||||
| @@ -150,6 +149,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| public Object findByMerchantId(Long id) { | public Object findByMerchantId(Long id) { | ||||
| WxBillProperty record = new WxBillProperty(); | WxBillProperty record = new WxBillProperty(); | ||||
| record.setMerchantId(id); | record.setMerchantId(id); | ||||
| record.setSortColumns(WxBillProperty.Field.Id_ASC); | |||||
| return wxBillPropertyMapper.queryBillPropertyList(record); | return wxBillPropertyMapper.queryBillPropertyList(record); | ||||
| } | } | ||||
| @@ -150,6 +150,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| public Object findByMerchantId(Long id) { | public Object findByMerchantId(Long id) { | ||||
| WxBillRent record = new WxBillRent(); | WxBillRent record = new WxBillRent(); | ||||
| record.setMerchantId(id); | record.setMerchantId(id); | ||||
| record.setSortColumns(WxBillRent.Field.Id_ASC); | |||||
| return wxBillRentMapper.queryBillRentList(record); | return wxBillRentMapper.queryBillRentList(record); | ||||
| } | } | ||||
| @@ -99,7 +99,7 @@ | |||||
| <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by ${sortColumns} | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||
| @@ -100,7 +100,7 @@ | |||||
| <if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if> | <if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if> | ||||
| <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by ${sortColumns} | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||