From 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: 星期一, 23 十一月 2020 10:48:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
index 554eaaf..c4852da 100644
--- a/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java
@@ -1,16 +1,17 @@
package com.java110.front.smo.ownerRepair.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.AbstractComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.ownerRepair.IAddOwnerRepairSMO;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
-import com.java110.core.component.AbstractComponentSMO;
-import com.java110.front.smo.ownerRepair.IAddOwnerRepairSMO;
-import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
/**
@@ -33,7 +34,6 @@
Assert.hasKeyAndValue(paramIn, "repairType", "蹇呭～锛岃閫夋嫨鎶ヤ慨绫诲瀷");
Assert.hasKeyAndValue(paramIn, "repairName", "蹇呭～锛岃濉啓鎶ヤ慨浜哄悕绉�");
Assert.hasKeyAndValue(paramIn, "tel", "蹇呭～锛岃濉啓鎶ヤ慨浜烘墜鏈哄彿");
- Assert.hasKeyAndValue(paramIn, "roomId", "蹇呭～锛岃濉啓鎴垮眿ID");
Assert.hasKeyAndValue(paramIn, "appointmentTime", "蹇呭～锛岃濉啓棰勭害鏃堕棿");
Assert.hasKeyAndValue(paramIn, "context", "蹇呭～锛岃濉啓鎶ヤ慨鍐呭");
@@ -45,8 +45,11 @@
@Override
protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
ResponseEntity<String> responseEntity = null;
- super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ ComponentValidateResult commonValidateResult = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ paramIn.put("userId", commonValidateResult.getUserId());
+ paramIn.put("userName", commonValidateResult.getUserName());
+ paramIn.put("storeId", commonValidateResult.getStoreId());
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/ownerRepair.saveOwnerRepair",
HttpMethod.POST);
--
Gitblit v1.8.0