Merge branch 'master' of http://1.14.104.71:10880/wushubo/easycallcenter365-gui-dev

ruoyi-admin/src/main/resources/mapper/aicall/CcCallPhoneMapper.xml

@@ -53,58 +53,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectCcCallPhoneList" parameterType="CcCallPhone" resultMap="CcCallPhoneResult">
-        <include refid="selectCcCallPhoneVo"/>
+        select cp.*,ct.batch_name as batchName from cc_call_phone cp left join cc_call_task ct on cp.batch_id = ct.batch_id
         <where>
-            <if test="uuid != null and uuid != '' "> and uuid = #{uuid}</if>
-            <if test="batchId != null "> and batch_id = #{batchId}</if>
-            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
-            <if test="custName != null  and custName != ''"> and cust_name = #{custName}</if>
-            <if test="callstatus != null "> and callstatus = #{callstatus}</if>
+            <if test="uuid != null and uuid != '' "> and cp.uuid = #{uuid}</if>
+            <if test="telephone != null  and telephone != ''"> and cp.telephone = #{telephone}</if>
+            <if test="custName != null  and custName != ''"> and cp.cust_name = #{custName}</if>
+            <if test="callstatus != null "> and cp.callstatus = #{callstatus}</if>
             <if test="params.calloutTimeStart != null and params.calloutTimeStart != ''"><!-- 开始时间检索 -->
-                AND callout_time &gt;= #{params.calloutTimeStart}
+                AND cp.callout_time &gt;= #{params.calloutTimeStart}
             </if>
             <if test="params.calloutTimeEnd != null and params.calloutTimeEnd != ''"><!-- 结束时间检索 -->
-                AND callout_time &lt;= #{params.calloutTimeEnd}
+                AND cp.callout_time &lt;= #{params.calloutTimeEnd}
             </if>
             <if test="params.callEndTimeStart != null and params.callEndTimeStart != ''"><!-- 开始时间检索 -->
-                AND call_end_time &gt;= #{params.callEndTimeStart}
+                AND cp.call_end_time &gt;= #{params.callEndTimeStart}
             </if>
             <if test="params.callEndTimeEnd != null and params.callEndTimeEnd != ''"><!-- 结束时间检索 -->
-                AND call_end_time &lt;= #{params.callEndTimeEnd}
+                AND cp.call_end_time &lt;= #{params.callEndTimeEnd}
             </if>
             <if test="params.timeLenStart != null and params.timeLenStart != ''"><!-- 开始时间检索 -->
-                AND time_len &gt;= #{params.timeLenStart}
+                AND cp.time_len &gt;= #{params.timeLenStart}
             </if>
             <if test="params.timeLenEnd != null and params.timeLenEnd != ''"><!-- 结束时间检索 -->
-                AND time_len &lt;= #{params.timeLenEnd}
+                AND cp.time_len &lt;= #{params.timeLenEnd}
             </if>
             <if test="params.connectedTimeStart != null and params.connectedTimeStart != ''"><!-- 开始时间检索 -->
-                AND connected_time &gt;= #{params.connectedTimeStart}
+                AND cp.connected_time &gt;= #{params.connectedTimeStart}
             </if>
             <if test="params.connectedTimeEnd != null and params.connectedTimeEnd != ''"><!-- 结束时间检索 -->
-                AND connected_time &lt;= #{connectedTimeEnd}
+                AND cp.connected_time &lt;= #{connectedTimeEnd}
             </if>
             <if test="params.answeredTimeStart != null and params.answeredTimeStart != ''"><!-- 开始时间检索 -->
-                AND answered_time &gt;= #{params.answeredTimeStart}
+                AND cp.answered_time &gt;= #{params.answeredTimeStart}
             </if>
             <if test="params.answeredTimeEnd != null and params.answeredTimeEnd != ''"><!-- 结束时间检索 -->
-                AND answered_time &lt;= #{params.answeredTimeEnd}
+                AND cp.answered_time &lt;= #{params.answeredTimeEnd}
             </if>
             <if test="batchId != null and batchId != ''">
-                AND batch_id = #{batchId}
+                AND cp.batch_id = #{batchId}
+            </if>
+            <if test="batchName != null and batchName != ''">
+                AND ct.batch_name like concat('%', #{batchName}, '%')
             </if>
             <if test="intent != null and intent != ''">
-                AND intent = #{intent}
+                AND cp.intent = #{intent}
             </if>
             <if test="billingStatus != null ">
-                and billing_status = #{billingStatus}
+                and cp.billing_status = #{billingStatus}
             </if>
             <if test="callerNumber != null and callerNumber != '' ">
-                and caller_number = #{callerNumber}
+                and cp.caller_number = #{callerNumber}
             </if>
-            AND callstatus >= 3 AND call_end_time > 0
+            AND cp.callstatus >= 3 AND cp.call_end_time > 0
         </where>
-        order by call_end_time desc
+        order by cp.call_end_time desc
     </select>
 
     <select id="getCustIntentionList" parameterType="CcCallPhone" resultMap="CcCallPhoneResult">

ruoyi-admin/src/main/resources/templates/aicall/callPhone/callPhone.html

@@ -221,12 +221,9 @@
             <form id="formId">
                 <div class="select-list">
                     <ul>
-                        <!-- 外呼任务下拉框 -->
                         <li>
                             <label th:text="#{callPhone.query.callTask}">外呼任务</label>
-                            <select name="batchId" id="callTaskSelect">
-                                <option value="" th:text="#{options.all}"></option>
-                            </select>
+                            <input type="text" name="batchName"/>
                         </li>
                         <!-- 客户意向下拉框 -->
                         <li>
@@ -602,19 +599,6 @@
         });
 
 
-        // 加载外呼任务下拉选项
-        $.get(ctx + 'aicall/callTask/all', function (resp) {
-            var html = '';
-            $.each(resp.data, function (i, task) {
-                html += '<option value="' + task.batchId + '">' + task.batchName + '</option>';
-            });
-            $('#callTaskSelect').html(html);
-
-            // 下拉框加载完成后，自动触发查询
-            $.table.search();
-        });
-
-
     });
 
     var videoPlayer; // 定义一个全局变量来存储播放器实例