From 14b0068b1d030c6f8f747f81ca06c911aa15377e Mon Sep 17 00:00:00 2001
From: zcstatham <578322713@qq.com>
Date: Tue, 30 Aug 2022 21:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8E=BB=E9=87=8D=E5=90=8E?=
=?UTF-8?q?=E4=BF=9D=E7=95=99=E5=8E=9F=E6=95=B0=E6=8D=AE=E5=B9=B6=E5=8F=AF?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controller/Index.php | 17 +++--------------
app/view/index/index.html | 2 ++
extend/service/CarInfoHandle.php | 3 ++-
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/app/controller/Index.php b/app/controller/Index.php
index 89bc7e0..c0527c5 100644
--- a/app/controller/Index.php
+++ b/app/controller/Index.php
@@ -63,20 +63,9 @@ class Index extends BaseController
$params['data_check'] = 'car_frame_check';
}
if(isset($params['data_check']) && $params['data_check'] == 'car_frame_check'){
- $query = $this->model->rightJoin('repeat_frame_t','repeat_frame_t.car_frame_no = car_info_t.car_frame_no')->field('car_info_t.*')->where($map)->order('repeat_frame_t.car_frame_no desc');
- if (isset($params['is_check_repeat_frame']) && $params['is_check_repeat_frame'] > 0) {
- $jobs_info = JobsT::find($params['is_check_repeat_frame']);
- $job_info_payload = json_decode($jobs_info->payload,true)['data']['params'];
- if(isset($job_info_payload['export_date1']) && $job_info_payload['export_date1'] != ''){
- $query = $query->where('car_info_t.register_date', '>=', $job_info_payload['export_date1']);
- }
- if(isset($job_info_payload['export_date2']) && $job_info_payload['export_date2'] != ''){
- $query = $query->where('car_info_t.register_date', '<=', $job_info_payload['export_date2']);
- }
- $query = $query->where([
- ['repeat_frame_t.source', '=', $params['is_check_repeat_frame']]]);
- } else if (isset($params['is_delete_frame']) && $params['is_delete_frame'] > 0) {
- $query = $query->where('repeat_frame_t.is_delete', '=', $params['is_delete_frame']);
+ $query = Db::table('repeat_data_t')->rightJoin('repeat_frame_t','repeat_frame_t.car_frame_no = car_info_t.car_frame_no')->field('car_info_t.*')->where($map)->order('repeat_frame_t.car_frame_no desc');
+ if (isset($params['is_delete_frame']) && $params['is_delete_frame'] > 0) {
+ $query = $query->where('repeat_data_t.repeat_id', '=', $params['is_delete_frame']);
}
}else if(isset($params['data_check']) && $params['data_check'] == 'car_phone_check'){
$query = $this->model->rightJoin('peer_phone_t','peer_phone_t.phone = car_info_t.car_phone')->field('car_info_t.*')->where($map)->order('peer_phone_t.phone desc');
diff --git a/app/view/index/index.html b/app/view/index/index.html
index 5561602..3e12891 100644
--- a/app/view/index/index.html
+++ b/app/view/index/index.html
@@ -169,8 +169,10 @@
{block name="script"}