|
|
@@ -577,12 +577,12 @@
|
|
|
a.valid_end_time >= str_to_date(#{endTime}, '%Y-%m-%d')
|
|
|
)
|
|
|
</if>
|
|
|
- and a.valid_end_time >= now()
|
|
|
+ and a.valid_end_time >= now()
|
|
|
|
|
|
</select>
|
|
|
<select id="selectApplyListBySubIds" resultType="java.util.Map">
|
|
|
select subject_id as subId, user_id as userId from lab_security_apply a
|
|
|
- where a.audit_status = 2 and a.valid_end_time >= now()
|
|
|
+ where a.audit_status = 2 and a.valid_end_time >= now()
|
|
|
<if test="subIds!=null and subIds.size > 0">
|
|
|
and a.subject_id in
|
|
|
<foreach item="subId" collection="subIds" separator="," open="(" close=")">
|
|
|
@@ -594,7 +594,7 @@
|
|
|
<!--未过期的申请 -->
|
|
|
<select id="selectValidApply" parameterType="com.zd.laboratory.domain.LabSecurityApply" resultMap="LabSecurityApplyResult">
|
|
|
<include refid="selectLabSecurityApplyVo"/>
|
|
|
- where t.audit_status = 2 and t.valid_end_time >= now()
|
|
|
+ where t.audit_status = 2 and t.valid_end_time >= now()
|
|
|
<if test="userId!=null">
|
|
|
and t.user_id=#{userId}
|
|
|
</if>
|