Skip to content

Y
yhwx
提交 81fe0fe0 authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

edit

上级 25a88409
显示空白字符变更
内嵌 并排
正在显示 包含 48 行增加 和 17 行删除
app/Http/Controllers/Mounting/Business/WashWorkController.php
浏览文件 @ 81fe0fe0
......@@ -697,7 +697,6 @@ class WashWorkController extends Controller
return response()->json(['code'=>200,'msg'=>'success','data'=>$data]);
}
$res = WashWorkService::auditWork($user_info,$request);
OperationLog::addLog($user_info, getRealIp($request), '工单列表', '施工审核', '施工审核成功');
return response()->json($res);
}
......
app/Services/Business/WashWorkService.php
浏览文件 @ 81fe0fe0
......@@ -3,6 +3,7 @@
namespace App\Services\Business;
use App\Http\Controllers\Common\CommonController;
use App\Models\OperationLog;
use App\Services\CommonService;
use Illuminate\Support\Facades\Request;
use App\Models\Business\WashWork;
......@@ -1535,8 +1536,12 @@ class WashWorkService extends Service
})
->select('wor_id', 'wor_number', 'wor_order_number', 'wor_shop_id', 'wor_create_id', 'wor_type', 'wor_state', 'wor_service_state', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_car_vehicle_type', 'wocl_car_vin', 'wocl_car_brand_series', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'wocl_carowner_phone', 'wocl_carowner_name', 'wor_explain as wor_remark', 'wocl_bus_name', 'shop_store_name', 'wor_address_type', 'wor_address_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_work_type', 'wor_order_id', 'wocl_client_id', 'wor_list_pic', 'ord_new_type')
->orderBy('wor_appoint_time', 'desc')
->orderBy('wor_id', 'desc')
->paginate($show_count);
->orderBy('wor_id', 'desc');
if($adm_leave == 1 || $all_work) {
}else{
$list_data = $list_data->groupBy('wotp_wor_id');
}
$list_data = $list_data->paginate($show_count);
//, 'wotp_service_adm_name', 'wotp_grle_name', 'wotp_grpr_name'
$list_items = $list_data->items();
if ($list_items) {
......@@ -6251,6 +6256,7 @@ class WashWorkService extends Service
$data[4]['model'] = 'wait_order';
$wor_count3 = DB::table('wash_work_technician_part as a')
->leftJoin('work_order as b', 'b.wor_id', '=', 'a.wotp_wor_id')
->where('wotp_shop_id', $user_info->adm_shop_id)
......@@ -6261,7 +6267,7 @@ class WashWorkService extends Service
->where('wor_collection_bill', 1) //是否代收账单：1正常工单2代收账单
->whereIn('wor_state', [3]) //1.新订单 2未派单 3待接单/已派单 5.已接单/待验车 6.已验车（显示开始施工按钮） 7施工中（提交施工按钮） 8.待审核/完成待审核
->select(DB::raw('count(*) as count, wor_state'))
->groupBy('wor_state')
->groupBy('wotp_wor_id')
->get()->toArray();
if (!empty($wor_count3)) {
$wor_number3 = $wor_count3[0]->count;
......@@ -6302,35 +6308,52 @@ class WashWorkService extends Service
->where('wor_classify', 2) //工单分类：1蓄电池2洗美店3易损件
->where('wor_collection_bill', 1) //是否代收账单：1正常工单2代收账单
->whereIn('wor_state', [5,6,7,9]) //1.新订单 2未派单 3待接单/已派单 5.已接单/待验车 6.已验车（显示开始施工按钮） 7施工中（提交施工按钮） 8.待审核/完成待审核
->select(DB::raw('count(*) as count, wor_state'))
->groupBy('wor_state')
->get();
->select(DB::raw('count(DISTINCT wotp_wor_id) as count, wor_state'));
if($adm_leave == 1 || in_array(79,$pri_id)) {
$wor_count = $wor_count->groupBy('wor_state');
}else{
$wor_count = $wor_count->groupBy('wor_state','wotp_wor_id');
}
$wor_count = $wor_count->get();
$wor_state = [];
foreach ($wor_count as $key => $value) {
// if ($value->wor_state == 3) {
// $data[$key+5]['num'] = $value->count;
// $data[$key+5]['model'] = 'receiveSubmit';
// }
if ($value->wor_state == 5) {
$data[$key+7]['num'] = $value->count;
if(isset($wor_state[$value->wor_state])){
$wor_state[$value->wor_state]['num'] = $wor_state[$value->wor_state]['num']+$value->count;
}else{
$wor_state[$value->wor_state]['num'] = $value->count;
$wor_state[$value->wor_state]['wor_state'] = $value->wor_state;
}
}
if(!empty($wor_state)){
$wor_state =CommonService::resetListKey($wor_state);
foreach ($wor_state as $key => $value) {
if ($value['wor_state'] == 5) {
$data[$key+7]['num'] = $value['num'];
$data[$key+7]['model'] = 'validateCar';
}
if ($value->wor_state == 6) {
$data[$key+7]['num'] = $value->count;
if ($value['wor_state'] == 6) {
$data[$key+7]['num'] = $value['num'];
$data[$key+7]['model'] = 'construction';
}
if ($value->wor_state == 7 || $value->wor_state == 8) {
if ($value['wor_state'] == 7 || $value['wor_state'] == 8) {
if (isset($data[$key+7]['num'])) {
$data[$key+7]['num'] += $value->count;
$data[$key+7]['num'] += $value['num'];
} else {
$data[$key+7]['num'] = $value->count;
$data[$key+7]['num'] = $value['num'];
}
$data[$key+7]['model'] = 'submitConstruction';
}
if ($value->wor_state == 9) {
$data[$key+7]['num'] = $value->count;
if ($value['wor_state'] == 9) {
$data[$key+7]['num'] = $value['num'];
$data[$key+7]['model'] = 'returnItem';
}
}
}
return ['code'=>200, 'msg'=>'success', 'data'=>$data];
}
......@@ -7829,6 +7852,7 @@ class WashWorkService extends Service
$wor_edit_data['wor_state'] = 9;
$wor_edit_data['wor_update_time'] = date('Y-m-d H:i:s');
$wor_edit_res = WashWork::where('wor_id', $request['wor_id'])->update($wor_edit_data);
$content = '施工审核[通过]';
} else {
$add_data['wor_id'] = $request['wor_id'];
$add_data['wor_refuse_remark'] = $request['wor_refuse_remark'];
......@@ -7841,8 +7865,16 @@ class WashWorkService extends Service
$wor_edit_data['wor_state'] = 7;
$wor_edit_data['wor_update_time'] = date('Y-m-d H:i:s');
$wor_edit_res = WashWork::where('wor_id', $request['wor_id'])->update($wor_edit_data);
$content = '施工审核[驳回]';
}
if($wor_edit_res) {
$wor_order_id = WashWork::where('wor_id', $request['wor_id'])->value('wor_order_id');
orderLog($user_info, $wor_order_id, $request['wor_id'], $content);
OperationLog::addLog($user_info, getRealIp($request), '工单列表', '施工审核', $content);
return ['code' => 200, 'msg' => '审核成功', 'data' => '审核成功'];
}else{
return ['code' => 500, 'msg' => '审核操作失败', 'data' => '审核操作失败'];
}
return ['code'=>200, 'msg'=>'审核成功', 'data'=>'审核成功'];
}
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论