Browse Source

org 代码清理

dev_shibei_match
jianjun 4 years ago
parent
commit
369915a942
  1. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  2. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java
  3. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java
  4. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@ -88,7 +88,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setCustomerId(customerId); icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setBuildingId(entity.getId()); icBuildingUnit.setBuildingId(entity.getId());
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1)); icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit); unitList.add(icBuildingUnit);
} }
@ -103,7 +103,7 @@ public class BuildingServiceImpl implements BuildingService {
log.error("com.epmet.service.impl.BuildingServiceImpl.treeList,没有找到工作人员所属的机关信息,用户Id:{}",staffId); log.error("com.epmet.service.impl.BuildingServiceImpl.treeList,没有找到工作人员所属的机关信息,用户Id:{}",staffId);
return new ArrayList<>(); return new ArrayList<>();
} }
// agency = new CustomerStaffAgencyDTO(); // agency = new CustomerStaffAgencyDTO();
// agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c"); // agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c");
//1.获取所在组织及下级组织 //1.获取所在组织及下级组织
@ -275,7 +275,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setBuildingId(uuid); icBuildingUnit.setBuildingId(uuid);
icBuildingUnit.setCustomerId(customerId); icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1)); icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit); unitList.add(icBuildingUnit);
} }
@ -464,7 +464,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity(); IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
icBuildingUnit.setBuildingId(icBuilding.getId()); icBuildingUnit.setBuildingId(icBuilding.getId());
icBuildingUnit.setCustomerId(customerId); icBuildingUnit.setCustomerId(customerId);
icBuildingUnit.setUnitName(String.valueOf(i+1)+"单元"); icBuildingUnit.setUnitName((i + 1) +"单元");
icBuildingUnit.setUnitNum(String.valueOf(i+1)); icBuildingUnit.setUnitNum(String.valueOf(i+1));
unitList.add(icBuildingUnit); unitList.add(icBuildingUnit);
} }

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java

@ -139,7 +139,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
} }
} }
//分队成员 //分队成员
StringBuffer inspectorsNames = new StringBuffer(""); StringBuffer inspectorsNames = new StringBuffer();
for (String str : resultDTO.getInspectors().split(",")) { for (String str : resultDTO.getInspectors().split(",")) {
teamDTOList.forEach(r -> { teamDTOList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -188,7 +188,7 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
} }
}); });
//分队成员 //分队成员
StringBuffer inspectorsNames = new StringBuffer(""); StringBuffer inspectorsNames = new StringBuffer();
for (String str : dto.getInspectors().split(",")) { for (String str : dto.getInspectors().split(",")) {
teamDTOList.forEach(r -> { teamDTOList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -202,4 +202,4 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl<IcPlacePatro
resultDTO.setList(result.getList()); resultDTO.setList(result.getList());
return resultDTO; return resultDTO;
} }
} }

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java

@ -159,7 +159,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
//2.查询所有分队下人员名单 //2.查询所有分队下人员名单
List<IcPlacePatrolTeamStaffDTO> teamDTOList = icPlacePatrolTeamStaffDao.getByTeamId(resultDTO.getPlacePatrolTeamId()); List<IcPlacePatrolTeamStaffDTO> teamDTOList = icPlacePatrolTeamStaffDao.getByTeamId(resultDTO.getPlacePatrolTeamId());
//3.封装九小场所数据 //3.封装九小场所数据
StringBuffer inspectorsNames = new StringBuffer(""); StringBuffer inspectorsNames = new StringBuffer();
for (String str : resultDTO.getInspectors().split(",")) { for (String str : resultDTO.getInspectors().split(",")) {
teamDTOList.forEach(r -> { teamDTOList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -195,7 +195,7 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
//3.封装各分队人员数据 //3.封装各分队人员数据
for (PlacePatrolReviewRecordDetailResultDTO dto : result.getList()) { for (PlacePatrolReviewRecordDetailResultDTO dto : result.getList()) {
//分队成员 //分队成员
StringBuffer inspectorsNames = new StringBuffer(""); StringBuffer inspectorsNames = new StringBuffer();
for (String str : dto.getInspectors().split(",")) { for (String str : dto.getInspectors().split(",")) {
teamDTOList.forEach(r -> { teamDTOList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -218,4 +218,4 @@ public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl<IcPlac
public int delByPatrolRecordId(String staffId, String placePatrolRecordId) { public int delByPatrolRecordId(String staffId, String placePatrolRecordId) {
return baseDao.delByPatrolRecordId(staffId, placePatrolRecordId); return baseDao.delByPatrolRecordId(staffId, placePatrolRecordId);
} }
} }

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java

@ -190,7 +190,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
//4.分别封装网格。九小场所数据 //4.分别封装网格。九小场所数据
//网格 //网格
StringBuffer gridNames = new StringBuffer(""); StringBuffer gridNames = new StringBuffer();
for (String str : resultDTO.getGridIds().split(",")) { for (String str : resultDTO.getGridIds().split(",")) {
gridList.forEach(r -> { gridList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -200,7 +200,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
} }
resultDTO.setGridNames(gridNames.toString()); resultDTO.setGridNames(gridNames.toString());
//九小场所 //九小场所
StringBuffer ninePlaceNames = new StringBuffer(""); StringBuffer ninePlaceNames = new StringBuffer();
for (String str : resultDTO.getNinePlaceVals().split(",")) { for (String str : resultDTO.getNinePlaceVals().split(",")) {
nineList.getData().forEach(r -> { nineList.getData().forEach(r -> {
if (str.equals(r.getValue())) { if (str.equals(r.getValue())) {
@ -248,7 +248,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
//4.封装网格、九小场所数据 //4.封装网格、九小场所数据
for (PlacePatrolTeamDetailResultDTO dto : result.getList()) { for (PlacePatrolTeamDetailResultDTO dto : result.getList()) {
StringBuffer gridNames = new StringBuffer(""); StringBuffer gridNames = new StringBuffer();
for (String str : dto.getGridIds().split(",")) { for (String str : dto.getGridIds().split(",")) {
gridList.forEach(r -> { gridList.forEach(r -> {
if (str.equals(r.getId())) { if (str.equals(r.getId())) {
@ -257,7 +257,7 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
}); });
} }
dto.setGridNames(gridNames.toString()); dto.setGridNames(gridNames.toString());
StringBuffer ninePlaceNames = new StringBuffer(""); StringBuffer ninePlaceNames = new StringBuffer();
for (String str : dto.getNinePlaceVals().split(",")) { for (String str : dto.getNinePlaceVals().split(",")) {
nineList.getData().forEach(r -> { nineList.getData().forEach(r -> {
if (str.equals(r.getValue())) { if (str.equals(r.getValue())) {
@ -272,4 +272,4 @@ public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl<IcPlacePatrolT
return resultDTO; return resultDTO;
} }
} }

Loading…
Cancel
Save