diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index ea604c4c2..fd5b78eaa 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -42,6 +42,9 @@ + + + @@ -51,7 +54,7 @@ `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, - `file_names`,price_unit,rent_price,subject_name,rent_start_type + `file_names`,price_unit,rent_price,subject_name,rent_start_type,`operation_type` @@ -87,6 +90,7 @@ and `start_date` = #{startDate} and `end_date` = #{endDate} and `rent_shop_type` = #{rentShopType} + and `operation_type` = #{operationType} and id in @@ -137,6 +141,7 @@ and rc.`apply_status` = #{applyStatus} and b.id = #{building} and f.id = #{floor} + and `operation_type` = #{operationType} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index aa31e9a19..fbdfccf50 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -51,6 +51,9 @@ + + + @@ -62,7 +65,7 @@ `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type, - `rent_input_way`,`adjust_ratio_way` + `rent_input_way`,`adjust_ratio_way`,`operation_type` @@ -98,6 +101,7 @@ and `start_date` = #{startDate} and `end_date` = #{endDate} and `rent_shop_type` = #{rentShopType} + and `operation_type` = #{operationType} and id in @@ -145,6 +149,7 @@ and rc.`apply_status` = #{applyStatus} and b.id = #{building} and f.id = #{floor} + and `operation_type` = #{operationType} order by ${sortColumns} order by rc.id desc