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-25 14:18:47 +08:00
parent bc70ca1ed0
commit 23a6b23314
2 changed files with 287 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/project/ProjectTotalBudgetController.php
View File

@ -54,7 +54,7 @@ class ProjectTotalBudgetController extends BaseAdminController
public function add()
{
$params = (new ProjectTotalBudgetValidate())->post()->goCheck('add');
$result = ProjectTotalBudgetLogic::add($params,$this->adminId);
$result = ProjectTotalBudgetLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}

14
app/adminapi/logic/project/ProjectTotalBudgetLogic.php
View File

@ -15,12 +15,12 @@
namespace app\adminapi\logic\project;
use app\common\logic\BaseLogic;
use app\common\model\dept\Dept;
use app\common\model\dept\Orgs;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\project\ProjectTotalBudget;
use app\common\logic\BaseLogic;
use think\facade\Db;
@ -40,7 +40,7 @@ class ProjectTotalBudgetLogic extends BaseLogic
* @author likeadmin
* @date 2024/01/08 14:25
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
Db::startTrans();
try {
@ -56,7 +56,7 @@ class ProjectTotalBudgetLogic extends BaseLogic
'fy_cost' => $params['fy_cost'] ?? 0,
'jj_cost' => $params['jj_cost'] ?? 0,
'remark' => $params['remark'] ?? '',
'budget_list' => !empty($params['budget_list']) ? $params['budget_list'] : null,
'budget_list' => $params['budget_list'] ? json_encode($params['budget_list']) : null,
'budget_date' => strtotime($params['budget_date']),
'project_manager' => $params['project_manager'],
]);
@ -93,7 +93,7 @@ class ProjectTotalBudgetLogic extends BaseLogic
'fy_cost' => $params['fy_cost'] ?? 0,
'jj_cost' => $params['jj_cost'] ?? 0,
'remark' => $params['remark'] ?? '',
'budget_list' => !empty($params['budget_list']) ? $params['budget_list'] : null,
'budget_list' => $params['budget_list'] ? json_encode($params['budget_list']) : null,
'budget_date' => strtotime($params['budget_date']),
'project_manager' => $params['project_manager'],
'update_time' => time(),
@ -130,8 +130,7 @@ class ProjectTotalBudgetLogic extends BaseLogic
*/
public static function detail($params): array
{
$data = ProjectTotalBudget::field('id,org_id,dept_id,project_id,total_budget_code,contract_amount,cl_cost,fb_cost,rg_cost,fy_cost,jj_cost,remark,budget_list,budget_date,project_manager,approve_id')
->findOrEmpty($params['id']);
$data = ProjectTotalBudget::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
$org = Orgs::field('name')->where('id', $data['org_id'])->findOrEmpty();
$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
@ -160,7 +159,8 @@ class ProjectTotalBudgetLogic extends BaseLogic
return $data->toArray();
}
public static function approve($params,$admin_id): bool{
public static function approve($params, $admin_id): bool
{
$data = ProjectTotalBudget::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {