车架去重后保留原数据并可查询

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');
+            $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_check_repeat_frame']) && $params['is_check_repeat_frame'] > 0) {
+            if (isset($params['is_delete_frame']) && $params['is_delete_frame'] > 0) {
-                $jobs_info = JobsT::find($params['is_check_repeat_frame']);
+                $query = $query->where('repeat_data_t.repeat_id', '=', $params['is_delete_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']);
             }
         }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');

app/view/index/index.html

@@ -169,8 +169,10 @@
 {block name="script"}
 <!--Core Javascript -->
 <script type="text/html" id="table-bar">
+    {{#  if(!d.repeat_id){ }}
     <a class="layui-btn layui-btn-xs" lay-event="detail">详情</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    {{#  } }}
 </script>
 <script type="text/html" id="BmcNameTpl">
     {{#  if(d.bmc_download_times > 0){ }}

extend/service/CarInfoHandle.php

@@ -491,7 +491,8 @@ class CarInfoHandle
         if ($type == 'frame') {
             CarInfoT::destroy($data['id']);
         }
-
+        $data['repeat_id'] = $id;
+        Db::table('repeat_data_t')->insert($data);
     }
 
     private function importExcel($data, $id)