Commit c35e0bf4 authored by hezhuozhi's avatar hezhuozhi

气瓶数据项调整 / 使用登记页面调整

parent a5c2b99f
...@@ -930,20 +930,33 @@ ...@@ -930,20 +930,33 @@
to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') inspectDate, to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') inspectDate,
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate, to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate,
ri.PRODUCT_PHOTO productPhoto, ri.PRODUCT_PHOTO productPhoto,
(select INFORMATION_SITUATION from idx_biz_jg_other_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) informationSituation, oi.INFORMATION_SITUATION informationSituation,
(select CYLINDER_STAMP_ATTACHMENT from idx_biz_jg_other_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) cylinderStampAttachment, oi.CYLINDER_STAMP_ATTACHMENT cylinderStampAttachment,
(select INFORMATION_MANAGE_CODE from idx_biz_jg_other_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) informationManageCode oi.INFORMATION_MANAGE_CODE informationManageCode
FROM FROM
idx_biz_jg_use_info ui idx_biz_jg_use_info ui
LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD" LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = ui."RECORD" LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = ui."RECORD"
LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
</sql> </sql>
<select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/> select * FROM ( <include refid="page-list-vessel"/>
WHERE WHERE
ri."EQU_CATEGORY" = '2300' ri."EQU_CATEGORY" = '2300'
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1) and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
<if test="jsonObject.chargingMedium == null or jsonObject.chargingMedium == ''">
and pv."CHARGING_MEDIUM" like concat('%',#{jsonObject.chargingMedium},'%')
</if>
<if test="jsonObject.useInnerCode == null or jsonObject.useInnerCode == ''">
and ui."USE_INNER_CODE" like concat('%',#{jsonObject.useInnerCode},'%')
</if>
<if test="jsonObject.informationSituation == null or jsonObject.informationSituation == ''">
and oi.INFORMATION_SITUATION =#{jsonObject.informationSituation}
</if>
<if test="jsonObject.informationManageCode == null or jsonObject.informationManageCode == ''">
and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
</if>
<if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''"> <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
and ui."DATA_SOURCE" like 'jg%' and ui."DATA_SOURCE" like 'jg%'
</if> </if>
...@@ -982,6 +995,18 @@ ...@@ -982,6 +995,18 @@
</otherwise> </otherwise>
</choose> </choose>
ORDER BY ui.REC_DATE DESC ORDER BY ui.REC_DATE DESC
) aa
<where>
<if test="jsonObject.equDefineName == null or jsonObject.equDefineName == ''">
and aa.equDefineName like concat('%',#{jsonObject.equDefineName},'%')
</if>
<if test="jsonObject.factoryNum == null or jsonObject.factoryNum == ''">
and aa.factoryNum like concat('%',#{jsonObject.factoryNum},'%')
</if>
<if test="jsonObject.nextInspectDate == null or jsonObject.nextInspectDate == ''">
and aa.nextInspectDate =#{jsonObject.nextInspectDate}
</if>
</where>
</select> </select>
<select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
......
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