xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-09-18 15:04:59 +08:00
parent 9331aa2f36 e2f2e0147e
commit cd29507c45
23 changed files with 933 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/BrandSeriesService.php
+46
View File
@@ -3,6 +3,7 @@
namespace app\admin\service;
use app\admin\validate\BrandSeriesValidate;
use app\common\model\Brand;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\BrandSeries;
use support\Request;
@@ -77,4 +78,49 @@ class BrandSeriesService
return $config;
}
/**
* 生成唯一的7位颜色编码
* 格式：C + (O/I) + 5位字母数字组合
*
* @param int $type 类型
* @return string 7位唯一编码
*/
public function generateUniqueModificationCode($brand_id)
{
$chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
$maxAttempts = 10; // 防止无限循环
$brand_code = Brand::where('id', $brand_id)->value('brand_code');
$brand_code = $brand_code??'BS';
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
// 生成后5位随机字符
$suffix = '';
for ($i = 0; $i < 6; $i++) {
$suffix .= $chars[rand(0, strlen($chars) - 1)];
}
$code = $brand_code . $suffix;
// 检查是否已存在
$existing = BrandSeries::where('series_code', $code)->first();
if (!$existing) {
return $code;
}
}
// 如果1000次尝试后仍然重复，使用时间戳确保唯一性
$timestamp = substr(time(), -6);
return $brand_code . $timestamp;
}
/**
* 添加前置处理
*/
public function beforeServiceStore($data, Request $request)
{
$brand_id = $data['brand_id'] ?? 0;
$data['series_code'] = $this->generateUniqueModificationCode($brand_id);
return $data;
}
}
app/admin/service/BrandService.php
+1
View File
@@ -43,6 +43,7 @@ class BrandService
switch ($scene) {
case 'index':
// ====== ====== 排序 ====== ======
$config['order']['hot'] = 'desc';
$config['order']['sort'] = 'desc';
$config['order']['id'] = 'desc';
app/admin/targets/controller/SalesAnnualTargetsController.php
+45
View File
@@ -0,0 +1,45 @@
<?php
namespace app\admin\targets\controller;
use app\common\controller\BaseController;
use app\common\model\Corp;
use app\common\model\User;
use app\common\traits\crud\CrudControllerTrait;
use app\admin\targets\service\SalesAnnualTargetsService;
class SalesAnnualTargetsController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new SalesAnnualTargetsService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['corp_id'])){
$data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
// $data['corp_name'] = $data['corp_name']??'合塑集团';
}
if (isset($data['user_id']))
$data['user_name'] = User::where('id', $data['user_id'])->value('name');
if (empty($data['corp_id']) || empty($data['user_id'])){
$data['user_name'] = '合塑集团';
}
return $data;
}
}
app/admin/targets/controller/SalesMonthlyTargetsController.php
+40
View File
@@ -0,0 +1,40 @@
<?php
namespace app\admin\targets\controller;
use app\common\controller\BaseController;
use app\common\model\Corp;
use app\common\model\User;
use app\common\traits\crud\CrudControllerTrait;
use app\admin\targets\service\SalesMonthlyTargetsService;
class SalesMonthlyTargetsController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new SalesMonthlyTargetsService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['corp_id']))
$data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
if (isset($data['user_id']))
$data['user_name'] = User::where('id', $data['user_id'])->value('name');
return $data;
}
}
app/admin/targets/controller/StatisticsController.php
+156
View File
@@ -0,0 +1,156 @@
<?php
namespace app\admin\targets\controller;
use app\admin\targets\service\SalesAnnualTargetsService;
use app\common\controller\BaseController;
use app\common\model\Corp;
use app\common\model\SalesAnnualTargets;
use app\common\model\SalesMonthlyTargets;
use app\common\model\User;
use app\common\traits\crud\CrudControllerTrait;
use support\Request;
use support\Db;
class StatisticsController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new SalesAnnualTargetsService();
}
public function total(Request $request)
{
$param = $request->all();
if (empty($param['year'])) {
return $this->error('year不能为空');
}
$data = SalesAnnualTargets::select('annual_target','corp_id')
->whereNull('user_id')
->where('year',$param['year'])
->orderBy('corp_id')
->get()
->toArray();
foreach ($data as &$value) {
$where = [];
$where[] = ['year', '=', $param['year']];
if (!empty($value['corp_id'])) {
$where[] = ['corp_id', '=', $value['corp_id']];
}
$value['achieved'] = SalesMonthlyTargets::where($where)->sum('achieved');
$value['progress'] = empty($value['annual_target'])?'100%':number_format(($value['achieved']/$value['annual_target']*100),2) . '%';
$value['corp_name'] = empty($value['corp_id'])?'集团':Corp::where(['id' => $value['corp_id']])->value('name');
}
return $this->success($data);
}
public function ranking(Request $request){
$param = $request->all();
$year = empty($param['year']) ? date('Y') : $param['year'];
$where = [];
$where[] = ['year', '=', $year];
$ranking = SalesMonthlyTargets::select('corp_id', 'user_id', Db::raw('SUM(achieved) AS achieved'))
->where($where)
->groupBy('corp_id', 'user_id')
->orderBy('achieved', 'desc')
->get();
foreach ($ranking as $key => $value) {
$ranking[$key]['corp_name'] = Corp::where(['id' => $value['corp_id']])->value('name');
$ranking[$key]['user_name'] = User::where(['id' => $value['user_id']])->value('name');
}
return $this->success($ranking);
}
public function achievedUserByMonth(Request $request){
$param = $request->all();
$year = empty($param['year']) ? date('Y') : $param['year'];
$where = [];
$where[] = ['year', '=', $year];
$ranking = SalesMonthlyTargets::select('corp_id', 'user_id', 'month', Db::raw('SUM(achieved) AS achieved'))
->where($where)
->groupBy('corp_id', 'user_id', 'month')
->orderBy('user_id', 'asc')
->orderBy('month', 'asc')
->get();
$result = [];
foreach ($ranking as $key => $value) {
$result[$value['user_id']]['month'][$value['month']] = $value['achieved'];
$result[$value['user_id']]['user_id'] = $value['user_id'];
$result[$value['user_id']]['corp_id'] = $value['corp_id'];
}
foreach ($result as $key => $value) {
for($i = 1; $i <= 12; $i++){
$result[$key]['month'][$i] = $result[$key]['month'][$i]??0;
}
$result[$key]['month'] = array_values($result[$key]['month']);
$result[$key]['corp_name'] = Corp::where(['id' => $value['corp_id']])->value('name');
$result[$key]['user_name'] = User::where(['id' => $value['user_id']])->value('name');
}
$result = array_values($result);
return $this->success($result);
}
/**
* 个人年度目标完成度（百分比）
* @param Request $request
* @return \support\Response
*/
public function userProgressh(Request $request){
$param = $request->all();
$year = empty($param['year']) ? date('Y') : $param['year'];
$where = [];
$where[] = ['year', '=', $year];
$achieved = SalesMonthlyTargets::select('corp_id', 'user_id', Db::raw('SUM(achieved) AS achieved'))
->where($where)
->groupBy('corp_id', 'user_id')
->orderBy('achieved', 'desc')
->get()
->toArray();
$sort = [];
foreach ($achieved as $key => $value) {
$achieved[$key]['corp_name'] = Corp::where(['id' => $value['corp_id']])->value('name');
$achieved[$key]['user_name'] = User::where(['id' => $value['user_id']])->value('name');
$target = SalesAnnualTargets::where(['user_id' => $value['user_id']])->value('annual_target');
$achieved[$key]['progressh'] = empty($target) ? 0 : round(($value['achieved'] / $target) * 100, 2);
$sort[] = $achieved[$key]['progressh'];
}
array_multisort($sort, SORT_DESC, SORT_NUMERIC, $achieved);
foreach ($achieved as $key => $value) {
$achieved[$key]['progressh'] = $value['progressh'];
}
return $this->success($achieved);
}
/**
* 个人累积完成数量（辆）
* @param Request $request
* @return \support\Response
*/
public function userAchieved(Request $request){
$param = $request->all();
$year = empty($param['year']) ? date('Y') : $param['year'];
$where = [];
$where[] = ['year', '=', $year];
$achieved = SalesMonthlyTargets::select('corp_id', 'user_id', Db::raw('SUM(achieved) AS achieved'))
->where($where)
->groupBy('corp_id', 'user_id')
->orderBy('achieved', 'desc')
->get()
->toArray();
foreach ($achieved as $key => $value) {
$achieved[$key]['corp_name'] = Corp::where(['id' => $value['corp_id']])->value('name');
$achieved[$key]['user_name'] = User::where(['id' => $value['user_id']])->value('name');
$target = SalesAnnualTargets::where(['user_id' => $value['user_id']])->value('annual_target');
$achieved[$key]['annual_target'] = empty($target) ? 0 : $target;
$achieved[$key]['total'] = [intval($value['achieved']), $achieved[$key]['annual_target']];
}
return $this->success($achieved);
}
}
app/admin/targets/logic/SalesAnnualTargetsLogic.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace app\admin\targets\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\SalesAnnualTargets;
class SalesAnnualTargetsLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SalesAnnualTargets::class;
}
app/admin/targets/logic/SalesMonthlyTargetsLogic.php
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace app\admin\targets\logic;
use app\common\traits\crud\CrudLogicTrait;
use app\common\model\SalesMonthlyTargets;
class SalesMonthlyTargetsLogic
{
use CrudLogicTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SalesMonthlyTargets::class;
}
app/admin/targets/service/SalesAnnualTargetsService.php
+89
View File
@@ -0,0 +1,89 @@
<?php
namespace app\admin\targets\service;
use app\admin\targets\validate\SalesAnnualTargetsValidate;
use app\common\model\User;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\SalesAnnualTargets;
use support\exception\BusinessException;
use support\Request;
class SalesAnnualTargetsService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SalesAnnualTargets::class;
/**
* 验证器
*/
protected $validator = SalesAnnualTargetsValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'index'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
if (isset($p['year']) && $p['year']) {
$config['where']['year'] = $p['year'];
}
$config['order']['id'] = 'desc';
break;
case 'show':
case 'update':
case 'destroy':
$config['where']['id'] = $p['id'];
break;
case 'store':
break;
}
return $config;
}
// ====== 前置处理 ======
/**
* 添加前置处理
*/
public function beforeServiceStore($data, Request $request)
{
if(isset($data['user_id']) && $data['user_id'] && empty($data['corp_id'])){
$data['corp_id'] = User::where('id', $data['user_id'])->value('corp_id');
}
if(isset($data['corp_id']) && empty($data['corp_id'])){
unset($data['corp_id']);
}
if(isset($data['user_id']) && empty($data['user_id'])){
unset($data['user_id']);
}
if(isset($data['user_id']) && isset($data['user_id'])){
$annualTargets = SalesAnnualTargets::where('year',$data['year'])->where('corp_id',$data['corp_id'])->where('user_id', $data['user_id'])->first();
}else{
$annualTargets = SalesAnnualTargets::where('year',$data['year'])->whereNull('corp_id')->whereNull('user_id')->first();
}
if($annualTargets){
throw new BusinessException('目标重复添加');
}
return $data;
}
}
app/admin/targets/service/SalesMonthlyTargetsService.php
+75
View File
@@ -0,0 +1,75 @@
<?php
namespace app\admin\targets\service;
use app\admin\targets\validate\SalesMonthlyTargetsValidate;
use app\common\model\User;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\SalesMonthlyTargets;
use support\Request;
class SalesMonthlyTargetsService
{
use CrudServiceTrait;
/**
* 指定当前要操作的模型
*/
protected string $modelClass = SalesMonthlyTargets::class;
/**
* 验证器
*/
protected $validator = SalesMonthlyTargetsValidate::class;
/**
* 获取验证器
*/
public function getValidator()
{
return new $this->validator;
}
/**
* 构建查询条件
*/
protected function buildQueryConfig(Request $request, string $scene = 'index'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'index':
if (isset($p['year']) && $p['year']) {
$config['where']['year'] = $p['year'];
}
$config['order']['year'] = 'desc';
$config['order']['user_id'] = 'desc';
$config['order']['month'] = 'asc';
$config['order']['id'] = 'desc';
break;
case 'show':
case 'update':
case 'destroy':
$config['where']['id'] = $p['id'];
break;
case 'store':
break;
}
return $config;
}
// ====== 前置处理 ======
/**
* 添加前置处理
*/
public function beforeServiceStore($data, Request $request)
{
$data['corp_id'] = User::where('id', $data['user_id'])->value('corp_id');
return $data;
}
}
app/admin/targets/validate/SalesAnnualTargetsValidate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace app\admin\targets\validate;
use think\Validate;
class SalesAnnualTargetsValidate extends Validate
{
// 规则
protected $rule = [
];
// 提示
protected $message = [
];
// 场景
protected $scene = [
'store' => [
],
'update' => [
]
];
}
app/admin/targets/validate/SalesMonthlyTargetsValidate.php
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace app\admin\targets\validate;
use think\Validate;
class SalesMonthlyTargetsValidate extends Validate
{
// 规则
protected $rule = [
];
// 提示
protected $message = [
];
// 场景
protected $scene = [
'store' => [
],
'update' => [
]
];
}