Merge branch 'feature/addRentHouseOfPC' into test

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml

@@ -36,15 +36,55 @@
 
     <select id="getContractInfoList" resultType="com.epmet.plugin.power.dto.rent.RentContractInfoDTO">
     SELECT
-        i.*,
+        i.ID,
+        i.COMMUNITY_ID,
+        i.COMMUNITY_NAME,
+        i.GRID_ID,
+        i.GRID_NAME,
+        i.VILLAGE_ID,
+        i.VILLAGE_NAME,
+        i.BUILD_ID,
+        i.BUILD_NAME,
+        i.UNIT_ID,
+        i.UNIT_NAME,
+        i.HOME_ID,
+        i.HOME_NAME,
+        i.OWNER_NAME,
+        i.STATE,
+        i.LESSOR_NAME,
+        i.LESSOR_ID_CARD,
+        i.LESSOR_MOBILE,
+        i.LESSOR_RELATION,
+        i.LESSEE_NAME,
+        i.LESSEE_ID_CARD,
+        i.LESSEE_MOBILE,
+        i.LESSEE_UNIT,
+        i.SIGN_DATE,
+        i.REVIEW_DATE,
+        i.START_DATE,
+        i.END_DATE,
+        i.REASON,
+        i.DEL_FLAG,
+        i.REVISION,
+        i.CREATED_BY,
+        i.CREATED_TIME,
+        i.UPDATED_BY,
+        i.UPDATED_TIME,
+        i.CUSTOMER_ID,
+        i.LESSOR_LIVE_ADDRESS,
+        i.LESSEE_HOUSE_ADDRESS,
+        i.IS_PC_INPUT,
         IF( b.id IS NULL, '否', '是' ) AS isBlack
     FROM
         pli_rent_contract_info i
         LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD AND b.DEL_FLAG = '0'
         WHERE
         i.DEL_FLAG = '0'
-        <if test="isPcInput != null and isPcInput != ''">
-            AND i.IS_PC_INPUT = #{isPcInput}
+        <if test="isPcInput == 1 or isPcInput == '1'">
+            AND i.IS_PC_INPUT = '1'
+        </if>
+        <if test="isPcInput == 0 or isPcInput == '0'">
+            AND (i.IS_PC_INPUT != '1'  or i.IS_PC_INPUT is null)
         </if>
         <if test="customerId != null and customerId != ''">
             AND i.CUSTOMER_ID = #{customerId}