elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bugfix

dev_shibei_match
yinzuomei 4 years ago
parent
064406760a
commit
f7fd7b1ed8
1 changed files with 13 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

14
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
View File

@ -140,7 +140,11 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
}else{
insertStreetEntity.setPids(pingYin.getId());
}
insertStreetEntity.setAllParentName(pingYin.getOrganizationName());
if(org.apache.commons.lang3.StringUtils.isNotBlank(pingYin.getAllParentName())){
insertStreetEntity.setAllParentName(pingYin.getAllParentName().concat(StrConstant.HYPHEN).concat(pingYin.getOrganizationName()));
}else {
insertStreetEntity.setAllParentName(pingYin.getOrganizationName());
}
insertStreetEntity.setOrganizationName(street.getAgencyName());
insertStreetEntity.setLevel("street");
insertStreetEntity.setAreaCode(street.getAreaCode());
@ -153,6 +157,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
insertStreetEntity.setCommunity(StrConstant.EPMETY_STR);
insertStreetEntity.setParentAreaCode(pingYin.getAreaCode());
insertStreetEntity.setId(street.getAgencyId());
insertStreetEntity.setCreatedBy("APP_USER");
insertStreetEntity.setUpdatedBy("APP_USER");
// 3、插入街道
if (null == customerAgencyDao.selectById(insertStreetEntity.getId())) {
customerAgencyDao.insert(insertStreetEntity);
@ -182,6 +188,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
insertCommunityEntity.setCommunity(kcCommunity.getAgencyName());
insertCommunityEntity.setParentAreaCode(insertStreetEntity.getAreaCode());
insertCommunityEntity.setId(kcCommunity.getAgencyId());
insertCommunityEntity.setCreatedBy("APP_USER");
insertCommunityEntity.setUpdatedBy("APP_USER");
CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(insertCommunityEntity.getId());
if(null==customerAgencyEntity){
// 4、插入社区
@ -213,6 +221,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
insertCommunityEntity.setCommunity(community.getAgencyName());
insertCommunityEntity.setParentAreaCode(insertStreetEntity.getAreaCode());
insertCommunityEntity.setId(community.getAgencyId());
insertCommunityEntity.setCreatedBy("APP_USER");
insertCommunityEntity.setUpdatedBy("APP_USER");
CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(insertCommunityEntity.getId());
if(null==customerAgencyEntity){
customerAgencyDao.insert(insertCommunityEntity);
@ -247,6 +257,8 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
insertGrid.setManageDistrict(gridEntity.getGridName());
insertGrid.setTotalUser(NumConstant.ZERO);
insertGrid.setPid(gridEntity.getParentAgencyId());
insertGrid.setCreatedBy("APP_USER");
insertGrid.setUpdatedBy("APP_USER");
if(StringUtils.isEmpty(parentCustomerEntity.getPids())){
insertGrid.setPids(insertGrid.getPid());
}else{

Write Preview
Loading…
Cancel
Save