Commit 60613180 authored by 刘林's avatar 刘林

fix(jg):历史登记维保备案查询bug修改

parent fc5768da
......@@ -1047,9 +1047,9 @@
FROM
"tzs_jg_maintenance_contract_eq" as tjmce
LEFT JOIN "tzs_jg_maintenance_contract" as tjmc ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
AND tjmc."status" = '已完成'
WHERE
tjmce."equ_id" = #{id}
AND tjmc."status" = '已完成'
ORDER BY tjmce."rec_date" desc
LIMIT 1
</select>
......
......@@ -2571,6 +2571,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
// 维保信息
Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
if (ValidationUtil.isEmpty(maintenanceDetail)) {
maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
}
if (!ObjectUtils.isEmpty(inspectDetail)) {
detail.putAll(inspectDetail);
}
......
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