From effff618e4ef36d3850f878c0712d6792723e4da Mon Sep 17 00:00:00 2001
From: zcstatham <578322713@qq.com>
Date: Sat, 10 Sep 2022 22:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Index.php         |   7 +++++++
 app/controller/Task.php          |   5 ++++-
 app/view/index/index.html        |   9 ++++++++-
 app/view/task/index.html         |   6 ++++++
 extend/service/CarInfoHandle.php |   4 ++++
 public/static/tpl.xlsx           | Bin 8747 -> 8776 bytes
 6 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/controller/Index.php b/app/controller/Index.php
index f177f9f..2de1cf0 100644
--- a/app/controller/Index.php
+++ b/app/controller/Index.php
@@ -337,6 +337,13 @@ class Index extends BaseController
             });
             $map[] = ['car_info_t.car_man', 'like', $car_man];
         }
+        if (isset($params['tag']) && $params['tag'] != '') {
+            $tags = explode(',', str_replace('，', '', $params['car_man']));
+            array_walk($tags, function (&$value) {
+                $value = '%' . $value . '%';
+            });
+            $map[] = ['car_info_t.car_man', 'like', $tags];
+        }
         if (isset($params['factory_model']) && $params['factory_model'] != '') {
             $factory_model = explode(',', str_replace('，', '', $params['factory_model']));
             array_walk($factory_model, function (&$value) {
diff --git a/app/controller/Task.php b/app/controller/Task.php
index bf24269..6b63b02 100644
--- a/app/controller/Task.php
+++ b/app/controller/Task.php
@@ -160,6 +160,9 @@ class Task extends BaseController
             if (isset($params['price2']) && $params['price2'] != '') {
                 $where[] = ['car_info_t.purchase_price', '<=', $params['price2'] * 10000];
             }
+            if (isset($params['tag']) && $params['tag'] != '') {
+                $where[] = ['car_info_t.tag', '=', $params['tag']];
+            }
             if(isset($params['empty_phone_check']) && $params['empty_phone_check'] == 'yes'){
                 $where[] = ['car_phone', '<>', ''];
             }
@@ -621,7 +624,7 @@ class Task extends BaseController
             $highestColumn = $sheet->getHighestColumn(); // e.g 'F'
             $title = $sheet->rangeToArray("A1:{$highestColumn}1")[0];
 
-			$tpl_title = ['税号', '初登日期', '车主', '证件号', '电话号码', '车架号', '车牌号', '发动机号', '车型', '新车购置价'];
+			$tpl_title = ['税号', '初登日期', '车主', '证件号', '电话号码', '车架号', '车牌号', '发动机号', '车型', '新车购置价', '自定义标签'];
             // $tpl_title = ['区域', '购车日期', '客户姓名', '证件号码', '联系方式', '车架号', '车牌号', '发动机号', '品牌型号', '新车购置价', '保险公司', '商业止保日期', '交强止保日期', '被保险人', '被保险人证件号'];
             if (count(array_diff($tpl_title, $title)) > 0) {
                 return false;
diff --git a/app/view/index/index.html b/app/view/index/index.html
index 4eb54b9..69264c6 100644
--- a/app/view/index/index.html
+++ b/app/view/index/index.html
@@ -156,7 +156,14 @@
                                 <input type="text" name="price2" class="layui-input" placeholder="万">
                             </div>
                         </div>
-                        <div class="layui-form-item layui-col-md12" style="clear: none;">
+                        <div class="layui-form-item layui-col-md2" style="clear: none;">
+                            <label class="layui-form-label">标签</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="tag" id="tag" autocomplete="off"
+                                       class="layui-input" value="{$params.tag | default=''}">
+                            </div>
+                        </div>
+                        <div class="layui-form-item layui-col-md10" style="clear: none;">
                             <label class="layui-form-label">数据状态</label>
                             <div class="layui-input-block" style="height: auto;">
                                 <table class="layui-table">
diff --git a/app/view/task/index.html b/app/view/task/index.html
index 599de9d..23a64d8 100644
--- a/app/view/task/index.html
+++ b/app/view/task/index.html
@@ -52,6 +52,12 @@
                             <input type="text" name="insurer_day2" class="layui-input" style="display: inline-block; width: 60px;"> 日
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label" style="width: 140px;">标签</label>
+                        <div class="layui-input-inline" style="width: 200px;">
+                            <input type="text" name="tag" class="layui-input">
+                        </div>
+                    </div>
                 </div>
                 <div class="layui-form-item">
                     <div class="layui-inline">
diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 8f94859..8117017 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -51,6 +51,9 @@ class CarInfoHandle
         if (isset($data['price2']) && $data['price2'] != '') {
             $where[] = ['car_info_t.purchase_price', '<=', $data['price2'] * 10000];
         }
+        if (isset($params['tag']) && $params['tag'] != '') {
+            $where[] = ['car_info_t.tag', '=', $params['tag']];
+        }
         if (isset($data['empty_phone_check']) && $data['empty_phone_check'] == 'yes') {
             $where[] = ['car_phone', '<>', ''];
         }
@@ -569,6 +572,7 @@ class CarInfoHandle
                     'engine_no' => trim(trim($worksheet->getCellByColumnAndRow(8, $row)->getValue(), '"')),
                     'factory_model' => trim(trim($worksheet->getCellByColumnAndRow(9, $row)->getValue(), '"')),
                     'purchase_price' => trim(trim($worksheet->getCellByColumnAndRow(10, $row)->getValue(), '"')),
+                    'tag' => trim(trim($worksheet->getCellByColumnAndRow(11, $row)->getValue(), '"')),
                     'source' => $id,
                     'create_timestamp' => $now,
                     'update_timestamp' => $now
diff --git a/public/static/tpl.xlsx b/public/static/tpl.xlsx
index 09dd33904dd7387cbe98a5d75aa1261a54e971d8..0e1cce97dd3dfa79f5b13aedc539bd40f0ce555d 100644
GIT binary patch
delta 2149
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

delta 2137
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