|
@@ -10,7 +10,7 @@
|
|
|
WHERE
|
|
|
PLANSTARTTIME >= DATE( NOW( ) ) - INTERVAL 1 YEAR
|
|
|
AND DATE( NOW( ) ) >= PLANENDTIME
|
|
|
- AND TASKSTATUS in (10,30,70)
|
|
|
+ AND TASKSTATUS in (10,30,70,15)
|
|
|
AND DELETED = 0
|
|
|
GROUP BY TENANTID
|
|
|
HAVING count(TENANTID) > 1
|
|
@@ -24,7 +24,7 @@
|
|
|
WHERE
|
|
|
PLANSTARTTIME >= DATE( NOW( ) ) - INTERVAL 1 YEAR
|
|
|
AND DATE( NOW( ) ) >= PLANENDTIME
|
|
|
- AND TASKSTATUS in (10,30,70)
|
|
|
+ AND TASKSTATUS in (10,30,70,15)
|
|
|
AND DELETED = 0
|
|
|
<if test="tenantId != null and tenantId != ''"> and TENANTID = #{tenantId}</if>
|
|
|
</select>
|