Merge commit 'refs/tags/jenkins-back-end-740^{}' into release

mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

@@ -135,13 +135,11 @@
 	<select id="queryRentContractEndSoonStatus" resultType="int"
 	        parameterType="com.iformall.domain.po.WxPropertyContract">
 		select count(id) from wx_property_contract where tenant_id=#{tenantId} and status=4
-		and DATEDIFF(rental_end_date,now()) &lt;= 30 and rental_end_date > now()
 		<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
 	</select>
 	
 	<select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxPropertyContract">
 		select count(id) from wx_property_contract where tenant_id=#{tenantId} and status in (2,3,4)
-		and rental_start_date &lt;= now() and rental_end_date >= now()
 		<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
 	</select>
 	

mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

@@ -130,7 +130,6 @@
 	
 	<select id="queryRentContractEndSoonStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract">
 		select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status=4
-		and DATEDIFF(rental_end_date,now()) &lt;= 30 and rental_end_date > now()
 		<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
 	</select>