1.1.0

hjzx-api/src/main/java/api/controller/call/CallLogController.java

@@ -66,6 +66,20 @@ public class CallLogController extends BaseController {
         qw.eq(input.getOpType() != null , CallLog::getOpType, input.getOpType());
         qw.eq(input.getMyd() != null , CallLog::getMyd, input.getMyd());
         qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CallLog::getWorkordercode, input.getWorkordercode());
+        if (input.getWaitContrast()!=null&&input.getWaitContrast()>0&&input.getWaitTimes()!=null
+        &&input.getWaitTimes()>0)
+        {
+            String Contrast=">=";
+            if (input.getWaitContrast()==2)
+            {
+                Contrast="=";
+            } else if (input.getWaitContrast()==3) {
+                Contrast="<=";
+            }
+            qw.apply("TIMESTAMPDIFF(SECOND, create_time, IFNULL(ring_time,hangup_time)){0}{1}",Contrast
+                    ,input.getWaitTimes());
+        }
+
         if (!StringHelper.isEmpty(input.getPhone()))
         {
 //            qw.and(wq->{

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -462,11 +462,21 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
             }
             if(!StringHelper.isEmpty(orderBase.getHandlingMeasures())){
                 //    if(orderBase.getHandlingMeasures()!=null && orderBase.getHandlingMeasures()>0){
+//                orderBase.setHandlingMeasuresName(dictDatas.stream()
+//                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getHandlingMeasures()))
+//                        .findFirst()
+//                        .map(DictData::getDictLabel)
+//                        .orElse(null) );
+
+
+                // 通过Stream过滤并生成新List
+                String[] targetNames = orderBase.getHandlingMeasures().split(",");
+                // 转换为Set以提高查询效率
+                Set<String> targetSet = new HashSet<>(Arrays.asList(targetNames));
                 orderBase.setHandlingMeasuresName(dictDatas.stream()
-                        .filter(x -> Objects.equals(x.getDictValue(), orderBase.getHandlingMeasures()))
-                        .findFirst()
+                        .filter(obj -> targetSet.contains(obj.getDictValue()))
                         .map(DictData::getDictLabel)
-                        .orElse(null) );
+                        .collect(Collectors.joining(",")));
             }
         }
 
@@ -914,11 +924,18 @@ if(!StringHelper.isEmpty(orderBase.getGrade())){
         }
         if(!StringHelper.isEmpty(orderBase.getHandlingMeasures())){
     //    if(orderBase.getHandlingMeasures()!=null && orderBase.getHandlingMeasures()>0){
+//            ov.setHandlingMeasuresName(dictDatas.stream()
+//                    .filter(x -> Objects.equals(x.getDictValue(), orderBase.getHandlingMeasures()))
+//                    .findFirst()
+//                    .map(DictData::getDictLabel)
+//                    .orElse(null) );
+            String[] targetNames = orderBase.getHandlingMeasures().split(",");
+            // 转换为Set以提高查询效率
+            Set<String> targetSet = new HashSet<>(Arrays.asList(targetNames));
             ov.setHandlingMeasuresName(dictDatas.stream()
-                    .filter(x -> Objects.equals(x.getDictValue(), orderBase.getHandlingMeasures()))
-                    .findFirst()
+                    .filter(obj -> targetSet.contains(obj.getDictValue()))
                     .map(DictData::getDictLabel)
-                    .orElse(null) );
+                    .collect(Collectors.joining(",")));
         }
         if(orderBase.getComplaintdept()!=null && orderBase.getComplaintdept()>0){
             DeptView ordertype = deptService.selectDeptNameById(orderBase.getComplaintdept() );

hjzx-entity/src/main/java/api/entity/input/call/CallInput.java

@@ -11,4 +11,8 @@ public class CallInput   extends CallLog {
     private String phone;
     @ApiModelProperty("坐席工号")
     private String agent;
+    @ApiModelProperty("等待对比1大于2等于3小于")
+    private Long waitContrast;
+    @ApiModelProperty("等待时长")
+    private Long waitTimes;
 }