Commit 04535f92 authored by 刘林's avatar 刘林

fix(jg):气瓶提交验证修改

parent c67b4c6e
...@@ -600,7 +600,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -600,7 +600,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
map.put("title", "使用登记证流水"); map.put("title", "使用登记证流水");
map.put("renderType", "timeline"); map.put("renderType", "timeline");
result.put("keyParams", jsonData); result.put("keyParams", jsonData);
result.put("deviceRecords", map); result.put("infoRecords", map);
return result; return result;
} }
......
...@@ -675,7 +675,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -675,7 +675,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.eq(JgUseRegistration::getIsDelete, false) .eq(JgUseRegistration::getIsDelete, false)
.eq(JgUseRegistration::getStatus, "已完成") .eq(JgUseRegistration::getStatus, "已完成")
).stream().anyMatch(v -> v.getUseRegistrationCode().contains("瓶30")); ).stream().anyMatch(v -> v.getUseRegistrationCode().contains("瓶30"));
if (hasExistingCertificate) { if (hasExistingCertificate && map.get("isAddEquip").equals("0")) {
throw new BadRequest("该企业已存在气瓶证书,请选择增补功能进行登记!"); throw new BadRequest("该企业已存在气瓶证书,请选择增补功能进行登记!");
} }
} }
......
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