[合同管理][修改][提前终止合同]

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

@@ -99,27 +99,27 @@
 	</select>
 	
 	<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 DATEDIFF(rental_end_date,now()) &lt;= 30
+		select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status!=1 and status!=6 and DATEDIFF(rental_end_date,now()) &lt;= 30
 	</select>
 	
 	<select id="queryRentContractPaidStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract">
-		select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status!=1 and rental_start_date &lt;= now() and rental_end_date >= now()
+		select count(id) from wx_rent_contract where tenant_id=#{tenantId} and status!=1 and status!=6 rental_start_date &lt;= now() and rental_end_date >= now()
 	</select>
 	
 	<select id="queryRentContractEndStatus" resultType="int" parameterType="com.iformall.domain.po.WxRentContract">
-		select count(id) from wx_rent_contract where tenant_id=#{tenantId}  and status!=1 and rental_end_date &lt;now()
+		select count(id) from wx_rent_contract where tenant_id=#{tenantId}  and status!=1 and status!=6 and rental_end_date &lt;now()
 	</select>
 	
 	<update id="updateRentContractEndSoonStatus" parameterType="com.iformall.domain.po.WxRentContract">
-		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and DATEDIFF(rental_end_date,now()) &lt;= 30
+		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and DATEDIFF(rental_end_date,now()) &lt;= 30
 	</update>
 	
 	<update id="updateRentContractPaidStatus" parameterType="com.iformall.domain.po.WxRentContract">
-		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and rental_start_date &lt;= now() and rental_end_date >= now()
+		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and rental_start_date &lt;= now() and rental_end_date >= now()
 	</update>
 	
 	<update id="updateRentContractEndStatus" parameterType="com.iformall.domain.po.WxRentContract">
-		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and rental_end_date &lt;now()
+		update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=#{status} and status!=1 and status!=6 and rental_end_date &lt;now()
 	</update>
 
 </mapper>