是否退回和剩余天数条件sql

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -35,6 +35,7 @@
         left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
         left join ch_apr_emp emp on task.apr_emp_id = emp.emp_id
         left join ch_apr_task_push push on task.task_id = push.task_id
+        left join ch_apr_task_emp cate on task.task_id = cate.task_id
         <where>
             <if test="organIds != null">
                 and task.apr_organ_id in
@@ -67,13 +68,16 @@
                 and emp.tel = #{taskTel}
             </if>
             <if test="daysRemaining != null and daysRemaining != ''">
-                #and s.SRV_ORGAN_NAME = #{taskName}
+                and (to_date(to_char(task.last_apr_date,'yyyy-MM-dd'),'yyyy-MM-dd') - to_date(to_char(sysdate,'yyyy-MM-dd'),'yyyy-MM-dd')) + 1 &lt;= #{daysRemaining}
             </if>
             <if test="status != null and status != ''">
                 and task.TASK_STATUS = #{status}
             </if>
-            <if test="isReturn != null and isReturn != ''">
-                #and s.SRV_ORGAN_NAME = #{taskName}
+            <if test="isReturn != null and isReturn == '0'">
+                and cate.is_valid = 1 and task.task_status in (0,4,5)
+            </if>
+            <if test="isReturn != null and isReturn == '1'">
+                (and cate.is_valid = 0 or cate.is_valid is null)
             </if>
         </where>
     </select>