Skip to content

D
data_management_system
Commit 368142cb authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

修改 方舱导入

parent d100eb2e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FcryServiceImpl.java
View file @ 368142cb
...@@ -169,11 +169,11 @@ public class FcryServiceImpl implements IFcryService ...@@ -169,11 +169,11 @@ public class FcryServiceImpl implements IFcryService
.map(SysDictData::getDictValue).collect(Collectors.toList()); .map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty()) if (!values.isEmpty())
communityValue = values.get(0); communityValue = values.get(0);
else { // else {
fcry.setFailure("小区不存在"); // fcry.setFailure("小区不存在");
failureList.add(fcry); // failureList.add(fcry);
continue; // continue;
} // }
} }
if (StringUtils.isNotEmpty(fcry.getCommittee())){ //如果居委会不为空，去数据字典匹配value if (StringUtils.isNotEmpty(fcry.getCommittee())){ //如果居委会不为空，去数据字典匹配value
List<SysDictData> committee = DictUtils.getDictCache("committee"); List<SysDictData> committee = DictUtils.getDictCache("committee");
...@@ -182,9 +182,11 @@ public class FcryServiceImpl implements IFcryService ...@@ -182,9 +182,11 @@ public class FcryServiceImpl implements IFcryService
if (!values.isEmpty()) if (!values.isEmpty())
committeeValue=values.get(0); committeeValue=values.get(0);
else { else {
fcry.setFailure("居委会不存在"); committeeValue = "";
failureList.add(fcry); communityValue = "";
continue; // fcry.setFailure("居委会不存在");
// failureList.add(fcry);
// continue;
} }
} }
if (StringUtils.isNotEmpty(fcry.getStreet())){ //如果街道镇不为空，去数据字典匹配value if (StringUtils.isNotEmpty(fcry.getStreet())){ //如果街道镇不为空，去数据字典匹配value
...@@ -194,9 +196,12 @@ public class FcryServiceImpl implements IFcryService ...@@ -194,9 +196,12 @@ public class FcryServiceImpl implements IFcryService
if (!values.isEmpty()) if (!values.isEmpty())
streetValue=values.get(0); streetValue=values.get(0);
else { else {
fcry.setFailure("街道不存在"); committeeValue = "";
failureList.add(fcry); communityValue = "";
continue; streetValue = "";
// fcry.setFailure("街道不存在");
// failureList.add(fcry);
// continue;
} }
} }
if (StringUtils.isNotEmpty(fcry.getArea())){ //如果区不为空，去数据字典匹配value if (StringUtils.isNotEmpty(fcry.getArea())){ //如果区不为空，去数据字典匹配value
...@@ -223,12 +228,12 @@ public class FcryServiceImpl implements IFcryService ...@@ -223,12 +228,12 @@ public class FcryServiceImpl implements IFcryService
continue; continue;
} }
} }
if ((StringUtils.isNotEmpty(fcry.getCommunity())&&StringUtils.isEmpty(fcry.getCommittee()))|| // if ((StringUtils.isNotEmpty(fcry.getCommunity())&&StringUtils.isEmpty(fcry.getCommittee()))||
(StringUtils.isNotEmpty(fcry.getCommittee())&&StringUtils.isEmpty(fcry.getStreet()))){ // (StringUtils.isNotEmpty(fcry.getCommittee())&&StringUtils.isEmpty(fcry.getStreet()))){
fcry.setFailure("街道或居委会不存在"); // fcry.setFailure("街道或居委会不存在");
failureList.add(fcry); // failureList.add(fcry);
continue; // continue;
} // }
List<Fcry> fcrys = fcryMapper.selectFcryByCard(fcry.getCardNo()); List<Fcry> fcrys = fcryMapper.selectFcryByCard(fcry.getCardNo());
if (!fcrys.isEmpty()){ if (!fcrys.isEmpty()){
fcry.setCommunity(communityValue); fcry.setCommunity(communityValue);
......
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