winter 11 месяцев назад
Родитель
Сommit
188dedd339
3 измененных файлов: 8 добавлений и 0 удалений
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 3
- 0
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<WxRentContract> 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);


+ 4
- 0
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;
}


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

@@ -91,6 +91,7 @@
<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 != monthAverageDays ">and `month_average_days` = #{monthAverageDays}</if>
<if test=" null != mainContract ">and `orgin_id` is null</if>
<if test=" null != queryShopId">
and concat(',',shop_id_str,',') like concat('%,',#{queryShopId},',%')
</if>


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