This commit is contained in:
weiz 2024-03-29 10:54:04 +08:00
parent 28b5823b8e
commit 455b79a6c1
7 changed files with 699 additions and 196 deletions

View File

@ -13,26 +13,26 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\controller\build; namespace app\adminapi\controller\build;
use app\adminapi\controller\BaseAdminController; use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\build\BuildReportLists; use app\adminapi\lists\build\BuildReportLists;
use app\adminapi\logic\build\BuildReportLogic; use app\adminapi\logic\build\BuildReportLogic;
use app\adminapi\validate\build\BuildReportValidate; use app\adminapi\validate\build\BuildReportValidate;
use app\common\model\build\BuildPlan; use app\common\model\build\BuildPlan;
use app\common\model\build\BuildReport; use app\common\model\build\BuildReport;
use app\common\model\build\BuildReportDetail; use app\common\model\build\BuildReportDetail;
use app\common\model\project\ProjectPersonnel; use app\common\model\project\ProjectPersonnel;
/** /**
* 施工汇报控制器 * 施工汇报控制器
* Class BuildReportController * Class BuildReportController
* @package app\adminapi\controller\build * @package app\adminapi\controller\build
*/ */
class BuildReportController extends BaseAdminController class BuildReportController extends BaseAdminController
{ {
/** /**
@ -56,7 +56,7 @@ class BuildReportController extends BaseAdminController
public function add() public function add()
{ {
$params = (new BuildReportValidate())->post()->goCheck('add'); $params = (new BuildReportValidate())->post()->goCheck('add');
$result = BuildReportLogic::add($params,$this->adminId); $result = BuildReportLogic::add($params, $this->adminId);
if (true === $result) { if (true === $result) {
return $this->success('添加成功', [], 1, 1); return $this->success('添加成功', [], 1, 1);
} }
@ -78,37 +78,38 @@ class BuildReportController extends BaseAdminController
public function personDetails(): \think\response\Json public function personDetails(): \think\response\Json
{ {
$params = $this->request->get(['report_id','page_no','page_size']); $params = $this->request->get(['report_id', 'page_no', 'page_size']);
if(empty($params['report_id'])){ if (empty($params['report_id'])) {
return $this->fail('缺少必要参数'); return $this->fail('缺少必要参数');
} }
$pageNo = empty($params['page_no']) ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size']; $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
$reportInfo = BuildReport::field('plan_id')->where('id',$params['report_id'])->findOrEmpty(); $reportInfo = BuildReport::field('plan_id')->where('id', $params['report_id'])->findOrEmpty();
if($reportInfo->isEmpty()){ if ($reportInfo->isEmpty()) {
return $this->fail('施工汇报数据不存在'); return $this->fail('施工汇报数据不存在');
} }
$planInfo = BuildPlan::field('price,unit')->where('id',$reportInfo['plan_id'])->findOrEmpty(); $planInfo = BuildPlan::field('price,unit')->where('id', $reportInfo['plan_id'])->findOrEmpty();
$data = BuildReportDetail::field('person_id,work_num')->where('report_id',$params['report_id']) $data = BuildReportDetail::field('person_id,work_num')->where('report_id', $params['report_id'])
->page($pageNo,$pageSize)->order('id desc') ->page($pageNo, $pageSize)->order('id desc')
->select()->each(function($item)use($planInfo){ ->select()->each(function ($item) use ($planInfo) {
$person = ProjectPersonnel::field('name,idcard,work_type')->where('id',$item['person_id'])->findOrEmpty(); $person = ProjectPersonnel::field('name,idcard,work_type,remark')->where('id', $item['person_id'])->findOrEmpty();
$item['person_name'] = $person['name']; $item['person_name'] = $person['name'];
$item['person_idcard'] = $person['idcard']; $item['person_idcard'] = $person['idcard'];
$item['remark'] = $person['remark'];
$item['person_work_type_text'] = $person->work_type_text; $item['person_work_type_text'] = $person->work_type_text;
$item['price'] = $planInfo['price']; $item['price'] = $planInfo['price'];
$item['unit'] = $planInfo['unit']; $item['unit'] = $planInfo['unit'];
$item['amount'] = $item['price']*$item['work_num']; $item['amount'] = $item['price'] * $item['work_num'];
return $item; return $item;
}) })
->toArray(); ->toArray();
$count = BuildReportDetail::field('id')->where('report_id',$params['report_id'])->count(); $count = BuildReportDetail::field('id')->where('report_id', $params['report_id'])->count();
$result = [ $result = [
'count' => $count, 'count' => $count,
'page_no' => $pageNo, 'page_no' => $pageNo,
'page_size' => $pageSize, 'page_size' => $pageSize,
'lists' => $data 'lists' => $data
]; ];
return $this->success('请求成功',$result); return $this->success('请求成功', $result);
}
} }
}

View File

@ -0,0 +1,108 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\controller\financial;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\financial\FinancialBorrowMoneyLists;
use app\adminapi\logic\financial\FinancialBorrowMoneyLogic;
use app\adminapi\validate\financial\FinancialBorrowMoneyValidate;
/**
* 财务管理--借款单控制器
* Class FinancialBorrowMoneyController
* @package app\adminapi\controller\financial
*/
class FinancialBorrowMoneyController extends BaseAdminController
{
/**
* @notes 获取财务管理--借款单列表
* @return \think\response\Json
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function lists()
{
return $this->dataLists(new FinancialBorrowMoneyLists());
}
/**
* @notes 添加财务管理--借款单
* @return \think\response\Json
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function add()
{
$params = (new FinancialBorrowMoneyValidate())->post()->goCheck('add');
$result = FinancialBorrowMoneyLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
return $this->fail(FinancialBorrowMoneyLogic::getError());
}
/**
* @notes 编辑财务管理--借款单
* @return \think\response\Json
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function edit()
{
$params = (new FinancialBorrowMoneyValidate())->post()->goCheck('edit');
$result = FinancialBorrowMoneyLogic::edit($params);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
return $this->fail(FinancialBorrowMoneyLogic::getError());
}
/**
* @notes 删除财务管理--借款单
* @return \think\response\Json
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function delete()
{
$params = (new FinancialBorrowMoneyValidate())->post()->goCheck('delete');
FinancialBorrowMoneyLogic::delete($params);
return $this->success('删除成功', [], 1, 1);
}
/**
* @notes 获取财务管理--借款单详情
* @return \think\response\Json
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function detail()
{
$params = (new FinancialBorrowMoneyValidate())->goCheck('detail');
$result = FinancialBorrowMoneyLogic::detail($params);
return $this->data($result);
}
}

View File

@ -0,0 +1,84 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\lists\financial;
use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsSearchInterface;
use app\common\model\dept\Dept;
use app\common\model\financial\FinancialBorrowMoney;
/**
* 财务管理--借款单列表
* Class FinancialBorrowMoneyLists
* @package app\adminapi\listsfinancial
*/
class FinancialBorrowMoneyLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function setSearch(): array
{
return [
'=' => ['dept', 'cost_type', 'pay_type'],
'%like%' => ['code', 'create_user'],
];
}
/**
* @notes 获取财务管理--借款单列表
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function lists(): array
{
return FinancialBorrowMoney::where($this->searchWhere)
->field(['id', 'code', 'dept', 'cost_type', 'pay_type', 'amount', 'content', 'create_user', 'create_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function ($data) {
$dept = Dept::field('name')->where('id', $data['dept'])->findOrEmpty();
$data['dept_name'] = $dept['name'];
$data['pay_type_text'] = $data->pay_type_text;
$data['cost_type_text'] = $data->cost_type_text;
})
->toArray();
}
/**
* @notes 获取财务管理--借款单数量
* @return int
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function count(): int
{
return FinancialBorrowMoney::where($this->searchWhere)->count();
}
}

View File

@ -12,28 +12,28 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\build; namespace app\adminapi\logic\build;
use app\common\model\auth\Admin; use app\common\logic\BaseLogic;
use app\common\model\build\BuildDivision; use app\common\model\auth\Admin;
use app\common\model\build\BuildPlan; use app\common\model\build\BuildDivision;
use app\common\model\build\BuildProcessSettings; use app\common\model\build\BuildPlan;
use app\common\model\build\BuildReport; use app\common\model\build\BuildProcessSettings;
use app\common\logic\BaseLogic; use app\common\model\build\BuildReport;
use app\common\model\build\BuildReportDetail; use app\common\model\build\BuildReportDetail;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\project\ProjectMember; use app\common\model\project\ProjectMember;
use think\facade\Db; use think\facade\Db;
/** /**
* 施工汇报逻辑 * 施工汇报逻辑
* Class BuildReportLogic * Class BuildReportLogic
* @package app\adminapi\logic\build * @package app\adminapi\logic\build
*/ */
class BuildReportLogic extends BaseLogic class BuildReportLogic extends BaseLogic
{ {
/** /**
@ -43,11 +43,11 @@ class BuildReportLogic extends BaseLogic
* @author likeadmin * @author likeadmin
* @date 2023/12/22 16:08 * @date 2023/12/22 16:08
*/ */
public static function add(array $params,$admin_id): bool public static function add(array $params, $admin_id): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
$detail =$params['person_detail'];// json_decode($params['person_detail'],true); $detail = $params['person_detail'];// json_decode($params['person_detail'],true);
$reportRes = BuildReport::create([ $reportRes = BuildReport::create([
'report_code' => data_unique_code('施工汇报'), 'report_code' => data_unique_code('施工汇报'),
'plan_id' => $params['plan_id'], 'plan_id' => $params['plan_id'],
@ -57,12 +57,12 @@ class BuildReportLogic extends BaseLogic
'remark' => $params['remark'], 'remark' => $params['remark'],
'add_user' => $admin_id, 'add_user' => $admin_id,
]); ]);
foreach($detail as $v){ foreach ($detail as $v) {
BuildReportDetail::create([ BuildReportDetail::create([
'report_id' => $reportRes->id, 'report_id' => $reportRes->id,
'person_id' => $v['person_id'], 'person_id' => $v['person_id'],
'work_num' => $v['work_num'], 'work_num' => $v['work_num'],
'remark' => $v['remark']??'' 'remark' => $v['remark'] ?? ''
]); ]);
} }
Db::commit(); Db::commit();
@ -84,15 +84,16 @@ class BuildReportLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$data = BuildReport::findOrEmpty($params['id'])->toArray(); $data = BuildReport::findOrEmpty($params['id'])->toArray();
if(empty($data)) return []; if (empty($data)) return [];
$plan = BuildPlan::where('id',$data['plan_id'])->findOrEmpty(); $plan = BuildPlan::where('id', $data['plan_id'])->findOrEmpty();
$project = Project::field('name')->where('id',$plan['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $plan['project_id'])->findOrEmpty();
$process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id',$plan['process_id'])->findOrEmpty(); $process = BuildProcessSettings::field('division_id,process_step_no,process_step,quality_control_points,annex')->where('id', $plan['process_id'])->findOrEmpty();
$division = BuildDivision::field('subentry_engineering')->where('id',$process['division_id'])->findOrEmpty(); $division = BuildDivision::field('subentry_engineering')->where('id', $process['division_id'])->findOrEmpty();
$projectMember = ProjectMember::field('admin_id')->where('id',$plan['project_member_id'])->findOrEmpty(); $projectMember = ProjectMember::field('admin_id')->where('id', $plan['project_member_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id','in',[$projectMember['admin_id'],$data['add_user']])->column('name','id'); $admin = Admin::field('name')->where('id', 'in', [$projectMember['admin_id'], $data['add_user']])->column('name', 'id');
$data['zy_code'] = $plan['zy_code']; $data['zy_code'] = $plan['zy_code'];
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code'];
$data['subentry_engineering'] = $division['subentry_engineering']; $data['subentry_engineering'] = $division['subentry_engineering'];
$data['process_step'] = $process['process_step']; $data['process_step'] = $process['process_step'];
$data['process_step_no'] = $process['process_step_no']; $data['process_step_no'] = $process['process_step_no'];
@ -107,8 +108,8 @@ class BuildReportLogic extends BaseLogic
$data['workload'] = $plan['workload']; $data['workload'] = $plan['workload'];
$data['price'] = $plan['price']; $data['price'] = $plan['price'];
$data['add_user_name'] = $admin[$data['add_user']]; $data['add_user_name'] = $admin[$data['add_user']];
$data['residue_workload'] = ($data['workload'] - $data['report_workload']) <=0 ? 0 : $data['workload'] - $data['report_workload']; $data['residue_workload'] = ($data['workload'] - $data['report_workload']) <= 0 ? 0 : $data['workload'] - $data['report_workload'];
$data['completion_degree'] = round($data['report_workload'] / $data['workload'],3).'%'; $data['completion_degree'] = round($data['report_workload'] / $data['workload'], 3) . '%';
return $data; return $data;
} }
} }

View File

@ -0,0 +1,126 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\financial;
use app\common\logic\BaseLogic;
use app\common\model\dept\Dept;
use app\common\model\financial\FinancialBorrowMoney;
use think\facade\Db;
/**
* 财务管理--借款单逻辑
* Class FinancialBorrowMoneyLogic
* @package app\adminapi\logic\financial
*/
class FinancialBorrowMoneyLogic extends BaseLogic
{
/**
* @notes 添加财务管理--借款单
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/29 10:35
*/
public static function add(array $params): bool
{
Db::startTrans();
try {
FinancialBorrowMoney::create([
'code' => data_unique_code('JKD'),
'dept' => $params['dept'],
'cost_type' => $params['cost_type'],
'pay_type' => $params['pay_type'],
'amount' => $params['amount'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 编辑财务管理--借款单
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/29 10:35
*/
public static function edit(array $params): bool
{
Db::startTrans();
try {
FinancialBorrowMoney::where('id', $params['id'])->update([
'dept' => $params['dept'],
'cost_type' => $params['cost_type'],
'pay_type' => $params['pay_type'],
'amount' => $params['amount'],
'content' => $params['content'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'create_user' => $params['create_user'],
'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),
'update_time' => time()
]);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 删除财务管理--借款单
* @param array $params
* @return bool
* @author likeadmin
* @date 2024/03/29 10:35
*/
public static function delete(array $params): bool
{
return FinancialBorrowMoney::destroy($params['id']);
}
/**
* @notes 获取财务管理--借款单详情
* @param $params
* @return array
* @author likeadmin
* @date 2024/03/29 10:35
*/
public static function detail($params): array
{
$data = FinancialBorrowMoney::withoutField('update_time,delete_time')->findOrEmpty($params['id']);
$dept = Dept::field('name')->where('id', $data['dept'])->findOrEmpty();
$data['dept_name'] = $dept['name'];
$data['pay_type_text'] = $data->pay_type_text;
$data['cost_type_text'] = $data->cost_type_text;
return $data->toArray();
}
}

View File

@ -0,0 +1,137 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\validate\financial;
use app\common\model\dept\Dept;
use app\common\model\dict\DictData;
use app\common\model\financial\FinancialBorrowMoney;
use app\common\validate\BaseValidate;
/**
* 财务管理--借款单验证器
* Class FinancialBorrowMoneyValidate
* @package app\adminapi\validate\financial
*/
class FinancialBorrowMoneyValidate extends BaseValidate
{
/**
* 设置校验规则
* @var string[]
*/
protected $rule = [
'id' => 'require|checkData',
'dept' => 'require|checkDept',
'cost_type' => 'require|checkCostType',
'pay_type' => 'require|checkPayType',
'amount' => 'require|float|ge:0',
'content' => 'require',
'create_user' => 'require',
'create_time' => 'require|dateFormat:Y-m-d H:i:s',
'annex' => 'checkAnnex'
];
/**
* 参数描述
* @var string[]
*/
protected $field = [
'id' => 'id',
'code' => '单据编号',
'dept' => '所在部门',
'cost_type' => '费用类别',
'pay_type' => '支付方式',
'amount' => '金额',
'content' => '事由',
'create_user' => '申请人',
'create_time' => '申请日期',
];
/**
* @notes 添加场景
* @return FinancialBorrowMoneyValidate
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function sceneAdd()
{
return $this->only(['dept', 'cost_type', 'pay_type', 'amount', 'content', 'create_user', 'create_time', 'annex']);
}
/**
* @notes 编辑场景
* @return FinancialBorrowMoneyValidate
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function sceneEdit()
{
return $this->only(['id', 'dept', 'cost_type', 'pay_type', 'amount', 'content', 'create_user', 'create_time', 'annex']);
}
/**
* @notes 删除场景
* @return FinancialBorrowMoneyValidate
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function sceneDelete()
{
return $this->only(['id'])->remove('id', 'checkData');
}
/**
* @notes 详情场景
* @return FinancialBorrowMoneyValidate
* @author likeadmin
* @date 2024/03/29 10:35
*/
public function sceneDetail()
{
return $this->only(['id']);
}
public function checkData($value): bool|string
{
$data = FinancialBorrowMoney::where('id', $value)->findOrEmpty();
return $data->isEmpty() ? '数据不存在' : true;
}
public function checkDept($value): bool|string
{
$data = Dept::where('id', $value)->findOrEmpty();
return $data->isEmpty() ? '审批部门信息不存在' : true;
}
public function checkCostType($value): bool|string
{
$dict = DictData::where('type_value', 'cost_type')->column('value');
return !in_array($value, $dict) ? '费用类别数据值无效' : true;
}
public function checkPayType($value): bool|string
{
$dict = DictData::where('type_value', 'financial_pay_type')->column('value');
return !in_array($value, $dict) ? '支付方式数据值无效' : true;
}
}

View File

@ -0,0 +1,46 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台PHP版
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
// | 开源版本可自由商用可去除界面版权logo
// | gitee下载https://gitee.com/likeshop_gitee/likeadmin
// | github下载https://github.com/likeshop-github/likeadmin
// | 访问官网https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\common\model\financial;
use app\common\model\BaseModel;
use app\common\model\dict\DictData;
use think\model\concern\SoftDelete;
/**
* 财务管理--借款单模型
* Class FinancialBorrowMoney
* @package app\common\model\financial
*/
class FinancialBorrowMoney extends BaseModel
{
use SoftDelete;
protected $name = 'financial_borrow_money';
protected $deleteTime = 'delete_time';
public function getPayTypeTextAttr($value, $data)
{
$dictDate = DictData::where('type_value', 'financial_pay_type')->column('name', 'value');
return $dictDate[$data['pay_type']];
}
public function getCostTypeTextAttr($value, $data)
{
$dictDate = DictData::where('type_value', 'cost_type')->column('name', 'value');
return $dictDate[$data['cost_type']];
}
}