| @@ -93,6 +93,7 @@ public class WxAgileContractController extends WxContractBaseController { | |||||
| wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); | ||||
| wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); | wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); | ||||
| } | } | ||||
| wxRentContract.setMainContract(EnumYesOrNo.YES.getCode()); | |||||
| PageInfo<WxRentContract> page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); | PageInfo<WxRentContract> page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); | ||||
| Integer hasFlow = null; | Integer hasFlow = null; | ||||
| if (null != page && null != page.getList()) { | if (null != page && null != page.getList()) { | ||||
| @@ -105,6 +106,8 @@ public class WxAgileContractController extends WxContractBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wrc.setFlowHas(hasFlow); | wrc.setFlowHas(hasFlow); | ||||
| //查询影子合同 | |||||
| wrc.setChild(wxAgileContractService.findYingZiContract(wrc.getId(), wrc)); | |||||
| } | } | ||||
| } | } | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -251,6 +251,8 @@ public class WxRentContract extends TenantEntity { | |||||
| } | } | ||||
| return false; | return false; | ||||
| } | } | ||||
| @TableField(exist = false) | |||||
| private WxRentContract child; | |||||
| //是否有工作流 1:有 0:无" | //是否有工作流 1:有 0:无" | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -332,5 +334,7 @@ public class WxRentContract extends TenantEntity { | |||||
| private Integer calcuteIsProperty; | private Integer calcuteIsProperty; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String shopNumber; | private String shopNumber; | ||||
| @TableField(exist = false) | |||||
| private Integer mainContract; | |||||
| } | } | ||||
| @@ -91,6 +91,7 @@ | |||||
| <if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if> | <if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if> | ||||
| <if test=" null != dayPriceCalcute ">and `day_price_calcute` = #{dayPriceCalcute}</if> | <if test=" null != dayPriceCalcute ">and `day_price_calcute` = #{dayPriceCalcute}</if> | ||||
| <if test=" null != monthAverageDays ">and `month_average_days` = #{monthAverageDays}</if> | <if test=" null != monthAverageDays ">and `month_average_days` = #{monthAverageDays}</if> | ||||
| <if test=" null != mainContract ">and `orgin_id` is null</if> | |||||
| <if test=" null != queryShopId"> | <if test=" null != queryShopId"> | ||||
| and concat(',',shop_id_str,',') like concat('%,',#{queryShopId},',%') | and concat(',',shop_id_str,',') like concat('%,',#{queryShopId},',%') | ||||
| </if> | </if> | ||||