Skip to content

Z
zptz-sass-kelaidian
提交 072aeb8a authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

edit

上级 5a3908e9
显示空白字符变更
内嵌 并排
正在显示 包含 107 行增加 和 13 行删除
app/Http/Controllers/Common/CommonController.php
浏览文件 @ 072aeb8a
...@@ -185,6 +185,7 @@ class CommonController extends BaseController ...@@ -185,6 +185,7 @@ class CommonController extends BaseController
$brand = CommonService::arrayFilterFieldValue($brand,[['id'=>explode(',',$brand_id)]]); $brand = CommonService::arrayFilterFieldValue($brand,[['id'=>explode(',',$brand_id)]]);
} }
if($brand){ if($brand){
$brand = CommonService::resetListKey($brand);
return $this->success('操作成功', $brand); return $this->success('操作成功', $brand);
}else{ }else{
return $this->error('无数据', ErrorInc::DATA_EMPTY, []); return $this->error('无数据', ErrorInc::DATA_EMPTY, []);
......
app/Http/Controllers/DatasBase/DataStatisticsController.php 0 → 100644
浏览文件 @ 072aeb8a
<?php
/**
* 文件名称（数据统计）
* 文件简单描述（用于进行数据统计分析）
* @author DouBin
* @Date: 2024/10/15
* @Time: 17:34
* @Email: db@sudianwang.com
* @version 1.0
* @copyright BlueCity
*/
namespace App\Http\Controllers\DatasBase;
use App\Http\Controllers\BaseController;
use App\Services\CommonService;
use App\Services\DataStatisticsService;
use BlueCity\Core\Inc\ErrorInc;
use Illuminate\Http\Request;
use DB;
use Excel;
/**
* @name 自动派单绑定服务商
* Class BservissController
* @package App\Http\Controllers\Admin
*/
class DataStatisticsController extends BaseController
{
/**|---------------------------------------------------------------------------------
* @name 数据首页
* @param string
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2024/10/15 17:37
* |---------------------------------------------------------------------------------
*/
public function index ( Request $request ){
$session = $request->get("session_token");
$data = DataStatisticsService::getSerStatistics($session);
}
}
app/Http/Controllers/DatasBase/TipsController.php
浏览文件 @ 072aeb8a
...@@ -25,8 +25,12 @@ class TipsController extends BaseController ...@@ -25,8 +25,12 @@ class TipsController extends BaseController
*/ */
public function index(Request $request){ public function index(Request $request){
$list = array(); $list = array();
if($request->get('session_token')['admin_groupnew'] == 2 || $request->get('session_token')['admin_groupnew'] == 3){ if($request->get('session_token')['admin_groupnew'] == 2 || $request->get('session_token')['admin_groupnew'] == 3 || $request->get('session_token')['admin_groupnew'] == 4){
$orderList = OrderList::where('stauas',20)->where('ser_id',$request->get('session_token')['id'])->get(); if($request->get('session_token')['admin_groupnew'] == 2) {
$orderList = OrderList::where('stauas', 20)->where('ser_id', $request->get('session_token')['id'])->get();
}else{
$orderList = OrderList::where('stauas', 20)->where('agency_id', $request->get('session_token')['company_id'])->get();
}
if(count($orderList)>0) { if(count($orderList)>0) {
$list[0]['msg'] = "您有新工单未领取"; $list[0]['msg'] = "您有新工单未领取";
$list[0]['count'] = count($orderList); $list[0]['count'] = count($orderList);
......
app/Http/Controllers/Dou/MyTestController.php
浏览文件 @ 072aeb8a
...@@ -150,9 +150,11 @@ class MyTestController extends Controller ...@@ -150,9 +150,11 @@ class MyTestController extends Controller
$html="<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><h1>请输入公司id</h1></html>"; $html="<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><h1>请输入公司id</h1></html>";
echo $html;exit; echo $html;exit;
} }
$admindata = Admin::where('company_id',$input['company_id']) // $admindata = Admin::where('company_id',$input['company_id'])
->where('admin_groupnew',2) // ->where('admin_groupnew',2)
->where('enable',1) // ->where('enable',1)
// ->pluck('company_name','id');
$admindata = Admin::whereRaw("((company_id='".$input['company_id']."' and admin_groupnew=2) or admin_groupnew=3) and enable=1")
->pluck('company_name','id'); ->pluck('company_name','id');
$time_start = $input['time_start']; $time_start = $input['time_start'];
$time_end = date("Y-m-d", strtotime($input['time_end'] . " +1 day")); $time_end = date("Y-m-d", strtotime($input['time_end'] . " +1 day"));
...@@ -161,7 +163,7 @@ class MyTestController extends Controller ...@@ -161,7 +163,7 @@ class MyTestController extends Controller
$statusName = ['10'=>'未接单','20'=>'未接单','30'=>'安装中','34'=>'待审核','40'=>'已完成','50'=>'已撤销','55'=>'已撤销（补邮费）']; $statusName = ['10'=>'未接单','20'=>'未接单','30'=>'安装中','34'=>'待审核','40'=>'已完成','50'=>'已撤销','55'=>'已撤销（补邮费）'];
$html = "<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><table>"; $html = "<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><table>";
$html .= "<tr>"; $html .= "<tr>";
$html .= "<td>门店名称</td><td>单号</td><td>订单状态</td><td>创建时间</td><td>接单时间</td><td>反馈时间</td><td>接单时效</td><td>5分钟接单达标</td><td>10钟接单达标</td><td>履约时效</td><td>12小时履约达标</td><td>24小时履约达标</td>"; $html .= "<td>门店名称</td><td>单号</td><td>订单状态</td><td>创建时间</td><td>接单时间</td><td>反馈时间</td><td>接单时效</td><td>5分钟接单达标</td><td>10钟接单达标</td><td>履约时效</td><td>12小时履约达标</td><td>24小时履约达标</td><td>是否计入时效考核</td>";
$html .= "</tr>"; $html .= "</tr>";
foreach($datas as $k => $v){ foreach($datas as $k => $v){
$html .= "<tr>"; $html .= "<tr>";
...@@ -206,6 +208,12 @@ class MyTestController extends Controller ...@@ -206,6 +208,12 @@ class MyTestController extends Controller
$html .= "<td>不达标</td>"; $html .= "<td>不达标</td>";
$html .= "<td>不达标</td>"; $html .= "<td>不达标</td>";
} }
$time = explode(' ', $v['create_time'])[1];
if($time>='08:30:00' && $time<='18:00:00'){
$html .= "<td>是</td>";
}else{
$html .= "<td>否</td>";
}
$html .= "</tr>"; $html .= "</tr>";
} }
$html .= "<table></html>"; $html .= "<table></html>";
......
app/Http/Controllers/Financial/SettlementController.php
浏览文件 @ 072aeb8a
...@@ -201,6 +201,7 @@ class SettlementController extends BaseController{ ...@@ -201,6 +201,7 @@ class SettlementController extends BaseController{
$list_service_type55['list_service_type'] = 55; $list_service_type55['list_service_type'] = 55;
$where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40; $where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40;
$where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55; $where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55;
$where['company_id'] = $session['company_id'];
$res = SettlementService::getSettlementList($where); $res = SettlementService::getSettlementList($where);
if ($res){ if ($res){
$input['source'] = 2; $input['source'] = 2;
......
app/Http/Controllers/Financial/StatementsListController.php
浏览文件 @ 072aeb8a
...@@ -273,6 +273,7 @@ class StatementsListController extends BaseController{ ...@@ -273,6 +273,7 @@ class StatementsListController extends BaseController{
$list_service_type55['list_service_type'] = 55; $list_service_type55['list_service_type'] = 55;
$where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40; $where['list_service_type_searchor']['list_service_type40_next_level'] = $list_service_type40;
$where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55; $where['list_service_type_searchor']['list_service_type55_next_level'] = $list_service_type55;
$where['company_id'] = $session['company_id'];
$res = SettlementService::getSettlementList($where,['id','all_price','subsidy_money','list_service_type','wat_judge','order_num','p_id','msg_id']); $res = SettlementService::getSettlementList($where,['id','all_price','subsidy_money','list_service_type','wat_judge','order_num','p_id','msg_id']);
/*-----------------------------------------------拼接条件获取满足的结算单数据结束-----------------------------------*/ /*-----------------------------------------------拼接条件获取满足的结算单数据结束-----------------------------------*/
if ($res){ if ($res){
......
app/Http/Controllers/Orders/AotuorderController.php
浏览文件 @ 072aeb8a
...@@ -143,7 +143,7 @@ class AotuorderController extends BaseController ...@@ -143,7 +143,7 @@ class AotuorderController extends BaseController
$data['code']='2'; $data['code']='2';
if($data['code']=='1'){ if($data['code']=='1'){
}else{ }else{
if($sheng == '江苏' || $sheng == '江苏省'){ if($sheng == '江苏' || $sheng == '江苏省' || $sheng == '上海' || $sheng == '上海市'){
$where = ' and (admin_groupnew=3 or (admin_groupnew=2 and company_type=2))'; $where = ' and (admin_groupnew=3 or (admin_groupnew=2 and company_type=2))';
}else{ }else{
if($order['company_id']==14){ if($order['company_id']==14){
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ 072aeb8a
...@@ -144,7 +144,7 @@ class OrderListController extends BaseController ...@@ -144,7 +144,7 @@ class OrderListController extends BaseController
$session_token = $request->get('session_token'); $session_token = $request->get('session_token');
if (!in_array($session_token['admin_groupnew'], [2,3,7,8])){//管理员可以看全部 if (!in_array($session_token['admin_groupnew'], [2,3,4,7,8])){//管理员可以看全部
$where.=" and company_id='".$session_token['company_id']."'"; $where.=" and company_id='".$session_token['company_id']."'";
} }
if (in_array($session_token['admin_groupnew'], [2,3,8])){//管理员可以看全部 if (in_array($session_token['admin_groupnew'], [2,3,8])){//管理员可以看全部
......
app/Http/Controllers/User/AdminsController.php
浏览文件 @ 072aeb8a
...@@ -180,6 +180,7 @@ class AdminsController extends BaseController ...@@ -180,6 +180,7 @@ class AdminsController extends BaseController
$find_data = DB::table('admin') $find_data = DB::table('admin')
->where('company_id', $admins['company_id']) ->where('company_id', $admins['company_id'])
->where('admin_groupnew', "!=" ,2)
->count(); ->count();
if ($find_data >= 5) { if ($find_data >= 5) {
return $this->error('添加数量超出限制', ErrorInc::MYSQL_FAILED, []); return $this->error('添加数量超出限制', ErrorInc::MYSQL_FAILED, []);
......
app/Services/Api/MobileWeb/StatementsListService.php
浏览文件 @ 072aeb8a
...@@ -60,7 +60,7 @@ class StatementsListService extends Model ...@@ -60,7 +60,7 @@ class StatementsListService extends Model
} }
$list_data = $list_data->where('list_service_type', 40) $list_data = $list_data->where('list_service_type', 40)
->whereIn('sett_status', [1,60,63]) ->whereIn('sett_status', [1,60,63])
->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state') ->select('s.id','s.order_num as sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state')
->paginate($show_count); ->paginate($show_count);
$page['count'] = 0; $page['count'] = 0;
$page['page'] = 0; $page['page'] = 0;
...@@ -201,7 +201,7 @@ class StatementsListService extends Model ...@@ -201,7 +201,7 @@ class StatementsListService extends Model
->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id') ->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id')
->where('s.ser_id', $session['admin_id']) ->where('s.ser_id', $session['admin_id'])
->where('wat_num', $data['stl_wat']) ->where('wat_num', $data['stl_wat'])
->select('s.id','s.sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num') ->select('s.id','s.sys_num', 's.create_time', 'all_price', 's.order_num as list_id', 'om.goods_name', 'om.goods_num')
->get(); ->get();
$data['info_data'] = $info_data; $data['info_data'] = $info_data;
return ['ErrorCode' => 1, 'ErrorMessage' => '成功', 'Data' => $data]; return ['ErrorCode' => 1, 'ErrorMessage' => '成功', 'Data' => $data];
......
app/Services/DataStatisticsService.php 0 → 100644
浏览文件 @ 072aeb8a
<?php
/**
* 文件名称（数据统计）
* 文件简单描述（用于进行数据统计分析）
* @author DouBin
* @Date: 2024/10/15
* @Time: 17:49
* @Email: db@sudianwang.com
* @version 1.0
* @copyright BlueCity
*/
namespace App\Services;
use App\Models\Company;
use BlueCity\Core\Service\Service;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Log;
use Maatwebsite\Excel\Facades\Excel;
use phpDocumentor\Reflection\Types\Integer;
use BlueCity\Core\Inc\ErrorInc;
class DataStatisticsService extends Service{
/**|---------------------------------------------------------------------------------
* @name 获取公司信息
* @retrun /multitype:array
* @param string ID 公司id
* @author dou 2022-12-05 005 下午 6:50:11
* |---------------------------------------------------------------------------------
*/
public static function getSerStatistics ( $session ){
$db = new Company();
$company = CommonService::getMysqlData($db, ['com_id'=>$id],$select,[],$type);
return $company;
}
}
app/Services/OrderListService.php
浏览文件 @ 072aeb8a
...@@ -568,7 +568,7 @@ class OrderListService extends Service ...@@ -568,7 +568,7 @@ class OrderListService extends Service
} }
// } // }
if (!in_array($session['admin_groupnew'], [2,3,7,8])){//管理员可以看全部 if (!in_array($session['admin_groupnew'], [2,3,4,7,8])){//管理员可以看全部
$where['gone_order_list.company_id'] = $session['company_id']; $where['gone_order_list.company_id'] = $session['company_id'];
} }
if (in_array($session['admin_groupnew'], [8])){//管理员可以看全部 if (in_array($session['admin_groupnew'], [8])){//管理员可以看全部
...@@ -593,6 +593,7 @@ class OrderListService extends Service ...@@ -593,6 +593,7 @@ class OrderListService extends Service
->orderBy('create_time','ASC')->paginate($page_size); ->orderBy('create_time','ASC')->paginate($page_size);
//print_r(DB::getQueryLog()); //print_r(DB::getQueryLog());
//导出所需语句 //导出所需语句
$data['where'] = $where;
$data['sqls'] = DB::getQueryLog()[1]; $data['sqls'] = DB::getQueryLog()[1];
$data['show_Menu'] = [ $data['show_Menu'] = [
['show_name'=>"全部",'status'=>'1','show_num'=>'--'], ['show_name'=>"全部",'status'=>'1','show_num'=>'--'],
...@@ -600,8 +601,8 @@ class OrderListService extends Service ...@@ -600,8 +601,8 @@ class OrderListService extends Service
['show_name'=>"安装中",'status'=>'3','show_num'=>'--'], ['show_name'=>"安装中",'status'=>'3','show_num'=>'--'],
//['show_name'=>"延期订单",'status'=>'4','show_num'=>'--'], //['show_name'=>"延期订单",'status'=>'4','show_num'=>'--'],
['show_name'=>"待完成",'status'=>'5','show_num'=>'--'], ['show_name'=>"待完成",'status'=>'5','show_num'=>'--'],
['show_name'=>"延期审图",'status'=>'9','show_num'=>"--"], // ['show_name'=>"延期审图",'status'=>'9','show_num'=>"--"],
['show_name'=>"延期结算",'status'=>'10','show_num'=>"--"], // ['show_name'=>"延期结算",'status'=>'10','show_num'=>"--"],
['show_name'=>"已完成",'status'=>'6','show_num'=>'--'], ['show_name'=>"已完成",'status'=>'6','show_num'=>'--'],
//['show_name'=>"未预约",'status'=>'7','show_num'=>"--"], //['show_name'=>"未预约",'status'=>'7','show_num'=>"--"],
//['show_name'=>"超时",'status'=>'8','show_num'=>"--"], //['show_name'=>"超时",'status'=>'8','show_num'=>"--"],
......
public/favicon.ico
浏览文件 @ 072aeb8a
No preview for this file type
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论