diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index 22ddd0546..94c684127 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -8,6 +8,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumFlowContractType; import com.iformall.enums.EnumFlowKey; +import com.iformall.enums.EnumRentAgileType; import com.iformall.enums.EnumRentShopType; import com.iformall.service.WxFlowService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,7 @@ public class WxContractBaseController extends BaseController{ @Autowired private WxFlowService wxFlowService; - protected Map generateFlowParams(EnumFlowKey flowType,EnumFlowContractType contractType,String remark,Long contractId,Long wholeProperyId) { + protected Map generateFlowParams(EnumFlowKey flowType,EnumFlowContractType contractType,EnumRentAgileType agileType,String remark,Long contractId,Long wholeProperyId) { Map map = new HashMap(); map.put("businessType", flowType.getCode()); map.put("remark", remark); @@ -52,6 +53,13 @@ public class WxContractBaseController extends BaseController{ } variablesList.add(contractNumberMap); + if (null != agileType) { + Map agileTypeMap = new HashMap(); + agileTypeMap.put("key","agileType"); + agileTypeMap.put("value",String.valueOf(agileType.getCode())); + variablesList.add(agileTypeMap); + } + map.put("variables", variablesList); return map; } 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 1f2d814b9..b3ac00af5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -484,9 +484,9 @@ public class WxPropertyContractController extends WxContractBaseController { remark = (String) map.get("remark"); } if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, remark, contract.getId(),null)); + contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY,null, remark, contract.getId(),null)); }else { - contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, remark, contract.getId(),null)); + contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP,null, remark, contract.getId(),null)); } return wxPropertyContractService.apply(contract,user); } 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 148db53ce..893ecae72 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -660,9 +660,9 @@ public class WxRentContractController extends WxContractBaseController { if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() || rentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) { - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT, wxRentContract.getRemark(), wxRentContract.getId(),null)); + rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT,EnumRentAgileType.getEnum(rentContract.getAgileType()), wxRentContract.getRemark(), wxRentContract.getId(),null)); }else if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){ - rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); + rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, EnumRentAgileType.getEnum(rentContract.getAgileType()),wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); }else { return new ResultData(Result.ERROR,"合同操作类型非法。"); }