From f43932290ef1f26b54c96b3db8fad44c0322e209 Mon Sep 17 00:00:00 2001
From: zcstatham <578322713@qq.com>
Date: Mon, 12 Sep 2022 22:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=BD=A6=E6=9E=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=B0=83=E8=AF=9511?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Task.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controller/Task.php b/app/controller/Task.php
index d4a5a1a..a3d4d48 100644
--- a/app/controller/Task.php
+++ b/app/controller/Task.php
@@ -426,6 +426,8 @@ class Task extends BaseController
             $name = '导出未处理至上传';
         } else if ($type == 'success_bmc') {
             $name = '导出清洗成功再次清洗';
+        } else if ($type == 'repeat_delete') {
+            $name = '导出重复删除车架';
         }
         $count = ExportLogT::where('name','like', $name . $export_date1 . '—' . $export_date2 . '%')->count();
         $name .= $export_date1 . '—' . $export_date2 . '第' . ($count + 1) . '批' . $export_limit . '条';
@@ -569,11 +571,18 @@ class Task extends BaseController
         if(count($map_or2) > 0){
             $map_or2 = array_merge([['car_info_t.insurer1_date', '=', ''],['car_info_t.insurer2_date', '<>', '']],$map_or2);
         }
-        $query = CarInfoT::where($where)->where(function ($query) use ($map_or1, $map_or2) {
-            if (count($map_or1) > 0 && count($map_or2) > 0){
-                $query->whereOr([$map_or1, $map_or2]);
-            }
-        });
+        if($params['export_type'] == 'repeat_delete')
+            $query = Db::table('repeat_data_t')->alias('car_info_t')->where($where)->where(function ($query) use ($map_or1, $map_or2) {
+                if (count($map_or1) > 0 && count($map_or2) > 0){
+                    $query->whereOr([$map_or1, $map_or2]);
+                }
+            });
+        else
+            $query = CarInfoT::where($where)->where(function ($query) use ($map_or1, $map_or2) {
+                if (count($map_or1) > 0 && count($map_or2) > 0){
+                    $query->whereOr([$map_or1, $map_or2]);
+                }
+            });
         $this->json_data['data'] = $query->count();
         $this->json_data['sql'] = CarInfoT::getLastSql();
         return json($this->json_data);