Skip to content

A
amos-boot-biz
Commit ce7ba6ec authored by tianbo's avatar tianbo
Browse files
Options

fix(amos-boot-module-jg-api): 修复特种设备列表中到期日期的计算错误

- 将 NEXT_INSPECT_DATE 更改为 INSPECT_DATE - 将 record 字段改为 "RECORD" - 修正 inspect_type 为 "INSPECT_TYPE" - 调整日期计算逻辑，使用 MIN((num[1])::numeric) 来计算设计使用年限
parent d6f818bc
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ ce7ba6ec
......@@ -2716,7 +2716,7 @@
si."COMPANY_ORG_BRANCH_CODE",
json_build_object('designWorkingLife', (SELECT MIN((num[1])::numeric) FROM regexp_matches(di."DESIGN_USE_DATE", '\d+', 'g') AS t(num)), 'useDate', ui."USE_DATE" ,'productDate', fi."PRODUCE_DATE")::text extraInfo,
case when (SELECT MIN((num[1])::numeric) FROM regexp_matches(di."DESIGN_USE_DATE", '\d+', 'g') AS t(num)) ~ '^\d{1,5}$' then
COALESCE((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where record = ui.record and inspect_type = 'AZJDJY' ORDER BY "NEXT_INSPECT_DATE" desc limit 1) + ((SELECT MIN((num[1])::numeric) FROM regexp_matches(di."DESIGN_USE_DATE", '\d+', 'g') AS t(num)) ||'years')::"interval" <![CDATA[<]]> #{currentDate}, false) else false end isExpired
COALESCE((select "INSPECT_DATE" from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" and "INSPECT_TYPE" = 'AZJDJY' ORDER BY "INSPECT_DATE" desc limit 1) + ((SELECT MIN((num[1])::numeric) FROM regexp_matches(di."DESIGN_USE_DATE", '\d+', 'g') AS t(num)) ||'years')::"interval" <![CDATA[<]]> #{currentDate}, false) else false end isExpired
from idx_biz_jg_use_info ui
LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
LEFT JOIN idx_biz_jg_design_info di on di."RECORD" = ui."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