1

app/Model/Construction.php

@@ -24,13 +24,17 @@ class Construction extends UseScopeBaseModel
         self::Model_type_two => 'T9SH.',
     ];
 
-    const STATE_ZERO = 0;//未确认
-    const STATE_ONE = 1;//待确认
-    const STATE_TWO = 2;//已确认
+    const STATE_ZERO = 0;//未审核
+    const STATE_ONE = 1;//待审核
+    const STATE_TWO = 2;//已审核
+    const STATE_THREE = 3;//待确认
+    const STATE_FOUR = 4;//已完结
     public static $name = [
-        self::STATE_ZERO => '未确认',
-        self::STATE_ONE => '待确认',
-        self::STATE_TWO => '已确认(完结)',
+        self::STATE_ZERO => '未审核',
+        self::STATE_ONE => '待审核',
+        self::STATE_TWO => '已审核',
+        self::STATE_THREE => '待确认',
+        self::STATE_FOUR => '已完结',
     ];
 
     public static $pq_name = [

app/Service/ConstructionService.php

@@ -395,7 +395,6 @@ class ConstructionService extends Service
         if(empty($construction)) return [false,'施工订单不存在或已被删除'];
         $construction = $construction->toArray();
         $construction['state_title'] = Construction::$name[$construction['state']] ?? '';
-        $construction['pq_state_title'] = Construction::$pq_name[$construction['pq_state']] ?? '';
 
         $address_map = config('address');
         $address_str = [];

app/Service/ExportFileService.php

@@ -545,12 +545,6 @@ class ExportFileService extends Service
                     $end_time = $value->end_time ? date("Y-m-d H:i",$value->end_time) : '';
                     $construction_period = $start_time . '——' . $end_time;
                     $state =  Construction::$name[$value->state] ?? '';
-                    $pq_state = Construction::$pq_name[$value->pq_state] ?? '';
-                    $str = "";
-                    $start_time = $value->day_start_stamp ? date("Y-m-d H:i",$value->day_start_stamp) : '';
-                    $end_time = $value->day_end_stamp ? date("Y-m-d H:i",$value->day_end_stamp) : '';
-                    if(! empty($start_time) && ! empty($end_time)) $str = $start_time . '——' . $end_time;
-                    $pq_period = $str;
                     $product_tmp = $product[$value->id] ?? [];
 
                     foreach ($product_tmp as $val){
@@ -566,8 +560,6 @@ class ExportFileService extends Service
                                 'urgency' => "",
                                 'construction_period' => "",
                                 'state_title' => "",
-                                'pq_state' => "",
-                                'pq_period' => "",
                                 'crt_time' => "",
                                 'crt_name' => "",
                                 'product_title' => $val['title'],
@@ -590,8 +582,6 @@ class ExportFileService extends Service
                                 'urgency' => $urgency_title,
                                 'construction_period' => $construction_period,
                                 'state_title' => $state,
-                                'pq_state' => $pq_state,
-                                'pq_period' => $pq_period,
                                 'crt_time' => $crt_time,
                                 'crt_name' => $emp_map[$value->crt_id] ?? "",
                                 'product_title' => $val['title'],
@@ -606,7 +596,7 @@ class ExportFileService extends Service
                 }
             });
 
-        $header = ['施工单号','工单来源','关联单号','交车日期','安装方式','安装地点','备注','紧急程度','施工时间','订单状态','是否排期','排期时间','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量','产品合同金额'];
+        $header = ['施工单号','工单来源','关联单号','交车日期','安装方式','安装地点','备注','紧急程度','施工时间','订单状态','创建时间','创建人','产品名称','产品编码','产品规格','产品单价','产品数量','产品合同金额'];
 
         return $this->saveExportData($return,$header);
     }