任务管理执行日志增加外呼任务筛选条件

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoiceRoboticController.java

@@ -286,12 +286,13 @@ public class CompanyVoiceRoboticController extends BaseController
                             @RequestParam(defaultValue = "1") Integer pageNum,
                             @RequestParam(defaultValue = "10") Integer pageSize,
                             @RequestParam(required = false) String customerName,
-                            @RequestParam(required = false) String customerPhone) {
+                            @RequestParam(required = false) String customerPhone,
+                            @RequestParam Boolean onlyCallNode) {
         if (roboticId == null) {
             return R.error("任务ID不能为空");
         }
         return R.ok(companyVoiceRoboticService.getExecRecords(roboticId, pageNum, pageSize, customerName,
-                 customerPhone));
+                 customerPhone,onlyCallNode));
     }
 
     @GetMapping("/getCurrentCompanyId")

fs-service/src/main/java/com/fs/company/mapper/CompanyAiWorkflowExecMapper.java

@@ -108,6 +108,7 @@ public interface CompanyAiWorkflowExecMapper extends BaseMapper<CompanyAiWorkflo
     List<WorkflowExecRecordVo> selectExecRecordsByRoboticId(
             @Param("roboticId") Long roboticId,
             @Param("customerName") String customerName,
-            @Param("customerPhone") String customerPhone
+            @Param("customerPhone") String customerPhone,
+            @Param(("onlyCallNode")) Boolean onlyCallNode
     );
 }

fs-service/src/main/java/com/fs/company/service/ICompanyVoiceRoboticService.java

@@ -92,7 +92,7 @@ public interface ICompanyVoiceRoboticService extends IService<CompanyVoiceRoboti
      * @param roboticId 任务ID
      * @return 执行记录列表
      */
-    Map<String, Object> getExecRecords(Long roboticId, Integer pageNum, Integer pageSize,String customerName,String customerPhone);
+    Map<String, Object> getExecRecords(Long roboticId, Integer pageNum, Integer pageSize,String customerName,String customerPhone, Boolean onlyCallNode);
 
     void finishAddWxByCallees(Set<Long> roboticIds);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyVoiceRoboticServiceImpl.java

@@ -30,6 +30,7 @@ import com.fs.crm.mapper.CrmCustomerMapper;
 import com.fs.crm.param.SmsSendBatchParam;
 import com.fs.crm.service.impl.CrmCustomerServiceImpl;
 import com.fs.enums.ExecutionStatusEnum;
+import com.fs.enums.ExecutionStatusEnum;
 import com.fs.enums.NodeTypeEnum;
 import com.fs.enums.TaskTypeEnum;
 import com.fs.his.config.CidPhoneConfig;
@@ -1312,11 +1313,12 @@ public class CompanyVoiceRoboticServiceImpl extends ServiceImpl<CompanyVoiceRobo
                                               Integer pageNum,
                                               Integer pageSize,
                                               String customerName,
-                                              String customerPhone) {
+                                              String customerPhone,
+                                              Boolean onlyCallNode) {
         //分页查询主数据
         PageHelper.startPage(pageNum, pageSize);
 
-        List<WorkflowExecRecordVo> records =companyAiWorkflowExecMapper.selectExecRecordsByRoboticId(roboticId,customerName,customerPhone);
+        List<WorkflowExecRecordVo> records =companyAiWorkflowExecMapper.selectExecRecordsByRoboticId(roboticId,customerName,customerPhone,onlyCallNode);
 
         PageInfo<WorkflowExecRecordVo> pageInfo = new PageInfo<>(records);
 
@@ -1343,6 +1345,9 @@ public class CompanyVoiceRoboticServiceImpl extends ServiceImpl<CompanyVoiceRobo
                 if (logs != null) {
                     record.setNodeLogs(convertToNodeLogVos(logs));
                 }
+                if (record.getWorkflowStatus() != null && record.getWorkflowStatus().equals(11)){
+                    record.setWaitCallNode(true);
+                }
             }
         }
         //补充状态名称

fs-service/src/main/java/com/fs/company/vo/WorkflowExecRecordVo.java

@@ -119,6 +119,11 @@ public class WorkflowExecRecordVo {
      */
     private List<NodeExecLogVo> nodeLogs;
 
+    /**
+     * 是否在外呼节点等待
+     */
+    private Boolean waitCallNode;
+
     /**
      * 节点执行日志VO
      */

fs-service/src/main/resources/mapper/company/CompanyAiWorkflowExecMapper.xml

@@ -205,6 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="customerPhone != null and customerPhone != ''">
             AND c.phone LIKE CONCAT('%', #{customerPhone}, '%')
         </if>
+        <if test="onlyCallNode != null and onlyCallNode == true">
+            AND e.status = 11
+        </if>
         ORDER BY e.start_time DESC
     </select>