Merge remote-tracking branch 'remotes/origin/dev-2.19.1' into dev

src/main/java/com/chinaitop/depot/business/controller/BusinessContractController.java

@@ -5,17 +5,23 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.act.service.ActTaskService;
 import com.chinaitop.depot.business.model.BusinessContract;
 import com.chinaitop.depot.business.model.BusinessContractExample;
@@ -35,6 +41,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.gson.JsonObject;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -62,6 +69,12 @@ public class BusinessContractController {
     @Autowired
     private BusinessDeliveryStorageNoticeService businessNoticeService;
     
+    @Autowired
+    private RestTemplate restTemplate;
+    
+    @Value("${customerUrl}")
+    private String customerUrl;
+    
     /**
      * 合同申请列表.
      * @param pageNum 页码
@@ -240,14 +253,21 @@ public class BusinessContractController {
 		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
 	})
     public Map<String, Object> edit(Integer id) {
-        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        
         if (id != null) {
+        	
             BusinessContract contract = contractService.findById(id);
-            modelMap.put("contract", contract);
-            List<BusinessFile> fileList= businessFileService.getByBid(id, "contract", null, null);
-            modelMap.put("fileList", fileList);
+            returnMap.put("contract", contract);
+            
+            Map<String,Integer> paramMap = new HashMap<String, Integer>();
+            paramMap.put("id", contract.getCustomerBid());
+            
+            Object forObject =  restTemplate.getForEntity(customerUrl+""+contract.getCustomerBid(), Object.class);
+            returnMap.put("customer",forObject);
+            
         }
-        return modelMap;
+        return returnMap;
     }
     
     /**

src/main/resources/bootstrap-dev.yml

@@ -69,3 +69,5 @@ logging:
     com.chinaitop.depot.system.mapper: debug
 
 jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage
+customerUrl: http://localhost:9016/depot/business/customer/edit?id=
+

src/main/resources/bootstrap-prod.yml

@@ -65,3 +65,5 @@ cxf:
 crk-webservice: http://10.223.3.62:9025/Base/webServices/StoreChangeServer?wsdl
 
 jsgjjsjUrl: http://localhost:9022/recPublish/sendMessage
+customerUrl: http://localhost:9016/depot/business/customer/edit?id=
+