| @@ -88,9 +88,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| } | } | ||||
| //关联的店铺 | //关联的店铺 | ||||
| if (wxPropertyContract.getShopId() != null) { | if (wxPropertyContract.getShopId() != null) { | ||||
| List<WxShop> list = new ArrayList<>(); | |||||
| WxShop wxShop = wxShopMapper.selectByPrimaryKey(wxPropertyContract.getShopId()); | |||||
| list.add(wxShop); | |||||
| WxShop record = new WxShop(); | |||||
| record.setId(wxPropertyContract.getShopId()); | |||||
| List<Map<String, Object>> list = wxShopMapper.findListMap(record); | |||||
| result.put("wxShops", list); | result.put("wxShops", list); | ||||
| } else { | } else { | ||||
| result.put("wxShops", Collections.EMPTY_LIST); | result.put("wxShops", Collections.EMPTY_LIST); | ||||
| @@ -113,7 +113,7 @@ | |||||
| <select id="queryRentContractEndSoonStatus" resultType="int" | <select id="queryRentContractEndSoonStatus" resultType="int" | ||||
| parameterType="com.iformall.domain.po.WxPropertyContract"> | parameterType="com.iformall.domain.po.WxPropertyContract"> | ||||
| select count(id) from wx_property_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 | |||||
| select count(id) from wx_property_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() | |||||
| </select> | </select> | ||||
| <select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxPropertyContract"> | <select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxPropertyContract"> | ||||
| @@ -125,7 +125,7 @@ | |||||
| </select> | </select> | ||||
| <update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | <update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | ||||
| update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 | |||||
| update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() | |||||
| </update> | </update> | ||||
| <update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | <update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxPropertyContract"> | ||||
| @@ -105,7 +105,7 @@ | |||||
| </select> | </select> | ||||
| <select id="queryRentContractEndSoonStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="queryRentContractEndSoonStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | ||||
| select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 | |||||
| select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() | |||||
| </select> | </select> | ||||
| <select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract"> | ||||
| @@ -117,7 +117,7 @@ | |||||
| </select> | </select> | ||||
| <update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxRentContract"> | <update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxRentContract"> | ||||
| update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 | |||||
| update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() | |||||
| </update> | </update> | ||||
| <update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxRentContract"> | <update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxRentContract"> | ||||