luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

master
zhangyuan 3 years ago
parent
0ecd1ea8d2
commit
1d80a52a2d
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
View File

@ -477,41 +477,41 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
if (formDTO != null) { if (formDTO != null) {
if (!origin.getPlaceType().equals(formDTO.getPlaceType())) { if (!origin.getPlaceType().equals(formDTO.getPlaceType())) {
record.setPlaceType(record.getPlaceType().concat("->").concat(formDTO.getPlaceType())); record.setPlaceType(origin.getPlaceType().concat("->").concat(formDTO.getPlaceType()));
List<IcCoverageCategoryDictListResultDTO> categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol"); List<IcCoverageCategoryDictListResultDTO> categoryList = coverageService.dictMap(loginUserUtil.getLoginUserCustomerId(), "enterprise_patrol");
Map<String, String> categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); Map<String, String> categoryMap = categoryList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel));
record.setPlaceType(categoryMap.get(record.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType()))); record.setPlaceType(categoryMap.get(origin.getPlaceType()).concat("->").concat(categoryMap.get(formDTO.getPlaceType())));
} }
if (!origin.getGridId().equals(formDTO.getGridId())) { if (!origin.getGridId().equals(formDTO.getGridId())) {
CustomerGridEntity originGrid = customerGridDao.selectById(record.getGridId()); CustomerGridEntity originGrid = customerGridDao.selectById(origin.getGridId());
CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId()); CustomerGridEntity thisGrid = customerGridDao.selectById(formDTO.getGridId());
record.setGridId(record.getGridId().concat("->").concat(thisGrid.getGridName())); record.setGridId(origin.getGridId().concat("->").concat(thisGrid.getGridName()));
if (originGrid != null && thisGrid != null) { if (originGrid != null && thisGrid != null) {
record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId())); record.setGridId(originGrid.getGridName().concat("->").concat(formDTO.getGridId()));
} }
} }
if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) { if (!origin.getPlaceOrgName().equals(formDTO.getPlaceOrgName())) {
record.setPlaceOrgName(record.getPlaceOrgName().concat("->").concat(record.getPlaceOrgName())); record.setPlaceOrgName(origin.getPlaceOrgName().concat("->").concat(formDTO.getPlaceOrgName()));
} }
if (!origin.getScale().equals(formDTO.getScale())) { if (!origin.getScale().equals(formDTO.getScale())) {
record.setScale(record.getScale().concat("->").concat(formDTO.getScale())); record.setScale(origin.getScale().concat("->").concat(formDTO.getScale()));
Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode()); Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.SCALE.getCode());
if (!result.success() || null == result.getData()) { if (!result.success() || null == result.getData()) {
throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result));
} else { } else {
Map<String, String> scaleMap = result.getData(); Map<String, String> scaleMap = result.getData();
record.setScale(scaleMap.get(record.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale()))); record.setScale(scaleMap.get(origin.getScale()).concat("->").concat(scaleMap.get(formDTO.getScale())));
} }
} }
if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) { if (!origin.getPersonInCharge().equals(formDTO.getPersonInCharge())) {
record.setPersonInCharge(record.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge())); record.setPersonInCharge(origin.getPersonInCharge().concat("->").concat(formDTO.getPersonInCharge()));
} }
if (!origin.getMobile().equals(formDTO.getMobile())) { if (!origin.getMobile().equals(formDTO.getMobile())) {
record.setMobile(record.getMobile().concat("->").concat(formDTO.getMobile())); record.setMobile(origin.getMobile().concat("->").concat(formDTO.getMobile()));
} }
if (!origin.getAddress().equals(formDTO.getAddress())) { if (!origin.getAddress().equals(formDTO.getAddress())) {
record.setAddress(record.getAddress().concat("->").concat(formDTO.getAddress())); record.setAddress(origin.getAddress().concat("->").concat(formDTO.getAddress()));
} }
} }

Write Preview
Loading…
Cancel
Save