00

code/finance_serv/src/main/java/com/vion/financial/controller/AppendixController.java

@@ -12,6 +12,7 @@ import javax.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -36,12 +37,12 @@ public class AppendixController extends BaseController{
 	
 	@PostMapping(value="/{contract_unid}/upload/appendixes")
 	@ResponseBody
-	public Object upload(AppendixVo appendixVo)  {
+	public Object upload( AppendixVo appendixVo)  {
 		return AppendixService.upload(appendixVo);
 	}
 	@PutMapping(value="/{contract_unid}/upload/appendixes")
 	@ResponseBody
-	public Object update(Appendix appendix) {
+	public Object update(@RequestBody Appendix appendix) {
 		return AppendixService.updateAppendix(appendix);
 	}
 	

code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -211,7 +211,7 @@ public class ContractServiceImpl implements ContractService {
 				if(list_data != null && list_data.size() > 0) {
 					for(Map _map:list_data) {
 						if (contractVo.getSalesperson_unid().equals(_map.get("user_unid"))) {
-							contractVo.setSalesperson_name((String) _map.get("username"));
+							contractVo.setSalesperson_name((String) _map.get("name"));
 						}
 					}
 				}
@@ -234,15 +234,20 @@ public class ContractServiceImpl implements ContractService {
 	public void exportExcel(SelectVo selectVo,HttpServletResponse response) {
 		logger.info("========================导出合同Excel表格===========================");
 		List<Map> list_data = null;
+		String url = financeConfig.getAuthurl();
+		String result = HttpNetClient.doGet(url, null);
+		Map map =  JavaBean2Json.Json2JavaBean(result, Map.class);
+		list_data = (List<Map>) map.get("list_data");
+		
 		if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
-			String url = financeConfig.getAuthurl();
-			String result = HttpNetClient.doGet(url+"?username="+selectVo.getSalesperson_name__like(), null);
-			Map map =  JavaBean2Json.Json2JavaBean(result, Map.class);
-			list_data = (List<Map>) map.get("list_data");
 			if(list_data != null && list_data.size() > 0) {
 				List<String> salesperson_unids = new ArrayList<String>(list_data.size());
+				String name = "";
 				for(Map _map:list_data) {
-					salesperson_unids.add((String) _map.get("user_unid"));
+					name = (String) _map.get("name");
+					if(name.contains(selectVo.getSalesperson_name__like())) {
+						salesperson_unids.add((String) _map.get("user_unid"));
+					}
 				}
 				selectVo.setSalesperson_unids(salesperson_unids);
 			}
@@ -252,7 +257,7 @@ public class ContractServiceImpl implements ContractService {
 			if(list_data != null && list_data.size() > 0) {
 				for(Map _map:list_data) {
 					if (exportModel.getSalesperson_unid().equals(_map.get("user_unid"))) {
-						exportModel.setSalesperson_name((String) _map.get("username"));
+						exportModel.setSalesperson_name((String) _map.get("name"));
 					}
 				}
 			}