mkm/lihaiMiddleOffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

迁移财务管理

Browse Source
This commit is contained in:
lewis 2025-02-28 16:51:43 +08:00
parent c0caac17f9
commit b70cefb494
9 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ExceptionHandler.php
View File

@ -25,7 +25,7 @@ class ExceptionHandler extends Handler
return json(['code' => 0, 'msg' => $exception->getMessage(),'show'=>1]);
}
return response($exception->getMessage());
} elseif ($exception instanceof \Exception) {
} elseif ($exception instanceof \Error || $exception instanceof \ErrorException) {
$isDebug = config('app.debug');
$error = [
'show' => 1,

2
app/common/model/works/bgsp/OaFlowType.php
View File

@ -33,6 +33,6 @@ class OaFlowType extends BaseModel
public function getTypeTextAttr($value,$data){
$dict = DictData::where('type_value', 'oa_approve_cate')->column('name','value');
return !empty($data['type']) ? $dict[$data['type']] : '';
return !empty($data['type']) ? $dict[$data['type']] ?? '' : '';
}
}

14
app/oa/controller/works/bgsp/OaApproveController.php
View File

@ -2,7 +2,7 @@
namespace app\oa\controller\works\bgsp;
use app\oa\controller\BaseAdminController;
use app\admin\controller\BaseAdminController;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use app\common\model\works\bgsp\OaFlow;
@ -12,7 +12,7 @@
class OaApproveController extends BaseAdminController
{
public function lists(){
$params = $this->request->get(['type','page_no','page_size']);
$params = $this->request->get();
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
if(empty($params['type']) || !in_array($params['type'],[1,2,3,4,5])){
@ -36,12 +36,16 @@
}
$lists = Db::name('oa_approve')->field('id,type,flow_id,admin_id,check_admin_ids,check_status,create_time')->where('admin_id',$this->adminId)->where($where)
->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
$admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty();
$dept = Dept::where('id',$admin['dept_id'])->value('name');
$admin = Admin::field('id,name,dept_id')->where('id',$data['admin_id'])->findOrEmpty()->toArray();
if (!empty($admin['dept_id'])) {
$dept = Dept::where('id',$admin['dept_id'][0])->value('name');
$data['dept_name'] = $dept ?? '';
} else {
$data['dept_name'] = '';
}
$flow_type = OaFlowType::where('id',$data['type'])->value('title');
$check_admin_users = Admin::where('id','in',$data['check_admin_ids'])->column('name');
$data['user_name'] = $admin['name'];
$data['dept_name'] = $dept ?? '';
$data['type_name'] = $flow_type ?? '';
$data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : '';
$data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);

2
app/oa/controller/works/bgsp/OaFlowController.php
View File

@ -16,7 +16,7 @@
namespace app\oa\controller\works\bgsp;
use app\oa\controller\BaseAdminController;
use app\admin\controller\BaseAdminController;
use app\oa\lists\works\bgsp\OaFlowLists;
use app\oa\logic\works\bgsp\OaFlowLogic;
use app\oa\validate\works\bgsp\OaFlowValidate;

10
app/oa/controller/works/bgsp/OaFlowTypeController.php
View File

@ -13,13 +13,13 @@
// +----------------------------------------------------------------------
namespace app\adminapi\controller\works\bgsp;
namespace app\oa\controller\works\bgsp;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\works\bgsp\OaFlowTypeLists;
use app\adminapi\logic\works\bgsp\OaFlowTypeLogic;
use app\adminapi\validate\works\bgsp\OaFlowTypeValidate;
use app\admin\controller\BaseAdminController;
use app\oa\lists\works\bgsp\OaFlowTypeLists;
use app\oa\logic\works\bgsp\OaFlowTypeLogic;
use app\oa\validate\works\bgsp\OaFlowTypeValidate;
/**

22
app/oa/controller/works/finance/ExpenseController.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\adminapi\controller\works\finance;
namespace app\oa\controller\works\finance;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\validate\works\finance\ExpenseValidate;
use app\admin\controller\BaseAdminController;
use app\oa\validate\works\finance\ExpenseValidate;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use app\common\model\works\bgsp\OaFlow;
@ -173,8 +173,8 @@
$copy_users = Admin::where('id','in',$data['copy_uids'])->column('name');
$data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : '';
$data['copy_users'] = !empty($copy_users) ? implode(',',$copy_users) : '';
$data['detail'] = json_decode($data['detail'],true);
$data['annex'] = json_decode($data['annex'],true);
$data['detail'] = empty($data['detail']) ? [] : json_decode($data['detail'],true);
$data['annex'] = empty($data['annex']) ? [] : json_decode($data['annex'],true);
$data['total_amount'] = 0;
foreach ($data['detail'] as &$v){
$data['total_amount'] += $v['amount'];
@ -225,7 +225,7 @@
}
public function lists(){
$params = $this->request->get(['start_time','end_time','status','page_no','page_size']);
$params = $this->request->get();
$page_no = !empty($params['page_no']) ? $params['page_no'] : 1;
$page_size = !empty($params['page_size']) ? $params['page_size'] : 15;
$where = [];
@ -249,11 +249,15 @@
}
$lists = Db::name('oa_expense')->field('id,code,income_month,expense_time,admin_id,check_admin_ids,check_status,pay_admin_id,pay_time,create_time,detail')->where('admin_id',$this->adminId)->where($where)
->page($page_no, $page_size)->order('id desc')->select()->each(function($data){
$admin = Admin::field('name,dept_id')->where('id',$data['admin_id'])->findOrEmpty();
$dept = Dept::where('id',$admin['dept_id'])->value('name');
$admin = Admin::field('id,name,dept_id')->where('id',$data['admin_id'])->findOrEmpty();
if (!empty($admin['dept_id'])) {
$dept = Dept::where('id',$admin['dept_id'][0])->value('name');
$data['dept_name'] = $dept;
} else {
$data['dept_name'] = '';
}
$check_admin_users = Admin::where('id','in',$data['check_admin_ids'])->column('name');
$data['user_name'] = $admin['name'];
$data['dept_name'] = $dept ?? '';
$data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : '';
$data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);
$data['income_month'] = date('Y-m',$data['income_month']);

4
app/oa/controller/works/finance/IncomeController.php
View File

@ -1,8 +1,8 @@
<?php
namespace app\adminapi\controller\works\finance;
namespace app\oa\controller\works\finance;
use app\adminapi\controller\BaseAdminController;
use app\admin\controller\BaseAdminController;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use think\facade\Db;

6
app/oa/controller/works/finance/InvoiceController.php
View File

@ -1,9 +1,9 @@
<?php
namespace app\adminapi\controller\works\finance;
namespace app\oa\controller\works\finance;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\validate\works\finance\InvoiceValidate;
use app\admin\controller\BaseAdminController;
use app\oa\validate\works\finance\InvoiceValidate;
use app\common\model\auth\Admin;
use app\common\model\dept\Dept;
use app\common\model\works\bgsp\OaFlow;

4
app/oa/lists/works/bgsp/OaFlowTypeLists.php
View File

@ -12,10 +12,10 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\works\bgsp;
namespace app\oa\lists\works\bgsp;
use app\adminapi\lists\BaseAdminDataLists;
use app\admin\lists\BaseAdminDataLists;
use app\common\model\dept\Dept;
use app\common\model\works\bgsp\OaFlowType;
use app\common\lists\ListsSearchInterface;