|
@@ -56,6 +56,10 @@
|
|
ON his.task_id = t.id
|
|
ON his.task_id = t.id
|
|
<where>
|
|
<where>
|
|
t.del_flag = '0'
|
|
t.del_flag = '0'
|
|
|
|
+ AND pkg.enable_flag = '0'
|
|
|
|
+ AND pkg.del_flag = '0'
|
|
|
|
+ AND ppkg.enable_flag = '0'
|
|
|
|
+ AND ppkg.del_flag = '0'
|
|
<if test="pkgIssueDate != null and pkgExpiryDate != null">
|
|
<if test="pkgIssueDate != null and pkgExpiryDate != null">
|
|
AND pkg.start_time >= #{pkgIssueDate} AND pkg.end_time <= #{pkgExpiryDate}
|
|
AND pkg.start_time >= #{pkgIssueDate} AND pkg.end_time <= #{pkgExpiryDate}
|
|
</if>
|
|
</if>
|