Commit 8d947879 authored by 刘林's avatar 刘林

fix(jg):有证历史登记报错问题处理

parent a5f80da5
...@@ -970,9 +970,6 @@ ...@@ -970,9 +970,6 @@
<choose> <choose>
<when test="jsonObject.DATA_SOURCE == 'jg_his_black'"> <when test="jsonObject.DATA_SOURCE == 'jg_his_black'">
and ui."DATA_SOURCE" like 'jg_his_black%' and ui."DATA_SOURCE" like 'jg_his_black%'
and CURRENT_DATE <![CDATA[<]]> (select NEXT_INSPECT_DATE
from idx_biz_jg_inspection_detection_info
where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1 )
</when> </when>
<when test="jsonObject.DATA_SOURCE == 'jg_his'"> <when test="jsonObject.DATA_SOURCE == 'jg_his'">
and ui."DATA_SOURCE" like 'jg_his%' and ui."DATA_SOURCE" like 'jg_his%'
......
...@@ -827,7 +827,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -827,7 +827,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
.map(String::valueOf) .map(String::valueOf)
.map(String::trim) .map(String::trim)
.orElse(null); .orElse(null);
if (dataSource.equals("jg_his") && useRegistrationCode == null || Objects.requireNonNull(useRegistrationCode).isEmpty()) { if (useRegistrationCode == null) {
throw new BadRequest("请填写使用登记证编号后进行暂存!"); throw new BadRequest("请填写使用登记证编号后进行暂存!");
} }
String equipId = String.valueOf(equipmentInfoForm.get("RECORD")); String equipId = String.valueOf(equipmentInfoForm.get("RECORD"));
......
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