diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 7e731a4f9..078f974e5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -93,6 +93,7 @@ public class WxAgileContractController extends WxContractBaseController { wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); } + wxRentContract.setMainContract(EnumYesOrNo.YES.getCode()); PageInfo page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { @@ -105,6 +106,8 @@ public class WxAgileContractController extends WxContractBaseController { } } wrc.setFlowHas(hasFlow); + //查询影子合同 + wrc.setChild(wxAgileContractService.findYingZiContract(wrc.getId(), wrc)); } } return new ResultData(page); 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 28704d118..9aa91c038 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -251,6 +251,8 @@ public class WxRentContract extends TenantEntity { } return false; } + @TableField(exist = false) + private WxRentContract child; //是否有工作流 1:有 0:无" @TableField(exist = false) @@ -332,5 +334,7 @@ public class WxRentContract extends TenantEntity { private Integer calcuteIsProperty; @TableField(exist = false) private String shopNumber; + @TableField(exist = false) + private Integer mainContract; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e9201b660..54205b9d3 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -91,6 +91,7 @@ and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) and `day_price_calcute` = #{dayPriceCalcute} and `month_average_days` = #{monthAverageDays} + and `orgin_id` is null and concat(',',shop_id_str,',') like concat('%,',#{queryShopId},',%')