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

shenyijian

2024-06-20 11cbff75d8b18ce599a05cbb4d84cec104583358

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml

@@ -917,10 +917,10 @@
            where 1=1
            <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
                and ct."scene_id" = 228
                and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
                and ctr."gmt_create" >= #{callTaskResult.startTime}
            </if>
            <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
                and date_format(ctr."gmt_create",'%Y-%m-%d') &lt;= #{callTaskResult.endTime}
                and ctr."gmt_create" &lt;= #{callTaskResult.endTime}
            </if>
            <if test="list != null and list.size()>0">
                and ctr."task_id" in