通话记录和工单时间搜索

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

@@ -68,13 +68,24 @@ public class CallLogController extends BaseController {
         qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CallLog::getWorkordercode, input.getWorkordercode());
         if (!StringHelper.isEmpty(input.getPhone()))
         {
-            qw.and(wq->{
-                wq.like(CallLog::getCallee, input.getPhone())
-                        .eq( CallLog::getCallType,2);
-            }) .or() .or(wq->{
-                wq.like(CallLog::getCaller, input.getPhone())
-                        .eq( CallLog::getCallType,1);
+//            qw.and(wq->{
+//                wq.like(CallLog::getCallee, input.getPhone())
+//                        .eq( CallLog::getCallType,2);
+//            }) .or() .or(wq->{
+//                wq.like(CallLog::getCaller, input.getPhone())
+//                        .eq( CallLog::getCallType,1);
+//            });
+            qw.and(wq -> {
+                wq.and(innerWq -> {
+                    innerWq.like(CallLog::getCallee, input.getPhone())
+                            .eq(CallLog::getCallType, 2);
+                }).or(innerWq -> {
+                    innerWq.like(CallLog::getCaller, input.getPhone())
+                            .eq(CallLog::getCallType, 1);
+                });
             });
+
+
         }
         if (!StringHelper.isEmpty(input.getAgent()))
         {

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

@@ -122,6 +122,8 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(!StringHelper.isEmpty(input.getCustomerno()), WorkOrderBase::getCustomerno, input.getCustomerno());
 
         qw.eq(WorkOrderBase::getIsdelete, 0);
+        qw.ge(input.getCreatetime() != null , WorkOrderBase::getCreatetime, input.getCreatetime());
+        qw.le(input.getEndtime() != null , WorkOrderBase::getCreatetime, input.getEndtime());
 
         LambdaQueryWrapper<Role> qwrole = new LambdaQueryWrapper();
         qwrole.in(Role::getRoleId, CurrentUser().getRoleIds());

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -66,6 +67,7 @@ public class WorkOrderBase {
 
     /** 创建时间 */
     @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createtime;
 
     /** 转派时间 */
@@ -78,6 +80,7 @@ public class WorkOrderBase {
 
     /** 结束时间 */
     @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endtime;
 
     /** 创建人 */