合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2656

@@ -316,17 +316,6 @@ class GeoQuestionRes extends Command
     }
     }
 
 
     /**
     /**
-     * @remark :预期结果对比
-     * @name   :getExpectResult
-     * @author :lyh
-     * @method :post
-     * @time   :2025/8/12 13:51
-     */
-    public function getExpectResult($question,$answer,$expect){
-        $str = "客户提出的问题:{$question}，客户得到的回复:{$answer}，客户需要预期:{$expect}，请分析得到的回复和预期是否一致，仅回复我是或者否";
-    }
-
-    /**
      * 获取待执行任务ID
      * 获取待执行任务ID
      * @return mixed
      * @return mixed
      */
      */

@@ -89,6 +89,9 @@ class AsideTicketController extends BaseController
                 $q->whereIn('engineer_id', $manageIdArr);
                 $q->whereIn('engineer_id', $manageIdArr);
             });
             });
         }
         }
+        if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
+            return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
+        }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');
 //        $query->orderBy('id', 'desc');
 //        $query->orderBy('id', 'desc');