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

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

@ -114,12 +114,12 @@ class BuildProcessSettingsController extends BaseAdminController
}
$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')
$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,

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

@ -15,9 +15,9 @@
namespace app\adminapi\logic\build;
use app\common\logic\BaseLogic;
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;
@ -115,7 +115,7 @@ class BuildDivisionLogic extends BaseLogic
$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;
}
}