|
@@ -33,34 +33,34 @@
|
|
|
</sql>
|
|
|
|
|
|
<select id="listActivePage" resultType="com.abi.qms.platform.dao.vo.result.ListActiveVO">
|
|
|
- select active.id, active.active_name, active.active_type, active.audit_status,
|
|
|
- active.apply_time, active.apply_user_name, active.begin_time, active.end_time,
|
|
|
- active.active_url, active.valid, active.is_modify_apply,
|
|
|
- active.url_tab,
|
|
|
- apply.audit_status as apply_audit_status
|
|
|
- from base_active active
|
|
|
- left join base_active_modify_apply apply on active.id = apply.active_id and apply.is_delete = 0
|
|
|
+ select ac.id, ac.active_name, ac.active_type, ac.audit_status,
|
|
|
+ ac.apply_time, ac.apply_user_name, ac.begin_time, ac.end_time,
|
|
|
+ ac.active_url, ac.valid, ac.is_modify_apply,
|
|
|
+ ac.url_tab,
|
|
|
+ ac.audit_status as apply_audit_status
|
|
|
+ from base_active ac
|
|
|
+ left join base_active_modify_apply ap on ac.id = ap.active_id and ap.is_delete = 0
|
|
|
<where>
|
|
|
- active.is_delete = 0
|
|
|
+ ac.is_delete = 0
|
|
|
<if test="param.activeName != null and param.activeName != ''">
|
|
|
- AND active.active_name like concat('%',#{param.activeName},'%')
|
|
|
+ AND ac.active_name like concat('%',#{param.activeName},'%')
|
|
|
</if>
|
|
|
<if test="param.activeType != null">
|
|
|
- AND active.active_type = #{param.activeType}
|
|
|
+ AND ac.active_type = #{param.activeType}
|
|
|
</if>
|
|
|
<if test="param.auditStatus != null ">
|
|
|
- AND active.audit_status = #{param.auditStatus}
|
|
|
+ AND ac.audit_status = #{param.auditStatus}
|
|
|
</if>
|
|
|
<if test="param.valid==1 or param.valid==0 ">
|
|
|
- AND active.valid = #{param.valid}
|
|
|
- AND active.audit_status = 2
|
|
|
+ AND ac.valid = #{param.valid}
|
|
|
+ AND ac.audit_status = 2
|
|
|
</if>
|
|
|
<if test="param.valid==9">
|
|
|
- AND active.valid = 1
|
|
|
- AND active.audit_status in (1,9)
|
|
|
+ AND ac.valid = 1
|
|
|
+ AND ac.audit_status in (1,9)
|
|
|
</if>
|
|
|
</where>
|
|
|
- order by active.apply_time desc
|
|
|
+ order by ac.apply_time desc
|
|
|
</select>
|
|
|
|
|
|
<select id="getPackageActive" resultType="com.abi.qms.platform.dao.vo.result.PackageActiveVO">
|