|
|
@@ -12,6 +12,7 @@ use App\Model\ProductActivityPrice;
|
|
|
use App\Model\Schedule;
|
|
|
use App\Model\ScheduleDetail;
|
|
|
use App\Model\ScheduleInfo;
|
|
|
+use App\Model\SeeRange;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
|
|
|
class ScheduleService extends Service
|
|
|
@@ -537,11 +538,17 @@ class ScheduleService extends Service
|
|
|
}
|
|
|
|
|
|
$return = [];
|
|
|
+
|
|
|
+ //可见范围
|
|
|
+ $employee = (new RangeService())->RangeConstructionEmpDetail($order_id);
|
|
|
foreach ($construction as $value){
|
|
|
$str = "";
|
|
|
if(! empty($value['day_start_stamp']) && ! empty($value['day_end_stamp'])) $str = date('Y-m-d H:i',$value['day_start_stamp']) . '-' . date("H:i",$value['day_end_stamp']);
|
|
|
|
|
|
+ $emp_tmp = $employee[$value['id']] ?? [];
|
|
|
$tmp = [
|
|
|
+ 'id' => $value['id'],
|
|
|
+ 'employee' => $emp_tmp,
|
|
|
'order_number' => $value['order_number'],
|
|
|
'crt_name' => $emp[$value['crt_id']] ?? "",
|
|
|
'product' => $product_title[$value['id']],
|
cqpCow