From d5a1372aebbfbd7aae3e777f9e6ae409f6ad66ff Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 1 Sep 2020 13:21:34 +0800 Subject: [PATCH] fix contract --- .../contract/WxContractBaseController.java | 4 ++-- .../contract/WxRentPropertyContractController.java | 2 +- .../com/iformall/service/impl/WxFlowServiceImpl.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) 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 909274cbc..b327d8cb6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -31,7 +31,7 @@ public class WxContractBaseController extends BaseController{ map.put("remark", remark); //租金+物业合同时用到 if (null != wholeProperyId) { - map.put("businessId", String.valueOf(contractId)+"&"+String.valueOf(wholeProperyId)); + map.put("businessId", String.valueOf(contractId)+":"+String.valueOf(wholeProperyId)); map.put("wholeProperyId", String.valueOf(wholeProperyId)); }else { map.put("businessId", String.valueOf(contractId)); @@ -46,7 +46,7 @@ public class WxContractBaseController extends BaseController{ contractNumberMap.put("key","contractNumber"); //租金+物业合同时用到 if (null != wholeProperyId) { - contractNumberMap.put("value", String.valueOf(contractId)+"&"+String.valueOf(wholeProperyId)); + contractNumberMap.put("value", String.valueOf(contractId)+":"+String.valueOf(wholeProperyId)); }else { contractNumberMap.put("value", String.valueOf(contractId)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index d51e6a338..bf95982b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -151,7 +151,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { return wxRentPropertyContractService.getContractInfo(rentId,propertyId); }else if (StringUtils.isBlank(id)) { //租金+物业工作流查询会传此id - String[] ids = id.split("&"); + String[] ids = id.split(":"); if (ids.length == 2 ) { Long rId = Long.parseLong(ids[0]); Long pId = Long.parseLong(ids[1]); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 43667587d..b2f2de4ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -184,9 +184,9 @@ public class WxFlowServiceImpl implements WxFlowService { //租金+合同的bussinessId 特殊 Long bsId = 0L; Long propetyId = 0L; - if (businessId.contains("&")) { - bsId = Long.parseLong(businessId.split("&")[0]); - propetyId = Long.parseLong(businessId.split("&")[1]); + if (businessId.contains(":")) { + bsId = Long.parseLong(businessId.split(":")[0]); + propetyId = Long.parseLong(businessId.split(":")[1]); }else { bsId = Long.parseLong(businessId); } @@ -272,9 +272,9 @@ public class WxFlowServiceImpl implements WxFlowService { //租金+合同的bussinessId 特殊 Long bsId ; Long propetyId; - if (businessId.contains("&")) { - bsId = Long.parseLong(businessId.split("&")[0]); - propetyId = Long.parseLong(businessId.split("&")[1]); + if (businessId.contains(":")) { + bsId = Long.parseLong(businessId.split(":")[0]); + propetyId = Long.parseLong(businessId.split(":")[1]); }else { bsId = Long.parseLong(businessId); }