diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index d5eec8d37..b6f0cf62b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -2,6 +2,15 @@ INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, VALUES (213, '写字楼住宅', 201, 'Y', NULL, 1, NULL, NULL, 'xzlzzlist', NULL, 0, 213); INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (228, '全部商户', 202, 'Y', NULL, 1, NULL, NULL, 'qbshgnlist', NULL, 0, 221); +INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES (310, '写字楼住宅', 3, 'Y', NULL, 0, NULL, NULL, NULL, 'icon-shanghuguanli', 0, 300); +INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES (31001, '租金合同', 310, 'Y', NULL, 1, NULL, NULL, 'xzlzzzjhtlist', NULL, 0, 31001); +INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES (31002, '物业合同', 310, 'Y', NULL, 1, NULL, NULL, 'xzlzzwyhtlist', NULL, 0, 31002); +INSERT INTO `mallink`.`mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES (31003, '租金+物业合同', 310, 'Y', NULL, 1, NULL, NULL, 'xzlzzzjwyhtlist', NULL, 0, 31003); + ALTER TABLE wx_merchant DROP COLUMN TYPE; @@ -218,3 +227,4 @@ ALTER TABLE wx_property_contract DROP COLUMN contract_type; UPDATE mall_permission SET available = 'N' WHERE id = 222; UPDATE mall_permission SET NAME = '楼栋商户管理' WHERE id = 221; UPDATE mall_permission SET sort = 222 WHERE id = 221; +UPDATE mall_permission SET available = 'N' WHERE id = 300; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 0bfa9af12..f9354998f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -109,5 +109,7 @@ public class WxRentPropertyContractVo extends TenantEntity { private Date firstBillDateEnd; private List merchantIds; + + private String queryShopNumber; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e806c803a..aec7ac553 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -410,6 +410,10 @@ and (json_extract(rc.rent_info,'$[*].shopNumber') like concat('%',#{shopNumber},'%') or rc.shop_name like concat('%',#{shopNumber},'%') ) + and rc.`merchant_id` = #{merchantId} + + and concat(',',rc.shop_name,',') like concat('%,',#{queryShopNumber},',%') +