| @@ -31,7 +31,7 @@ public class WxContractBaseController extends BaseController{ | |||||
| map.put("remark", remark); | map.put("remark", remark); | ||||
| //租金+物业合同时用到 | //租金+物业合同时用到 | ||||
| if (null != wholeProperyId) { | 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)); | map.put("wholeProperyId", String.valueOf(wholeProperyId)); | ||||
| }else { | }else { | ||||
| map.put("businessId", String.valueOf(contractId)); | map.put("businessId", String.valueOf(contractId)); | ||||
| @@ -46,7 +46,7 @@ public class WxContractBaseController extends BaseController{ | |||||
| contractNumberMap.put("key","contractNumber"); | contractNumberMap.put("key","contractNumber"); | ||||
| //租金+物业合同时用到 | //租金+物业合同时用到 | ||||
| if (null != wholeProperyId) { | if (null != wholeProperyId) { | ||||
| contractNumberMap.put("value", String.valueOf(contractId)+"&"+String.valueOf(wholeProperyId)); | |||||
| contractNumberMap.put("value", String.valueOf(contractId)+":"+String.valueOf(wholeProperyId)); | |||||
| }else { | }else { | ||||
| contractNumberMap.put("value", String.valueOf(contractId)); | contractNumberMap.put("value", String.valueOf(contractId)); | ||||
| } | } | ||||
| @@ -151,7 +151,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { | |||||
| return wxRentPropertyContractService.getContractInfo(rentId,propertyId); | return wxRentPropertyContractService.getContractInfo(rentId,propertyId); | ||||
| }else if (StringUtils.isBlank(id)) { | }else if (StringUtils.isBlank(id)) { | ||||
| //租金+物业工作流查询会传此id | //租金+物业工作流查询会传此id | ||||
| String[] ids = id.split("&"); | |||||
| String[] ids = id.split(":"); | |||||
| if (ids.length == 2 ) { | if (ids.length == 2 ) { | ||||
| Long rId = Long.parseLong(ids[0]); | Long rId = Long.parseLong(ids[0]); | ||||
| Long pId = Long.parseLong(ids[1]); | Long pId = Long.parseLong(ids[1]); | ||||
| @@ -184,9 +184,9 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| //租金+合同的bussinessId 特殊 | //租金+合同的bussinessId 特殊 | ||||
| Long bsId = 0L; | Long bsId = 0L; | ||||
| Long propetyId = 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 { | }else { | ||||
| bsId = Long.parseLong(businessId); | bsId = Long.parseLong(businessId); | ||||
| } | } | ||||
| @@ -272,9 +272,9 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| //租金+合同的bussinessId 特殊 | //租金+合同的bussinessId 特殊 | ||||
| Long bsId ; | Long bsId ; | ||||
| Long propetyId; | 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 { | }else { | ||||
| bsId = Long.parseLong(businessId); | bsId = Long.parseLong(businessId); | ||||
| } | } | ||||