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

update

Browse Source
This commit is contained in:
weiz 2024-03-28 10:41:27 +08:00
parent 2feda57f3c
commit ab005f90c1
3 changed files with 125 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
app/adminapi/lists/financial/FinancialExpenseReimbursementDetailLists.php
View File

@ -12,66 +12,72 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\financial; namespace app\adminapi\lists\financial;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\financial\FinancialExpenseReimbursementDetail; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\dept\Dept;
use app\common\model\financial\FinancialExpenseReimbursementDetail;
/** /**
* 财务管理--费用报销单--报销明细列表 * 财务管理--费用报销单--报销明细列表
* Class FinancialExpenseReimbursementDetailLists * Class FinancialExpenseReimbursementDetailLists
* @package app\adminapi\listsfinancial * @package app\adminapi\listsfinancial
*/ */
class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implements ListsSearchInterface class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implements ListsSearchInterface
{ {
/** /**
* @notes 设置搜索条件 * @notes 设置搜索条件
* @return \string[][] * @return \string[][]
* @author likeadmin * @author likeadmin
* @date 2024/03/28 09:26 * @date 2024/03/28 09:26
*/ */
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['expense_reimbursement_id'], '=' => ['expense_reimbursement_id'],
];
} ];
}
/** /**
* @notes 获取财务管理--费用报销单--报销明细列表 * @notes 获取财务管理--费用报销单--报销明细列表
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @author likeadmin * @author likeadmin
* @date 2024/03/28 09:26 * @date 2024/03/28 09:26
*/ */
public function lists(): array public function lists(): array
{ {
return FinancialExpenseReimbursementDetail::where($this->searchWhere) return FinancialExpenseReimbursementDetail::where($this->searchWhere)
->field(['id', 'expense_reimbursement_id', 'dept_id', 'date', 'subject_name', 'amount', 'abstract']) ->field(['id', 'expense_reimbursement_id', 'dept_id', 'date', 'subject_name', 'amount', 'abstract'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
->toArray(); $dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
} $data['dept_name'] = $dept['name'];
$data['subject_name_text'] = $data->subject_name_text;
})
->toArray();
}
/** /**
* @notes 获取财务管理--费用报销单--报销明细数量 * @notes 获取财务管理--费用报销单--报销明细数量
* @return int * @return int
* @author likeadmin * @author likeadmin
* @date 2024/03/28 09:26 * @date 2024/03/28 09:26
*/ */
public function count(): int public function count(): int
{ {
return FinancialExpenseReimbursementDetail::where($this->searchWhere)->count(); return FinancialExpenseReimbursementDetail::where($this->searchWhere)->count();
} }
} }

16
app/adminapi/logic/financial/FinancialExpenseReimbursementDetailLogic.php
View File

@ -16,6 +16,7 @@
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\dept\Dept;
use app\common\model\financial\FinancialExpenseReimbursementDetail; use app\common\model\financial\FinancialExpenseReimbursementDetail;
use think\facade\Db; use think\facade\Db;
@ -46,9 +47,8 @@
'date' => !empty($params['date']) ? strtotime($params['date']) : 0, 'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
'subject_name' => $params['subject_name'], 'subject_name' => $params['subject_name'],
'amount' => $params['amount'], 'amount' => $params['amount'],
'abstract' => $params['abstract'], 'abstract' => $params['abstract'] ?? '',
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -73,12 +73,12 @@
FinancialExpenseReimbursementDetail::where('id', $params['id'])->update([ FinancialExpenseReimbursementDetail::where('id', $params['id'])->update([
'expense_reimbursement_id' => $params['expense_reimbursement_id'], 'expense_reimbursement_id' => $params['expense_reimbursement_id'],
'dept_id' => $params['dept_id'], 'dept_id' => $params['dept_id'],
'date' => $params['date'], 'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
'subject_name' => $params['subject_name'], 'subject_name' => $params['subject_name'],
'amount' => $params['amount'], 'amount' => $params['amount'],
'abstract' => $params['abstract'], 'abstract' => $params['abstract'] ?? '',
'update_time' => time(),
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -111,6 +111,10 @@
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return FinancialExpenseReimbursementDetail::findOrEmpty($params['id'])->toArray(); $data = FinancialExpenseReimbursementDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
$data['dept_name'] = $dept['name'];
$data['subject_name_text'] = $data->subject_name_text;
return $data->toArray();
} }
} }

39
app/common/model/financial/FinancialExpenseReimbursementDetail.php
View File

@ -12,23 +12,34 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\common\model\financial; namespace app\common\model\financial;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use think\model\concern\SoftDelete; use app\common\model\dict\DictData;
use think\model\concern\SoftDelete;
/** /**
* 财务管理--费用报销单--报销明细模型 * 财务管理--费用报销单--报销明细模型
* Class FinancialExpenseReimbursementDetail * Class FinancialExpenseReimbursementDetail
* @package app\common\model\financial * @package app\common\model\financial
*/ */
class FinancialExpenseReimbursementDetail extends BaseModel class FinancialExpenseReimbursementDetail extends BaseModel
{ {
use SoftDelete; use SoftDelete;
protected $name = 'financial_expense_reimbursement_detail';
protected $deleteTime = 'delete_time';
protected $name = 'financial_expense_reimbursement_detail';
protected $deleteTime = 'delete_time';
} public function getDateAttr($value): string
{
return !empty($value) ? date('Y-m-d', $value) : '';
}
public function getSubjectNameTextAttr($value, $data)
{
$dict = DictData::where('type_value', 'subject_category')->column('name', 'value');
return !empty($data['subject_name']) ? $dict[$data['subject_name']] : '';
}
}