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-27 17:48:16 +08:00
parent 24ca2e343f
commit 6319794258
2 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/adminapi/controller/build/BuildProcessSettingsController.php
View File

@ -13,23 +13,23 @@
// +----------------------------------------------------------------------
namespace app\adminapi\controller\build;
namespace app\adminapi\controller\build;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\build\BuildProcessSettingsLists;
use app\adminapi\logic\build\BuildProcessSettingsLogic;
use app\adminapi\validate\build\BuildProcessSettingsValidate;
use app\common\model\build\BuildProcessSettings;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\build\BuildProcessSettingsLists;
use app\adminapi\logic\build\BuildProcessSettingsLogic;
use app\adminapi\validate\build\BuildProcessSettingsValidate;
use app\common\model\build\BuildProcessSettings;
/**
/**
* 施工工序设置控制器
* Class BuildProcessSettingsController
* @package app\adminapi\controller\build
*/
class BuildProcessSettingsController extends BaseAdminController
{
class BuildProcessSettingsController extends BaseAdminController
{
/**
@ -53,7 +53,7 @@ class BuildProcessSettingsController extends BaseAdminController
public function add()
{
$params = (new BuildProcessSettingsValidate())->post()->goCheck('add');
$result = BuildProcessSettingsLogic::add($params,$this->adminId);
$result = BuildProcessSettingsLogic::add($params, $this->adminId);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -70,7 +70,7 @@ class BuildProcessSettingsController extends BaseAdminController
public function edit()
{
$params = (new BuildProcessSettingsValidate())->post()->goCheck('edit');
$result = BuildProcessSettingsLogic::edit($params,$this->adminId);
$result = BuildProcessSettingsLogic::edit($params, $this->adminId);
if (true === $result) {
return $this->success('编辑成功', [], 1, 1);
}
@ -108,26 +108,26 @@ class BuildProcessSettingsController extends BaseAdminController
//获取某个分部工程下的施工工序
public function listToDivision(): \think\response\Json
{
$params = $this->request->get(['division_id','page_size','page_no']);
if(empty($params['division_id'])){
$params = $this->request->get(['division_id', 'page_size', 'page_no']);
if (empty($params['division_id'])) {
return $this->fail('参数错误');
}
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
$data = BuildProcessSettings::field('id,process_step_no,process_step,quality_control_points,file')
->where('division_id',$params['division_id'])
->page($pageNo,$pageSize)
$data = BuildProcessSettings::field('id,process_step_no,process_step,quality_control_points,annex')
->where('division_id', $params['division_id'])
->page($pageNo, $pageSize)
->order('id desc')
->select()->toArray();
$count = BuildProcessSettings::field('id,process_step_no,process_step,quality_control_points,file')->where('division_id',$params['division_id'])->count();
$count = BuildProcessSettings::where('division_id', $params['division_id'])->count();
$result = [
'count' => $count,
'page_no' => $pageNo,
'page_size' => $pageSize,
'lists' => $data
];
return $this->success('请求成功',$result);
return $this->success('请求成功', $result);
}
}
}

28
app/adminapi/logic/build/BuildDivisionLogic.php
View File

@ -12,23 +12,23 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\build;
namespace app\adminapi\logic\build;
use app\common\model\auth\Admin;
use app\common\model\build\BuildDivision;
use app\common\logic\BaseLogic;
use app\common\model\build\BuildProcessSettings;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\build\BuildDivision;
use app\common\model\build\BuildProcessSettings;
use think\facade\Db;
/**
/**
* 分部分项划分逻辑
* Class BuildDivisionLogic
* @package app\adminapi\logic\build
*/
class BuildDivisionLogic extends BaseLogic
{
class BuildDivisionLogic extends BaseLogic
{
/**
@ -38,7 +38,7 @@ class BuildDivisionLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/22 09:17
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params, $admin_id): bool
{
Db::startTrans();
try {
@ -67,7 +67,7 @@ class BuildDivisionLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/22 09:17
*/
public static function edit(array $params,$admin_id): bool
public static function edit(array $params, $admin_id): bool
{
Db::startTrans();
try {
@ -112,10 +112,10 @@ class BuildDivisionLogic extends BaseLogic
public static function detail($params): array
{
$data = BuildDivision::findOrEmpty($params['id'])->toArray();
$admin = Admin::where('id','in',[$data['add_user'],$data['update_user']])->column('name','id');
$admin = Admin::where('id', 'in', [$data['add_user'], $data['update_user']])->column('name', 'id');
$data['add_user_name'] = $admin[$data['add_user']];
$data['update_user_name'] = $admin[$data['update_user']];
$data['build_process'] = BuildProcessSettings::field('process_step_no,process_step,quality_control_points,file')->where('division_id',$data['id'])->select();
$data['build_process'] = BuildProcessSettings::field('process_step_no,process_step,quality_control_points,annex')->where('division_id', $data['id'])->select();
return $data;
}
}
}