Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -156,8 +156,18 @@
             and a.status =#{request.status}
         </if>
         <if test="request.moth !=null">
-            AND( (a.plan_start_time &lt;= #{request.planStartTime} OR a.plan_end_time>=#{request.planStartTime})
-            OR (a.plan_start_time &lt;= #{request.planEndTime} OR a.plan_end_time>=#{request.planEndTime}))
+            AND  ((
+            #{request.planStartTime}   &lt;= a.plan_start_time
+            and #{request.planEndTime} >=a.plan_start_time
+            )
+            or (
+            #{request.planStartTime}  &lt;= a.plan_end_time
+            and #{request.planEndTime} >= a.plan_end_time
+            )
+            or (
+            #{request.planStartTime} >= a.plan_start_time
+            and #{request.planEndTime} &lt;=  a.plan_end_time
+            ))
         </if>
         AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY