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

处理部门名称多空格的问题

feature/dangjian
YUJT 4 years ago
parent
1ff2e55698
commit
94eb2b9e9f
1 changed files with 19 additions and 16 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. 35
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

35
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
View File

@ -139,7 +139,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
}
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
entity.setName(StringUtils.trim(entity.getName()));
entity.setPids(getPidList(entity.getPid()));
insert(entity);
@ -215,7 +215,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
}
}
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
entity.setName(StringUtils.trim(entity.getName()));
//上级部门不能为自身
if (entity.getId().equals(entity.getPid())) {
throw new RenException(ErrorCode.SUPERIOR_DEPT_ERROR);
@ -241,24 +241,24 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity);
packageDepartment(entity, customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerGridEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity);
customerGridDao.deleteGridById(entity.getId().toString());
}else {
} else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity);
packageAgency(entity, customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerGridEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity);
customerGridDao.deleteGridById(entity.getId().toString());
}
}else if(deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)){
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity);
packageGrid(entity, customerGridEntity);
customerGridEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerGridDao.insert(customerGridEntity);
customerDepartmentDao.deleteDepartmentById(entity.getId().toString());
@ -266,31 +266,31 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setDepartmentName(entity.getName());
customerDepartmentDao.updateById(customerDepartmentEntity);
}else {
} else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity);
packageAgency(entity, customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity);
customerDepartmentDao.deleteDepartmentById(entity.getId().toString());
}
}else {
} else {
CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity);
packageGrid(entity, customerGridEntity);
customerGridEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerGridDao.insert(customerGridEntity);
customerAgencyDao.deleteAgencyById(entity.getId().toString());
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity);
packageDepartment(entity, customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity);
customerAgencyDao.deleteAgencyById(entity.getId().toString());
}else {
} else {
packageEntity(entity, customerAgencyEntity);
customerAgencyDao.updateById(customerAgencyEntity);
}
@ -298,7 +298,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
sendMqMessage(dto);
}
private void packageGrid(SysDeptEntity entity,CustomerGridEntity customerGridEntity){
private void packageGrid(SysDeptEntity entity, CustomerGridEntity customerGridEntity) {
customerGridEntity.setId(entity.getId().toString());
customerGridEntity.setPid(entity.getPid().toString());
customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
@ -306,7 +307,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerGridEntity.setGridName(entity.getName());
customerGridEntity.setManageDistrict(entity.getName());
}
private void packageAgency(SysDeptEntity entity,CustomerAgencyEntity customerAgencyEntity){
private void packageAgency(SysDeptEntity entity, CustomerAgencyEntity customerAgencyEntity) {
customerAgencyEntity.setId(entity.getId().toString());
customerAgencyEntity.setPid(entity.getPid().toString());
customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
@ -321,7 +323,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerAgencyEntity.setLevel("community");
}
}
private void packageDepartment(SysDeptEntity entity,CustomerDepartmentEntity customerDepartmentEntity){
private void packageDepartment(SysDeptEntity entity, CustomerDepartmentEntity customerDepartmentEntity) {
customerDepartmentEntity.setId(entity.getId().toString());
customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setDepartmentName(entity.getName());

Write Preview
Loading…
Cancel
Save