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

Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

dev
yinzuomei 3 years ago
parent
f2ddb1ef42 4f9a0ac123
commit
cec9c9219c
1 changed files with 12 additions and 12 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. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

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

@ -202,30 +202,30 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
entityList.add(e);
}
if (!houseDTO.getOwnerName().equals(entity.getOwnerName())){
sbAfter.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(houseDTO.getOwnerName()).append("；");
sbBefore.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(entity.getOwnerName()).append("；");
sbAfter.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerName()) ? houseDTO.getOwnerName() : "无").append("；");
sbBefore.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerName()) ? entity.getOwnerName() : "无").append("；");
IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
e.setChangeCol(HouseChangeEnums.OWNER_NAME.getColumn());
e.setChangeAfter(houseDTO.getOwnerName());
e.setChangeBefore(entity.getOwnerName());
e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerName()) ? houseDTO.getOwnerName() : "无");
e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerName()) ? entity.getOwnerName() : "无");
entityList.add(e);
}
if (!houseDTO.getOwnerPhone().equals(entity.getOwnerPhone())){
sbAfter.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(houseDTO.getOwnerPhone()).append("；");
sbBefore.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(entity.getOwnerPhone()).append("；");
sbAfter.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerPhone()) ? houseDTO.getOwnerPhone() : "无").append("；");
sbBefore.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerPhone()) ? entity.getOwnerPhone() : "无").append("；");
IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
e.setChangeCol(HouseChangeEnums.OWNER_PHONE.getColumn());
e.setChangeAfter(houseDTO.getOwnerPhone());
e.setChangeBefore(entity.getOwnerPhone());
e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerPhone()) ? houseDTO.getOwnerPhone() : "无");
e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerPhone()) ? entity.getOwnerPhone() : "无");
entityList.add(e);
}
if (!houseDTO.getOwnerIdCard().equals(entity.getOwnerIdCard())){
sbAfter.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(houseDTO.getOwnerIdCard()).append("；");
sbBefore.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(entity.getOwnerIdCard()).append("；");
sbAfter.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerIdCard()) ? houseDTO.getOwnerIdCard() : "无").append("；");
sbBefore.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无").append("；");
IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
e.setChangeCol(HouseChangeEnums.OWNER_ID_CARD.getColumn());
e.setChangeAfter(houseDTO.getOwnerIdCard());
e.setChangeBefore(entity.getOwnerIdCard());
e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerIdCard()) ? houseDTO.getOwnerIdCard() : "无");
e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无");
entityList.add(e);
}
if (StringUtils.isNotBlank(sbAfter)){

Write Preview
Loading…
Cancel
Save