update
This commit is contained in:
weiz
parent
bc70ca1ed0
commit
23a6b23314
@ -13,24 +13,24 @@
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
|
||||
namespace app\adminapi\controller\project;
|
||||
namespace app\adminapi\controller\project;
|
||||
|
||||
|
||||
use app\adminapi\controller\BaseAdminController;
|
||||
use app\adminapi\lists\project\ProjectTotalBudgetLists;
|
||||
use app\adminapi\logic\project\ProjectTotalBudgetLogic;
|
||||
use app\adminapi\validate\project\ProjectTotalBudgetValidate;
|
||||
use app\common\model\oa\Flow;
|
||||
use app\common\model\oa\FlowType;
|
||||
use app\adminapi\controller\BaseAdminController;
|
||||
use app\adminapi\lists\project\ProjectTotalBudgetLists;
|
||||
use app\adminapi\logic\project\ProjectTotalBudgetLogic;
|
||||
use app\adminapi\validate\project\ProjectTotalBudgetValidate;
|
||||
use app\common\model\oa\Flow;
|
||||
use app\common\model\oa\FlowType;
|
||||
|
||||
|
||||
/**
|
||||
/**
|
||||
* 项目总预算控制器
|
||||
* Class ProjectTotalBudgetController
|
||||
* @package app\adminapi\controller\project
|
||||
*/
|
||||
class ProjectTotalBudgetController extends BaseAdminController
|
||||
{
|
||||
class ProjectTotalBudgetController extends BaseAdminController
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
@ -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);
|
||||
}
|
||||
@ -108,16 +108,16 @@ class ProjectTotalBudgetController extends BaseAdminController
|
||||
|
||||
public function flows(): \think\response\Json
|
||||
{
|
||||
$flow_type = FlowType::where('type',4)->where('name','xmzys')->findOrEmpty();
|
||||
$data = Flow::field('id,name')->where('flow_cate',$flow_type['id'])->where('status',2)->select();
|
||||
return $this->success('请求成功',$data->toArray());
|
||||
$flow_type = FlowType::where('type', 4)->where('name', 'xmzys')->findOrEmpty();
|
||||
$data = Flow::field('id,name')->where('flow_cate', $flow_type['id'])->where('status', 2)->select();
|
||||
return $this->success('请求成功', $data->toArray());
|
||||
}
|
||||
|
||||
//添加审批
|
||||
public function approve(): \think\response\Json
|
||||
{
|
||||
$params = (new ProjectTotalBudgetValidate())->post()->goCheck('approve');
|
||||
$result = ProjectTotalBudgetLogic::approve($params,$this->adminId);
|
||||
$result = ProjectTotalBudgetLogic::approve($params, $this->adminId);
|
||||
if (true === $result) {
|
||||
return $this->success('提交审核信息成功', [], 1, 1);
|
||||
}
|
||||
@ -125,4 +125,4 @@ class ProjectTotalBudgetController extends BaseAdminController
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -12,25 +12,25 @@
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\adminapi\logic\project;
|
||||
namespace app\adminapi\logic\project;
|
||||
|
||||
|
||||
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;
|
||||
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 think\facade\Db;
|
||||
|
||||
|
||||
/**
|
||||
/**
|
||||
* 项目总预算逻辑
|
||||
* Class ProjectTotalBudgetLogic
|
||||
* @package app\adminapi\logic\project
|
||||
*/
|
||||
class ProjectTotalBudgetLogic extends BaseLogic
|
||||
{
|
||||
class ProjectTotalBudgetLogic extends BaseLogic
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
@ -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,11 +56,11 @@ 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'],
|
||||
]);
|
||||
Project::where('id',$params['project_id'])->update([
|
||||
Project::where('id', $params['project_id'])->update([
|
||||
'is_budget' => 1,
|
||||
'update_time' => time(),
|
||||
]);
|
||||
@ -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,11 +130,10 @@ 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']);
|
||||
$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();
|
||||
$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();
|
||||
$data['org_name'] = $org['name'];
|
||||
$data['dept_name'] = $dept['name'];
|
||||
$data['project_name'] = $project['name'];
|
||||
@ -146,24 +145,25 @@ class ProjectTotalBudgetLogic extends BaseLogic
|
||||
//利润率
|
||||
$data['profit_rate'] = $data['profit'] / $data['contract_amount'];
|
||||
//材料成本占比
|
||||
$data['cl_cost_ratio'] = number_format($data['cl_cost'] / $data['total_cost'],2);
|
||||
$data['cl_cost_ratio'] = number_format($data['cl_cost'] / $data['total_cost'], 2);
|
||||
//分包成本占比
|
||||
$data['fb_cost_ratio'] = number_format($data['fb_cost'] / $data['total_cost'],2);
|
||||
$data['fb_cost_ratio'] = number_format($data['fb_cost'] / $data['total_cost'], 2);
|
||||
//人工成本占比
|
||||
$data['rg_cost_ratio'] = number_format($data['rg_cost'] / $data['total_cost'],2);
|
||||
$data['rg_cost_ratio'] = number_format($data['rg_cost'] / $data['total_cost'], 2);
|
||||
//费用成本占比
|
||||
$data['fy_cost_ratio'] = number_format($data['fy_cost'] / $data['total_cost'],2);
|
||||
$data['fy_cost_ratio'] = number_format($data['fy_cost'] / $data['total_cost'], 2);
|
||||
//机具成本占比
|
||||
$data['jj_cost_ratio'] = number_format($data['jj_cost'] / $data['total_cost'],2);
|
||||
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
|
||||
$data['jj_cost_ratio'] = number_format($data['jj_cost'] / $data['total_cost'], 2);
|
||||
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
|
||||
$data['approve_check_status'] = $approve_data['check_status'];
|
||||
return $data->toArray();
|
||||
}
|
||||
|
||||
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){
|
||||
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) {
|
||||
self::setError('当前内容存在审核信息，请勿重复提交');
|
||||
return false;
|
||||
}
|
||||
@ -177,8 +177,8 @@ class ProjectTotalBudgetLogic extends BaseLogic
|
||||
$params['flow_id'],
|
||||
$admin_id
|
||||
);
|
||||
if($res){
|
||||
ProjectTotalBudget::where('id',$params['id'])->update([
|
||||
if ($res) {
|
||||
ProjectTotalBudget::where('id', $params['id'])->update([
|
||||
'approve_id' => $res,
|
||||
]);
|
||||
}
|
||||
@ -190,4 +190,4 @@ class ProjectTotalBudgetLogic extends BaseLogic
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user