Skip to content

A
amos-boot-biz
Commit 929c76c5 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):台套的历史设备登记

parent 2c1da06f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ 929c76c5
...@@ -2488,12 +2488,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2488,12 +2488,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]); jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
jgUseRegistration.setReceiveCompanyOrgCode(commonService.getOneCompany(jgUseRegistration.getReceiveCompanyCode()).getOrgCode()); jgUseRegistration.setReceiveCompanyOrgCode(commonService.getOneCompany(jgUseRegistration.getReceiveCompanyCode()).getOrgCode());
} }
// 安全管理员
if (map.containsKey("safetyManager")) {
String[] data = String.valueOf(map.getString("safetyManager")).split("_");
map.put("safetyManagerId", data[0]);
map.put("safetyManagerName", data[1]);
}
// 使用单位提交 // 使用单位提交
jgUseRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? jgUseRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyName().split("_")[1] : company.getCompanyName()); company.getCompanyName().split("_")[1] : company.getCompanyName());
...@@ -2679,10 +2673,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2679,10 +2673,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if (!ValidationUtil.isEmpty(info)) { if (!ValidationUtil.isEmpty(info)) {
info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]); info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]); info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
info.setMeMaster(ValidationUtil.isEmpty(map.get("meMaster")) ? null : String.valueOf(map.get("meMaster")).split("_")[1]); info.setMeMaster(ValidationUtil.isEmpty(map.get("meMaster")) ? null : String.valueOf(map.get("meMaster")));
info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("meMasterPhone")) ? null : String.valueOf(map.get("meMasterPhone"))); info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("meMasterPhone")) ? null : String.valueOf(map.get("meMasterPhone")));
info.setMeMasterId(ValidationUtil.isEmpty(map.get("meMasterId")) ? null : String.valueOf(map.get("meMasterId"))); info.setMeMasterId(ValidationUtil.isEmpty(map.get("meMasterId")) ? null : String.valueOf(map.get("meMasterId")));
info.setMeMaster1(ValidationUtil.isEmpty(map.get("meMaster1")) ? null : String.valueOf(map.get("meMaster1")).split("_")[1]); info.setMeMaster1(ValidationUtil.isEmpty(map.get("meMaster1")) ? null : String.valueOf(map.get("meMaster1")));
info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("meMaster1Phone")) ? null : String.valueOf(map.get("meMaster1Phone"))); info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("meMaster1Phone")) ? null : String.valueOf(map.get("meMaster1Phone")));
info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("meMaster1Id")) ? null : String.valueOf(map.get("meMaster1Id"))); info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("meMaster1Id")) ? null : String.valueOf(map.get("meMaster1Id")));
try { try {
......
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