|
@@ -2703,7 +2703,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
//测试接口
|
|
|
//String url = "http://comp.jszj.com.cn:8031/api/testAddProject";
|
|
|
//正式接口
|
|
|
- String url = "http://comp.jszj.com.cn:8031/api/project/addProject";
|
|
|
+ String url = "http://comp.jszj.com.cn:8031/api/addProject";
|
|
|
//发送请求
|
|
|
String returnResult = HttpPostTool.doPost(url, encryptByAes);
|
|
|
HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
|
|
@@ -3256,6 +3256,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
Area district = this.getProjectReportedAreaByName(records.getCounty(), areaCity.getId());
|
|
|
if(null != district){
|
|
|
reported.setS3(district.getId());
|
|
|
+ }else{
|
|
|
+ List<Area> areaList = this.getProjectReportedAreaByParentId(areaCity.getId());
|
|
|
+ if(null != areaList){
|
|
|
+ reported.setS3(areaList.get(0).getId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|