From 12898d073035c123df7489161b31fe9659767743 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 19:04:50 +0800 Subject: [PATCH] fix --- .../WxPropertyContractController.java | 6 ++ .../contract/WxRentContractController.java | 5 ++ .../WxRentPropertyContractController.java | 6 ++ .../domain/po/WxPropertyContract.java | 3 + .../iformall/domain/po/WxRentContract.java | 3 + .../domain/vo/WxRentPropertyContractVo.java | 3 + .../impl/WxPropertyContractServiceImpl.java | 16 +++-- .../impl/WxRentContractServiceImpl.java | 6 ++ .../WxRentPropertyContractServiceImpl.java | 12 ++++ .../mapper/WxPropertyContractMapper.xml | 23 ++------ .../resources/mapper/WxRentContractMapper.xml | 59 +++---------------- 11 files changed, 67 insertions(+), 75 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index d95cae870..4003c8ca2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -67,6 +68,11 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.updateTenantInfo(getTenantInfo()); Map result = new HashMap<>(); wxPropertyContract.setSortColumns(SortField.Createtime_DESC); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); + wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); + } PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; if (null != pageInfo && null != pageInfo.getList()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index d84823ecd..1b24e5626 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -77,6 +77,11 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.updateTenantInfo(getTenantInfo()); wxRentContract.setSortColumns(SortField.Createtime_DESC); //Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxRentContract.setFloorForRule(dataRule.getFloorIds()); + wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); + } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 0187ca5ab..37920e93e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -7,6 +7,7 @@ import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.service.WxMallBuildingService; import com.iformall.service.WxMallFloorService; @@ -52,6 +53,11 @@ public class WxRentPropertyContractController extends WxContractBaseController { wxRentPropertyContractVo = new WxRentPropertyContractVo(); } wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); + wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); + } PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index c4bc18c7d..3978f6f96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -223,5 +223,8 @@ public class WxPropertyContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "合同类型", name = "contractType") private Integer contractType; + + @TableField(exist = false) + private List merchantIds; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 43a02e597..82eedeb03 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -468,5 +468,8 @@ public class WxRentContract extends TenantEntity { } return shopList; } + + @TableField(exist = false) + private List merchantIds; } 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 135e18c52..7b801e691 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; /** * @author gongbiao @@ -86,5 +87,7 @@ public class WxRentPropertyContractVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") private Integer flowHas; + + private List merchantIds; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 951726900..85945e788 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -86,16 +86,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Lazy @Autowired WxShopService wxShopService; + + @Lazy + @Autowired + WxMerchantService wxMerchantService; @Override public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { - //Object rentContractStatusInfo = getRentContractStatusInfo(record); - //PageHelper.startPage(pageIndex, pageSize); - //List> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); - //Map result = new HashMap<>(); + List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + record.setId(-1L); + } else { + record.setMerchantIds(mids); + } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); - //result.put("rentContractStatusInfo", rentContractStatusInfo); - //result.put("pageInfo", pageInfo); return pageInfo; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 36dee1367..95971a7bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1812,6 +1812,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { + List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + rentContract.setId(-1L); + } else { + rentContract.setMerchantIds(mids); + } //PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); return pageInfo; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 4f14ce513..7c09404dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -15,12 +15,14 @@ import com.iformall.enums.EnumRentShopType; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxFlowRecordService; +import com.iformall.service.WxMerchantService; import com.iformall.service.WxPropertyContractService; import com.iformall.service.WxRentContractService; import com.iformall.service.WxRentPropertyContractService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -49,9 +51,19 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Autowired WxFlowRecordService wxFlowRecordService; + + @Lazy + @Autowired + WxMerchantService wxMerchantService; @Override public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { + List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null, 0, 0); + if (null == mids || mids.size() <= 0 ) { + record.setId(-1L); + } else { + record.setMerchantIds(mids); + } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 5e783f54c..b2da73fe1 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -109,25 +109,10 @@ and business_id in (${businessForRule}) - - and `id` in - - select id from wx_property_contract where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and json_unquote(json_extract(json_extract(rent_info,'$[*].shopId'),concat('$[',#{idx},']'))) in(select - id from wx_shop where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and floor in (${floorForRule})) + + and merchant_id in + + #{mItem} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index b7bb64f04..c183e7944 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -197,25 +197,11 @@ and business_id in (${businessForRule}) - - and `id` in - - select id from wx_rent_contract where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and json_unquote(json_extract(json_extract(rent_info,'$[*].shopId'),concat('$[',#{idx},']'))) in(select - id from wx_shop where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and floor in (${floorForRule})) + + + and merchant_id in + + #{mItem} @@ -432,39 +418,12 @@ and rc.business_id in (${businessForRule}) - - - and rc.`id` in - - select id from wx_rent_contract where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and json_unquote(json_extract(json_extract(rent_info,'$[*].shopId'),concat('$[',#{idx},']'))) in(select - id from wx_shop where 1=1 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and floor in (${floorForRule})) + + and rc.merchant_id in + + #{mItem} - - order by ${sortColumns} order by rc.createtime desc,rc.id desc