소스 검색

修改任务接口2

yusm 1 개월 전
부모
커밋
5a427a1400
1개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  1. 8 0
      fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

+ 8 - 0
fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -214,6 +214,10 @@
                         task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date >= #{startDate}
                         AND task.start_date <= #{endDate} AND task.end_date >= #{startDate} AND task.end_date <= #{endDate}
                     )
+                    OR
+                    (
+                    task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date <= #{startDate} AND task.end_date > #{endDate}
+                    )
                 )
             </if>
             <if test=" startDate != null and endDate == null">
@@ -319,6 +323,10 @@
                         task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date &gt;= #{startDate}
                         AND task.start_date &lt;= #{endDate} AND task.end_date &gt;= #{startDate} AND task.end_date &lt;= #{endDate}
                     )
+                    OR
+                    (
+                    task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date &lt;= #{startDate} AND task.end_date &gt; #{endDate}
+                    )
                 )
             </if>
             <if test=" startDate != null and endDate == null">