Commit 2d32ca1d authored by 韩桐桐's avatar 韩桐桐

feat(jg):按照单位办理的设备过滤,过滤掉已经做过使用登记的设备

parent 253975e0
...@@ -370,7 +370,11 @@ ...@@ -370,7 +370,11 @@
</sql> </sql>
<select id="queryForUnitPipelineEquipmentPage" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForUnitPipelineEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-pipeline"/> <include refid="page-list-pipeline"/>
WHERE ri."EQU_CATEGORY" = '8300' and ui."DATA_SOURCE" = 'jg' WHERE
ri."EQU_CATEGORY" = '8300'
and ui."DATA_SOURCE" = 'jg'
and (ui."EQU_STATE" = '' || ui."EQU_STATE" is null )
and (ri."USE_ORG_CODE" = '' || ri."USE_ORG_CODE" is null )
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" > <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
</if> </if>
...@@ -422,9 +426,14 @@ ...@@ -422,9 +426,14 @@
</sql> </sql>
<select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryForUnitVesselEquipmentPage" resultType="com.alibaba.fastjson.JSONObject">
<include refid="page-list-vessel"/> <include refid="page-list-vessel"/>
WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" = 'jg' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1) WHERE
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" > ri."EQU_CATEGORY" = '2300'
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode} and ui."DATA_SOURCE" = 'jg'
and (ui."EQU_STATE" = '' || ui."EQU_STATE" is null )
and (ri."USE_ORG_CODE" = '' || ri."USE_ORG_CODE" is null )
and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
<if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''">
and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
</if> </if>
<if test="jsonObject.record != null and jsonObject.record != ''" > <if test="jsonObject.record != null and jsonObject.record != ''" >
and ui."RECORD" = #{jsonObject.record} and ui."RECORD" = #{jsonObject.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