java/xizang.git

			@@ -9,7 +9,6 @@
			<result column="contract_name" property="contractName" />
			<result column="start_time" property="startTime" />
			<result column="end_time" property="endTime" />
			<result column="month_rent" property="monthRent" />
			<result column="deposit" property="deposit" />
			<result column="pay_type" property="payType" />
			<result column="first_pay_time" property="firstPayTime" />
			@@ -41,9 +40,9 @@

			<!-- 通用查询结果列 -->
			<sql id="Base_Column_List">
			id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit,
			id, contract_number, contract_name, start_time, end_time, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit,
			proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone,
			memory, contract_file_name, signature, terminate_remark, total_year
			memory, contract_file_name, signature, terminate_remark, total_year,status
			</sql>
			<select id="contractList" resultType="com.ruoyi.system.model.TContract">
			select t1.* from t_contract t1
			@@ -73,6 +72,7 @@
			<if test="query.tenantId != null">
			and t1.tenant_id = #{query.tenantId}
			</if>
			and (t1.status=3 or t1.status=4)
			AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
			</where>
			</select>
			@@ -96,7 +96,7 @@
			#{item}
			</foreach>
			</if>
			<if test="query.ids == null and query.ids.size()=0">
			<if test="query.ids != null and query.ids.size()=0">
			<if test="query.partyTwoName != null and query.partyTwoName != ''">
			and t1.party_two_name like concat('%',#{query.partyTwoName},'%')
			</if>