diff --git a/app/adminapi/controller/build/BuildProcessSettingsController.php b/app/adminapi/controller/build/BuildProcessSettingsController.php index 835309998..e62ca2d85 100644 --- a/app/adminapi/controller/build/BuildProcessSettingsController.php +++ b/app/adminapi/controller/build/BuildProcessSettingsController.php @@ -11,123 +11,123 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - - -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; - - -/** - * 施工工序设置控制器 - * Class BuildProcessSettingsController - * @package app\adminapi\controller\build - */ -class BuildProcessSettingsController extends BaseAdminController -{ - - - /** - * @notes 获取施工工序设置列表 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/22 09:51 - */ - public function lists() - { - return $this->dataLists(new BuildProcessSettingsLists()); - } - - - /** - * @notes 添加施工工序设置 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/22 09:51 - */ - public function add() - { - $params = (new BuildProcessSettingsValidate())->post()->goCheck('add'); - $result = BuildProcessSettingsLogic::add($params,$this->adminId); - if (true === $result) { - return $this->success('添加成功', [], 1, 1); - } - return $this->fail(BuildProcessSettingsLogic::getError()); - } - - - /** - * @notes 编辑施工工序设置 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/22 09:51 - */ - public function edit() - { - $params = (new BuildProcessSettingsValidate())->post()->goCheck('edit'); - $result = BuildProcessSettingsLogic::edit($params,$this->adminId); - if (true === $result) { - return $this->success('编辑成功', [], 1, 1); - } - return $this->fail(BuildProcessSettingsLogic::getError()); - } - - - /** - * @notes 删除施工工序设置 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/22 09:51 - */ - public function delete() - { - $params = (new BuildProcessSettingsValidate())->post()->goCheck('delete'); - BuildProcessSettingsLogic::delete($params); - return $this->success('删除成功', [], 1, 1); - } - - - /** - * @notes 获取施工工序设置详情 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/22 09:51 - */ - public function detail() - { - $params = (new BuildProcessSettingsValidate())->goCheck('detail'); - $result = BuildProcessSettingsLogic::detail($params); - return $this->data($result); - } - //获取某个分部工程下的施工工序 - public function listToDivision(): \think\response\Json + + 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; + + + /** + * 施工工序设置控制器 + * Class BuildProcessSettingsController + * @package app\adminapi\controller\build + */ + class BuildProcessSettingsController extends BaseAdminController { - $params = $this->request->get(['division_id','page_size','page_no']); - if(empty($params['division_id'])){ - return $this->fail('参数错误'); + + + /** + * @notes 获取施工工序设置列表 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/22 09:51 + */ + public function lists() + { + return $this->dataLists(new BuildProcessSettingsLists()); } - $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) - ->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(); - $result = [ - 'count' => $count, - 'page_no' => $pageNo, - 'page_size' => $pageSize, - 'lists' => $data - ]; - return $this->success('请求成功',$result); - } - - -} \ No newline at end of file + + + /** + * @notes 添加施工工序设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/22 09:51 + */ + public function add() + { + $params = (new BuildProcessSettingsValidate())->post()->goCheck('add'); + $result = BuildProcessSettingsLogic::add($params, $this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(BuildProcessSettingsLogic::getError()); + } + + + /** + * @notes 编辑施工工序设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/22 09:51 + */ + public function edit() + { + $params = (new BuildProcessSettingsValidate())->post()->goCheck('edit'); + $result = BuildProcessSettingsLogic::edit($params, $this->adminId); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(BuildProcessSettingsLogic::getError()); + } + + + /** + * @notes 删除施工工序设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/22 09:51 + */ + public function delete() + { + $params = (new BuildProcessSettingsValidate())->post()->goCheck('delete'); + BuildProcessSettingsLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取施工工序设置详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/22 09:51 + */ + public function detail() + { + $params = (new BuildProcessSettingsValidate())->goCheck('detail'); + $result = BuildProcessSettingsLogic::detail($params); + return $this->data($result); + } + + //获取某个分部工程下的施工工序 + public function listToDivision(): \think\response\Json + { + $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,annex') + ->where('division_id', $params['division_id']) + ->page($pageNo, $pageSize) + ->order('id desc') + ->select()->toArray(); + $count = BuildProcessSettings::where('division_id', $params['division_id'])->count(); + $result = [ + 'count' => $count, + 'page_no' => $pageNo, + 'page_size' => $pageSize, + 'lists' => $data + ]; + return $this->success('请求成功', $result); + } + + + } \ No newline at end of file diff --git a/app/adminapi/logic/build/BuildDivisionLogic.php b/app/adminapi/logic/build/BuildDivisionLogic.php index 1a5761f2b..f086fbb13 100644 --- a/app/adminapi/logic/build/BuildDivisionLogic.php +++ b/app/adminapi/logic/build/BuildDivisionLogic.php @@ -11,111 +11,111 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -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; - - -/** - * 分部分项划分逻辑 - * Class BuildDivisionLogic - * @package app\adminapi\logic\build - */ -class BuildDivisionLogic extends BaseLogic -{ - - - /** - * @notes 添加分部分项划分 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/22 09:17 - */ - public static function add(array $params,$admin_id): bool - { - Db::startTrans(); - try { - BuildDivision::create([ - 'division_engineering' => $params['division_engineering'], - 'sub_division_engineering' => $params['sub_division_engineering'], - 'subentry_engineering' => $params['subentry_engineering'], - 'subentry_engineering_code' => $params['subentry_engineering_code'], - 'add_user' => $admin_id, - 'update_user' => $admin_id, - ]); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 编辑分部分项划分 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/22 09:17 - */ - public static function edit(array $params,$admin_id): bool - { - Db::startTrans(); - try { - BuildDivision::where('id', $params['id'])->update([ - 'division_engineering' => $params['division_engineering'], - 'sub_division_engineering' => $params['sub_division_engineering'], - 'subentry_engineering' => $params['subentry_engineering'], - 'subentry_engineering_code' => $params['subentry_engineering_code'], - 'update_user' => $admin_id, - '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 2023/12/22 09:17 - */ - public static function delete(array $params): bool - { - return BuildDivision::destroy($params['id']); - } - - - /** - * @notes 获取分部分项划分详情 - * @param $params - * @return array - * @author likeadmin - * @date 2023/12/22 09:17 - */ - 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'); - $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(); - return $data; - } -} \ No newline at end of file + + 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\model\build\BuildProcessSettings; + use think\facade\Db; + + + /** + * 分部分项划分逻辑 + * Class BuildDivisionLogic + * @package app\adminapi\logic\build + */ + class BuildDivisionLogic extends BaseLogic + { + + + /** + * @notes 添加分部分项划分 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/22 09:17 + */ + public static function add(array $params, $admin_id): bool + { + Db::startTrans(); + try { + BuildDivision::create([ + 'division_engineering' => $params['division_engineering'], + 'sub_division_engineering' => $params['sub_division_engineering'], + 'subentry_engineering' => $params['subentry_engineering'], + 'subentry_engineering_code' => $params['subentry_engineering_code'], + 'add_user' => $admin_id, + 'update_user' => $admin_id, + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑分部分项划分 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/22 09:17 + */ + public static function edit(array $params, $admin_id): bool + { + Db::startTrans(); + try { + BuildDivision::where('id', $params['id'])->update([ + 'division_engineering' => $params['division_engineering'], + 'sub_division_engineering' => $params['sub_division_engineering'], + 'subentry_engineering' => $params['subentry_engineering'], + 'subentry_engineering_code' => $params['subentry_engineering_code'], + 'update_user' => $admin_id, + '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 2023/12/22 09:17 + */ + public static function delete(array $params): bool + { + return BuildDivision::destroy($params['id']); + } + + + /** + * @notes 获取分部分项划分详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/22 09:17 + */ + 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'); + $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,annex')->where('division_id', $data['id'])->select(); + return $data; + } + } \ No newline at end of file