Commit db9e9762 authored by 刘林's avatar 刘林

fix(jg):历史平台登记bug修改

parent 1478e3f3
...@@ -1032,7 +1032,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1032,7 +1032,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//使用场所 //使用场所
String usePlace = newPosition.getString("transferUsePlace"); String usePlace = newPosition.getString("transferUsePlace");
//所属监管单位 //所属监管单位
String supervisionUnit = newPosition.getString("transferSupervisionUnit"); String supervisionUnit = newPosition.getString("orgBranchCode");
//是否西咸 //是否西咸
String isXixian = newPosition.getString("transferIsXixian"); String isXixian = newPosition.getString("transferIsXixian");
//安全管理员 //安全管理员
......
...@@ -2773,6 +2773,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2773,6 +2773,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo.setPhone(String.valueOf(map.get("safetyManager")).split("_")[0]); useInfo.setPhone(String.valueOf(map.get("safetyManager")).split("_")[0]);
useInfo.setSafetyManager(String.valueOf(map.get("safetyManager")).split("_")[1]); useInfo.setSafetyManager(String.valueOf(map.get("safetyManager")).split("_")[1]);
useInfo.setUseDate(String.valueOf(map.get("useDate"))); useInfo.setUseDate(String.valueOf(map.get("useDate")));
useInfo.setLongitudeLatitude(JSON.toJSONString(map.get("longitudeLatitude")));
useInfo.setUsePlace((String) map.get("usePlace"));
// 历史平台登记,将设备状态改为在用 // 历史平台登记,将设备状态改为在用
useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString()); useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() +"/" + useInfo.getStreetName(); String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() +"/" + useInfo.getStreetName();
...@@ -2784,8 +2786,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2784,8 +2786,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 检验检测【一对多,暂时只取最新一条数据】 // 检验检测【一对多,暂时只取最新一条数据】
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId"))); IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (ObjectUtils.isEmpty(inspectionDetectionInfo)) { if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo(); inspectionDetectionInfo.setRecord((String) map.get("equipId"));
} }
inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode"))); inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName"))); inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
......
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