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 b309ba36a..3cff0d3a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -1,5 +1,6 @@ package com.iformall.controller.contract; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,10 +27,18 @@ public class WxContractBaseController extends BaseController{ map.put("businessType", flowType.getCode()); map.put("remark", remark); map.put("businessId", String.valueOf(contractId)); - Map variables = new HashMap(); - variables.put("contractType",contractType.getCode()); - variables.put("contractNumber", String.valueOf(contractId)); - map.put("variables", variables); + List variablesList = new ArrayList(); + Map contractTypeMap = new HashMap(); + contractTypeMap.put("key","contractType"); + contractTypeMap.put("value",String.valueOf(contractType.getCode())); + variablesList.add(contractTypeMap); + + Map contractNumberMap = new HashMap(); + contractNumberMap.put("key","contractNumber"); + contractNumberMap.put("value", String.valueOf(contractId)); + variablesList.add(contractNumberMap); + + map.put("variables", variablesList); return map; } 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 f4cf16c77..f94b24ece 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -288,7 +288,7 @@ public class WxRentContractController extends WxContractBaseController { } /** - * 一个商户只能存在一个续签合同。如果有计租中的,则取计租中最新的一条,如果没有计租中的,则取正常到期最近的一条 + * 查询商户计租中的合同 * @param wxRentContract * @return */ @@ -412,7 +412,6 @@ public class WxRentContractController extends WxContractBaseController { @SystemControllerLog(description = "租赁合同-提交审批") public ResultData apply(@ModelAttribute WxRentContract wxRentContract) { MallUserInfo user = getUser(); - WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); if (null == rentContract) { return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");