winter 1 год назад
Родитель
Сommit
39ab14ee62
3 измененных файлов: 16 добавлений и 0 удалений
  1. +10
    -0
      mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  3. +4
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 10
- 0
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;

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Просмотреть файл

@@ -109,5 +109,7 @@ public class WxRentPropertyContractVo extends TenantEntity {
private Date firstBillDateEnd;
private List<Long> merchantIds;
private String queryShopNumber;
}


+ 4
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -410,6 +410,10 @@
<if test=" null != shopNumber and shopNumber!=''">
and (json_extract(rc.rent_info,'$[*].shopNumber') like concat('%',#{shopNumber},'%') or rc.shop_name like concat('%',#{shopNumber},'%') )
</if>
<if test=" null != merchantId and '' != merchantId">and rc.`merchant_id` = #{merchantId}</if>
<if test=" null != queryShopNumber and queryShopNumber!=''">
and concat(',',rc.shop_name,',') like concat('%,',#{queryShopNumber},',%')
</if>
<!-- <if test=" null != shopNumber and shopNumber!='' and null != rentShopType and rentShopType==1">
and json_extract(rc.rent_info,'$[*].shopNumber') like concat('%',#{shopNumber},'%')
</if>


Загрузка…
Отмена
Сохранить