Skip to content

A
amos-boot-biz
Commit 56d8987c authored by tangwei's avatar tangwei
Browse files
Options

修复bug

parent d3aa61dd
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java
View file @ 56d8987c
...@@ -74,7 +74,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan ...@@ -74,7 +74,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
@Autowired @Autowired
RedisUtils redisUtil; RedisUtils redisUtil;
private static final String regionRedis="app_region_redis"; private static final String regionRedis="app_region_redis_data";
private static final Integer isSignAnAgreement = 1; private static final Integer isSignAnAgreement = 1;
...@@ -146,47 +146,47 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan ...@@ -146,47 +146,47 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
model.setDealerId(unitInfo!=null?unitInfo.getSequenceNbr():null); model.setDealerId(unitInfo!=null?unitInfo.getSequenceNbr():null);
model.setDealerName(unitInfo!=null?unitInfo.getName():null); model.setDealerName(unitInfo!=null?unitInfo.getName():null);
//运维区域 name //运维区域 name
JSONArray regionName = getRegionName(); // JSONArray regionName = getRegionName();
List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class); // List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
if(model.getMaintenanceAreaCode()!=null){ // if(model.getMaintenanceAreaCode()!=null){
String ConsigneeRegion=""; // String ConsigneeRegion="";
List<Integer> da=model.getMaintenanceAreaCode(); // List<Integer> da=model.getMaintenanceAreaCode();
if(da!=null&&!da.isEmpty()){ // if(da!=null&&!da.isEmpty()){
for (int i = 0; i < da.size(); i++) { // for (int i = 0; i < da.size(); i++) {
for (RegionModel re : list) { // for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) { // if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
if(da.size()-1==i){ // if(da.size()-1==i){
ConsigneeRegion = ConsigneeRegion + re.getRegionName(); // ConsigneeRegion = ConsigneeRegion + re.getRegionName();
}else{ // }else{
ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-"; // ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
} // }
break; // break;
} // }
} // }
} // }
model.setMaintenanceArea(ConsigneeRegion); // model.setMaintenanceArea(ConsigneeRegion);
} // }
} // }
//设置常住地址 //设置常住地址
if(model.getPermanentAddressCode()!=null){ // if(model.getPermanentAddressCode()!=null){
String ConsigneeRegion=""; // String ConsigneeRegion="";
List<Integer> da=model.getPermanentAddressCode(); // List<Integer> da=model.getPermanentAddressCode();
if(da!=null&&!da.isEmpty()){ // if(da!=null&&!da.isEmpty()){
for (int i = 0; i < da.size(); i++) { // for (int i = 0; i < da.size(); i++) {
for (RegionModel re : list) { // for (RegionModel re : list) {
if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) { // if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
if(da.size()-1==i){ // if(da.size()-1==i){
ConsigneeRegion = ConsigneeRegion + re.getRegionName(); // ConsigneeRegion = ConsigneeRegion + re.getRegionName();
}else{ // }else{
ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-"; // ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
} // }
break; // break;
} // }
} // }
} // }
model.setPermanentAddressName(ConsigneeRegion); // model.setPermanentAddressName(ConsigneeRegion);
} // }
} // }
//存储std //存储std
//新增人员基础信息表 //新增人员基础信息表
PublicAgencyUser publicAgencyUser=new PublicAgencyUser(); PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
...@@ -232,7 +232,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan ...@@ -232,7 +232,7 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
Collection<RegionModel> regionChild = new ArrayList<>(); Collection<RegionModel> regionChild = new ArrayList<>();
RegionModel regionModel1 = new RegionModel(); RegionModel regionModel1 = new RegionModel();
regionChild.add(regionModel1); regionChild.add(regionModel1);
FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L); FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(null);
Collection<RegionModel> result = collectionFeignClientResult.getResult(); Collection<RegionModel> result = collectionFeignClientResult.getResult();
for (RegionModel regionModel : result) { for (RegionModel regionModel : result) {
if (null != regionModel && null != regionModel.getChildren()) { if (null != regionModel && null != regionModel.getChildren()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment