Commit 4043e3d6 authored by suhuiguang's avatar suhuiguang

1.车用气瓶登记时,单位地址应该取单据上的而不是实时最新的

parent 0e8d8fda
...@@ -1604,9 +1604,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1604,9 +1604,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
} }
private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo) { private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo) {
// 使用单位信息
Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgVehicleInformation.getUseUnitCreditCode());
//
Map<String, String> equType = new HashMap<>(); Map<String, String> equType = new HashMap<>();
equType.put("equList", this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList())); equType.put("equList", this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
equType.put("equListCode", registerInfo.getEquList()); equType.put("equListCode", registerInfo.getEquList());
...@@ -1636,7 +1633,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1636,7 +1633,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate()); jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
jgUseRegistrationManage.setEquUseAddress(""); jgUseRegistrationManage.setEquUseAddress("");
jgUseRegistrationManage.setManageType("unit"); jgUseRegistrationManage.setManageType("unit");
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : ""); jgUseRegistrationManage.setUseUnitAddress(jgVehicleInformation.getUseUnitAddress());
jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode()); jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode()); jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode()); jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
......
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