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

借用

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-02 13:17:11 +08:00
parent a8d1309349
commit ab3bffe7cb
6 changed files with 170 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/InvItemController.php
-15
View File
@@ -52,19 +52,4 @@ class InvItemController extends BaseController
$data['manage_user_name'] = User::where('id', $data['manage_user_id'])->value('name');
return $data;
}
public function requisitionList(Request $request){
try {
$res = $this->service->getList();
$result = [];
foreach ($res as $value) {
$value['company_name'] = Corp::where('id', $value['company_id'])->value('name');
$value['manage_user_name'] = User::where('id', $value['manage_user_id'])->value('name');
$result[] = $value;
}
return $this->success($result, '审核列表');
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
}
app/admin/controller/InvRequisitionController.php
+80 -8
View File
@@ -2,8 +2,13 @@
namespace app\admin\controller;
use app\common\controller\BaseController;
use app\common\model\InvRequisitionApprove;
use app\common\model\InvRequisitionAttachment;
use app\common\model\InvRequisitionItem;
use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait;
use app\admin\service\InvRequisitionService;
use support\Request;
class InvRequisitionController extends BaseController
{
@@ -16,18 +21,85 @@ class InvRequisitionController extends BaseController
$this->service = new InvRequisitionService();
}
/**
* 审核
*
* @param Request $request
* @return \support\Response
*/
public function approve(Request $request)
{
try {
$data = $this->service->serviceApprove($request);
return $this->success($data);
} catch (\Throwable $e) {
return $this->error($e->getMessage().$e->getFile().$e->getLine().$e->getTraceAsString());
}
}
/**
* 获取列表
*
* @param Request $request 请求对象
* @return mixed 返回分页数据及总数
*/
public function index(Request $request)
{
try {
$raw = $this->service->serviceList($request);
$data = $this->transformData($raw, method_exists($this, 'indexFormat')
? [$this, 'indexFormat']
: null);
return $this->success($data);
} catch (\Throwable $e) {
return $this->error($e->getMessage());
}
}
/**
* 列表页数据格式化
*
* @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']);
// return $data;
// }
protected function indexFormat($data)
{
// if (isset($data['id'])){
// $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
// }
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['id'])){
$data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get();
}
return $data;
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function showFormat($data)
{
if (isset($data['id'])){
$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get();
}
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['id'])){
$data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get();
$data['attachment'] = InvRequisitionAttachment::where('requisition_id', $data['id'])->get();
$oss = new OssService();
foreach ($data['attachment'] as $key => $value) {
$data['attachment'][$key]['file_path_pull'] = $oss->generatePrivateUrl($value['file_path']);
}
}
return $data;
}
}
app/admin/service/InvRequisitionService.php
+57
View File
@@ -5,6 +5,7 @@ namespace app\admin\service;
use app\common\validate\InvRequisitionValidate;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\InvRequisition;
use support\Request;
class InvRequisitionService
{
@@ -28,4 +29,60 @@ class InvRequisitionService
{
return new $this->validator;
}
/**
* 构造 CrudUtil 查询配置
*/
protected function buildQueryConfig(Request $request, string $scene = 'default'): array
{
$p = $request->all();
$config = [];
$config['model'] = $this->modelClass;
switch ($scene) {
case 'default':
//$config['where']['status'] = 1;
$config['order']['id'] = 'desc';
break;
case 'index':
if(isset($p['status']) && $p['status']){
$config['where']['status'] = $p['status'];
}
if(isset($p['applicant_id']) && $p['applicant_id']){
$config['where']['applicant_id'] = $p['applicant_id'];
}
$config['order']['id'] = 'desc';
break;
case 'show':
$config['where']['id'] = $p['id'];
//$config['where']['status'] = 1;
break;
case 'store':
break;
case 'update':
$config['where']['id'] = $p['id'];
break;
case 'destroy':
$config['where']['id'] = $p['id'];
break;
}
return $config;
}
/**
* 审批
* @param Request $request
* @return mixed|string[]|null
*/
public function serviceApprove(Request $request)
{
$param = $request->all();
//$appro = new \app\common\utils\approval\service\ApprovalFlowService();
$appro = new \app\common\service\InvRequisitionApproveService();
//requisition_id:申请id
//action:审批动作：1通过 2驳回
//comment:审批意见
return $appro->approve($param['requisition_id'], $param['approver_id'], $request->user->uid, $param['action'], $param['comment']);
}
}