Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2024-03-05 200f9e99bab7dcab9360f34fa25f6fa97c33c167

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -61,11 +61,17 @@
                        <if test="patrolTask.title !=null and patrolTask.title!=''">
                            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
                        </if>
<!--                        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">-->
<!--                            AND spt.start_time &gt;= #{patrolTask.startTime}-->
<!--                        </if>-->
<!--                        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">-->
<!--                            AND spt.end_time &lt;= #{patrolTask.endTime}-->
<!--                        </if>-->
                        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
                            AND spt.start_time &gt;= #{patrolTask.startTime}
                            AND spt.create_time &gt;= #{patrolTask.startTime}
                        </if>
                        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
                            AND spt.end_time &lt;= #{patrolTask.endTime}
                            AND spt.create_time &lt;= #{patrolTask.endTime}
                        </if>
                        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
                            AND spt.project_id = #{patrolTask.projectId}