ef40bc86 by 肖初晴

【DAOP-1.0】企业认证

【功能点】测试问题处理
1 parent 35280e14
...@@ -331,7 +331,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -331,7 +331,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
331 vo.setProvince(entity.getProvince()); 331 vo.setProvince(entity.getProvince());
332 vo.setCity(entity.getCity()); 332 vo.setCity(entity.getCity());
333 vo.setDistrict(entity.getDistrict()); 333 vo.setDistrict(entity.getDistrict());
334 vo.setCompanyAddress(String.format("%s/%s/%s",vo.getProvince(),vo.getCity(),vo.getDistrict())); 334 //vo.setCompanyAddress(String.format("%s/%s/%s",vo.getProvince(),vo.getCity(),vo.getDistrict()));
335 if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){ 335 if(CollectionUtils.isEmpty(ChangeInfoUtil.areaList)){
336 ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData(); 336 ChangeInfoUtil.areaList = configureFeign.getBoroughCodeName().getData();
337 } 337 }
...@@ -355,22 +355,21 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -355,22 +355,21 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
355 if(array.size() == 0){ 355 if(array.size() == 0){
356 return null; 356 return null;
357 } 357 }
358 List<TenantLicRQVO> list = new ArrayList<>(); 358 JSONArray itemArray = new JSONArray();
359 for(int i = 0; i < array.size(); i++){ 359 for(int i = 0; i < array.size(); i++){
360 JSONObject obj = array.getJSONObject(i); 360 JSONObject obj = array.getJSONObject(i);
361 TenantLicRQVO item = new TenantLicRQVO();
362 item.setLicenseType("1");
363
364 //格式转换 361 //格式转换
365 JSONObject itemOjb = new JSONObject(); 362 JSONObject itemOjb = new JSONObject();
366 JSONArray itemArray = new JSONArray();
367 itemOjb.put("name",obj.get("name")); 363 itemOjb.put("name",obj.get("name"));
368 itemOjb.put("path",obj.get("url")); 364 itemOjb.put("path",obj.get("url"));
369 itemArray.add(itemOjb); 365 itemArray.add(itemOjb);
366 }
367 TenantLicRQVO item = new TenantLicRQVO();
368 item.setLicenseType("1");
370 item.setPictContentJson(JSON.toJSONString(itemArray)); 369 item.setPictContentJson(JSON.toJSONString(itemArray));
371 370
371 List<TenantLicRQVO> list = new ArrayList<>();
372 list.add(item); 372 list.add(item);
373 }
374 return list; 373 return list;
375 } 374 }
376 375
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!