Quellcode durchsuchen

fix contract

release_toaliyun_real
xiaohanzi vor 5 Jahren
Ursprung
Commit
b073fd1275
4 geänderte Dateien mit 35 neuen und 2 gelöschten Zeilen
  1. +17
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  2. +11
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 17
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java Datei anzeigen

@@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxFlowModel;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.vo.WxRentPropertyContractVo;
import com.iformall.enums.EnumContractOperationType;
import com.iformall.enums.EnumFlowContractType;
import com.iformall.enums.EnumFlowKey;
@@ -48,6 +49,22 @@ public class WxContractBaseController extends BaseController{
return map;
}
protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) {
WxFlowModel wxFlowModel = new WxFlowModel();
if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode());
}else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) {
wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode());
}
wxFlowModel.updateTenantInfo(rpvo);
List<WxFlowModel> flows = wxFlowService.getModelBybusiness(wxFlowModel);
if (null != flows && flows.size() > 0) {
return true;
}
return false;
}
protected boolean rentContractHasWorkFlow(WxRentContract wxRentContract) {
WxFlowModel wxFlowModel = new WxFlowModel();


+ 11
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java Datei anzeigen

@@ -39,7 +39,17 @@ public class WxRentPropertyContractController extends WxContractBaseController {
wxRentPropertyContractVo = new WxRentPropertyContractVo();
}
wxRentPropertyContractVo.updateTenantInfo(getTenantInfo());
final PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize);
PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize);
if (null != page && null != page.getList()) {
for (WxRentPropertyContractVo wrc: page.getList()) {
if(rentPropertyHasWorkFlow(wrc)) {
wrc.setFlowHas(1);
}else {
wrc.setFlowHas(0);
}
}
}
return new ResultData(page);
}



+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Datei anzeigen

@@ -1,5 +1,6 @@
package com.iformall.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -80,5 +81,8 @@ public class WxRentPropertyContractVo extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "联营扣点-时间范围 1年2月3周期", name = "busDiscountTime")
private Integer busDiscountTime;
@io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas")
private Integer flowHas;
}


+ 3
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Datei anzeigen

@@ -516,6 +516,8 @@

<resultMap id="contractMap" type="com.iformall.domain.vo.WxRentPropertyContractVo">
<id column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="parent_tenant_id" property="parentTenantId"/>
<result column="rent_id" property="rentId"/>
<result column="property_id" property="propertyId"/>
<result column="shop_name" property="shopName"/>
@@ -540,7 +542,7 @@

<select id="listContractVo" parameterType="com.iformall.domain.vo.WxRentPropertyContractVo" resultMap="contractMap">
select rc.id,rc.id as rent_id, pc.id as property_id, rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`,
select rc.id,rc.tenant_id,rc.parent_tenant_id,rc.id as rent_id, pc.id as property_id, rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`,
rc.price as rent_price,rc.contract_number,rc.shop_name,rc.type,rc.apply_status,
rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status,
rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit,


Laden…
Abbrechen
Speichern