Commit 924f70ef authored by chenzhao's avatar chenzhao

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

parents 7b80d1f3 b75bcc36
...@@ -475,11 +475,11 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc ...@@ -475,11 +475,11 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
hygfIcbcRecordDTO.setProtocolStatusName( hygfIcbcRecordDTO.setProtocolStatusName(
IcbcEnum.ProtocolStatus.getNameByCode(hygfIcbcRecordDTO.getProtocolStatus(), "")); IcbcEnum.ProtocolStatus.getNameByCode(hygfIcbcRecordDTO.getProtocolStatus(), ""));
List<PeasantHousehold> peasantHouseholdList = PeasantHouseholdMap.get(hygfIcbcRecordDTO.getAmosUserId()); List<PeasantHousehold> peasantHouseholdList = PeasantHouseholdMap.get(hygfIcbcRecordDTO.getAmosUserId());
if (IcbcEnum.OpenAccountState.FAIL.getCode().equals(hygfIcbcRecordDTO.getOpenAccountStatus())) { // if (IcbcEnum.OpenAccountState.FAIL.getCode().equals(hygfIcbcRecordDTO.getOpenAccountStatus())) {
hygfIcbcRecordDTO.setCustName(peasantHouseholds.get(0).getOwnersName()); // hygfIcbcRecordDTO.setCustName(peasantHouseholds.get(0).getOwnersName());
hygfIcbcRecordDTO.setIdCard(peasantHouseholds.get(0).getIdCard()); // hygfIcbcRecordDTO.setIdCard(peasantHouseholds.get(0).getIdCard());
hygfIcbcRecordDTO.setPhone(peasantHouseholds.get(0).getTelephone()); // hygfIcbcRecordDTO.setPhone(peasantHouseholds.get(0).getTelephone());
} // }
if (!CollectionUtils.isEmpty(peasantHouseholdList)) { if (!CollectionUtils.isEmpty(peasantHouseholdList)) {
// 根据区域经销商名称去重 // 根据区域经销商名称去重
List<HygfIcbcRecordDTO.IcbcPeasantHousehold> icbcPeasantHouseholds = Bean.toModels(peasantHouseholdList, List<HygfIcbcRecordDTO.IcbcPeasantHousehold> icbcPeasantHouseholds = Bean.toModels(peasantHouseholdList,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment