Commit 69bfbf38 authored by hcing's avatar hcing

fix(jg): bugfix30527

parent ef23209a
...@@ -411,7 +411,6 @@ ...@@ -411,7 +411,6 @@
project_contraption_id project_contraption_id
FROM tzs_jg_use_registration FROM tzs_jg_use_registration
WHERE is_delete = 0 WHERE is_delete = 0
AND status <![CDATA[<>]]> '使用单位待提交'
<!-- 公共主表过滤条件 --> <!-- 公共主表过滤条件 -->
<if test="dto.status != null and dto.status != ''"> <if test="dto.status != null and dto.status != ''">
AND status = #{dto.status} AND status = #{dto.status}
...@@ -457,6 +456,7 @@ ...@@ -457,6 +456,7 @@
AND supervision_org_code LIKE CONCAT(#{dto.supervisionOrgCode}, '%') AND supervision_org_code LIKE CONCAT(#{dto.supervisionOrgCode}, '%')
</otherwise> </otherwise>
</choose> </choose>
AND status <![CDATA[<>]]> '使用单位待提交'
</if> </if>
<if test="dto.dataType == 'company' "> <if test="dto.dataType == 'company' ">
AND (use_unit_credit_code = #{dto.unitCode} AND (use_unit_credit_code = #{dto.unitCode}
...@@ -584,7 +584,6 @@ ...@@ -584,7 +584,6 @@
LEFT JOIN idx_biz_jg_register_info jri ON re.equ_id = jri."RECORD" LEFT JOIN idx_biz_jg_register_info jri ON re.equ_id = jri."RECORD"
LEFT JOIN idx_biz_jg_other_info other ON re.equ_id = other."RECORD" LEFT JOIN idx_biz_jg_other_info other ON re.equ_id = other."RECORD"
WHERE ur.is_delete = 0 WHERE ur.is_delete = 0
AND ur.status <![CDATA[<>]]> '使用单位待提交'
<!-- 统一设备过滤条件 --> <!-- 统一设备过滤条件 -->
<if test="dto.equList != null and dto.equList != ''"> <if test="dto.equList != null and dto.equList != ''">
AND jri."EQU_LIST" = #{dto.equList} AND jri."EQU_LIST" = #{dto.equList}
...@@ -653,6 +652,7 @@ ...@@ -653,6 +652,7 @@
AND ur.supervision_org_code LIKE CONCAT(#{dto.supervisionOrgCode}, '%') AND ur.supervision_org_code LIKE CONCAT(#{dto.supervisionOrgCode}, '%')
</otherwise> </otherwise>
</choose> </choose>
AND ur.status <![CDATA[<>]]> '使用单位待提交'
</if> </if>
<if test="dto.dataType == 'company' "> <if test="dto.dataType == 'company' ">
AND (ur.use_unit_credit_code = #{dto.unitCode} AND (ur.use_unit_credit_code = #{dto.unitCode}
......
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