|
@@ -189,12 +189,16 @@ public class BusinessController {
|
|
return Result.success("ok", resJson);
|
|
return Result.success("ok", resJson);
|
|
}
|
|
}
|
|
|
|
|
|
- @GetMapping("findCustomInfoByNum/{businessNum}")
|
|
|
|
- public Result findCustomInfoByNum(@PathVariable("businessNum") String businessNum) {
|
|
|
|
|
|
+
|
|
|
|
+ //查找逻辑修改原来是bussinessnum,1.2开始是headInfId
|
|
|
|
+ @GetMapping("findCustomInfoByHead/{headInfId}")
|
|
|
|
+ public Result findCustomInfoByHead(@PathVariable("headInfId") String headInfId) {
|
|
JSONObject resJson = new JSONObject();
|
|
JSONObject resJson = new JSONObject();
|
|
- CustomInfo list1 = CustomInfoService.QueryCustomInfo(businessNum);
|
|
|
|
- List<CustomInfo> list2 = CustomInfoService.QueryCustomTelephone(businessNum);
|
|
|
|
- List<CustomInfo> list3 = CustomInfoService.QueryCustomAddress(businessNum);
|
|
|
|
|
|
+ CustomInfo list1 = CustomInfoService.QueryCustomInfo(headInfId);
|
|
|
|
+
|
|
|
|
+ //下面两个方法还不知道
|
|
|
|
+ List<CustomInfo> list2 = CustomInfoService.QueryCustomTelephone(headInfId);
|
|
|
|
+ List<CustomInfo> list3 = CustomInfoService.QueryCustomAddress(headInfId);
|
|
|
|
|
|
System.out.println(list3);
|
|
System.out.println(list3);
|
|
String telephonelist = "";
|
|
String telephonelist = "";
|
|
@@ -210,10 +214,11 @@ public class BusinessController {
|
|
addresslist += (customInfo.address);
|
|
addresslist += (customInfo.address);
|
|
addresslist += "; ";
|
|
addresslist += "; ";
|
|
}
|
|
}
|
|
- list1.telephone = telephonelist;
|
|
|
|
- list1.address = addresslist;
|
|
|
|
- System.out.println(list1);
|
|
|
|
-
|
|
|
|
|
|
+ if(list1!=null) {
|
|
|
|
+ list1.telephone = telephonelist;
|
|
|
|
+ list1.address = addresslist;
|
|
|
|
+ System.out.println(list1);
|
|
|
|
+ }
|
|
resJson.put("custom_info", list1);
|
|
resJson.put("custom_info", list1);
|
|
|
|
|
|
|
|
|