youfeng

app/Model/RevenueCost.php

@@ -30,7 +30,7 @@ class RevenueCost extends UseScopeBaseModel
     public static $field_hkd_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','employee_id_2','employee_id_2_title','payment_amount','profit','order_id'];
     public static $field_hkd_detail = ['order_type','order_number','order_time','employee_id_1','employee_id_1_title','employee_id_2','employee_id_2_title','customer_code','customer_title','product_code','product_title','product_size','unit','price_1','price_1_total','price_2','price_2_total','quantity','price_3','price_3_total','price_4','price_4_total','profit','profit_rate','order_number_upstream','payment_amount','customer_profit_rate','voucher_type'];
     public static $field_hkd_profit_main = ['rc.employee_id_2','rc.employee_id_2_title','rc.payment_amount','employee_index.start_time','employee_index.end_time','employee_index.index','employee_index.id'];
-    public static $field_hkd_salary_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','employee_id_2','employee_id_2_title','payment_amount','profit','order_id'];
+    public static $field_hkd_salary_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','payment_amount','profit','order_id'];
 
     public static $voucher_type = [
          45 => "期初应收",

app/Service/StatisticsService.php

@@ -117,6 +117,8 @@ class StatisticsService extends Service
             $field[] = DB::raw('sum(payment_amount) as payment_amount');
             $field[] = DB::raw('sum(price_4_total) as price_4_total');
             $field[] = DB::raw('sum(profit) as profit');
+            $field[] = DB::raw('max(employee_id_2) as employee_id_2');
+            $field[] = DB::raw("MAX(COALESCE(employee_id_2_title, '')) as employee_id_2_title");
         }
         $model = RevenueCost::Clear($user,$data);