diff --git a/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingController.php b/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingController.php new file mode 100644 index 000000000..85591b329 --- /dev/null +++ b/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingController.php @@ -0,0 +1,111 @@ +dataLists(new SupervisionProjectDataArchivingLists()); + } + + + /** + * @notes 添加工程监理--项目竣工资料归档 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function add() + { + $params = (new SupervisionProjectDataArchivingValidate())->post()->goCheck('add'); + $result = SupervisionProjectDataArchivingLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionProjectDataArchivingLogic::getError()); + } + + + /** + * @notes 编辑工程监理--项目竣工资料归档 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function edit() + { + $params = (new SupervisionProjectDataArchivingValidate())->post()->goCheck('edit'); + $result = SupervisionProjectDataArchivingLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionProjectDataArchivingLogic::getError()); + } + + + /** + * @notes 删除工程监理--项目竣工资料归档 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function delete() + { + $params = (new SupervisionProjectDataArchivingValidate())->post()->goCheck('delete'); + $result = SupervisionProjectDataArchivingLogic::delete($params); + if (true === $result) { + return $this->success('删除成功', [], 1, 1); + } + return $this->fail(SupervisionProjectDataArchivingLogic::getError()); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function detail() + { + $params = (new SupervisionProjectDataArchivingValidate())->goCheck('detail'); + $result = SupervisionProjectDataArchivingLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingDetailController.php b/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingDetailController.php new file mode 100644 index 000000000..2946b7a1b --- /dev/null +++ b/app/adminapi/controller/supervision_ending/SupervisionProjectDataArchivingDetailController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionProjectDataArchivingDetailLists()); + } + + + /** + * @notes 添加工程监理--项目竣工资料归档明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function add() + { + $params = (new SupervisionProjectDataArchivingDetailValidate())->post()->goCheck('add'); + $result = SupervisionProjectDataArchivingDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionProjectDataArchivingDetailLogic::getError()); + } + + + /** + * @notes 编辑工程监理--项目竣工资料归档明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function edit() + { + $params = (new SupervisionProjectDataArchivingDetailValidate())->post()->goCheck('edit'); + $result = SupervisionProjectDataArchivingDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionProjectDataArchivingDetailLogic::getError()); + } + + + /** + * @notes 删除工程监理--项目竣工资料归档明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function delete() + { + $params = (new SupervisionProjectDataArchivingDetailValidate())->post()->goCheck('delete'); + SupervisionProjectDataArchivingDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档明细详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function detail() + { + $params = (new SupervisionProjectDataArchivingDetailValidate())->goCheck('detail'); + $result = SupervisionProjectDataArchivingDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingDetailLists.php b/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingDetailLists.php new file mode 100644 index 000000000..5d7176cb8 --- /dev/null +++ b/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingDetailLists.php @@ -0,0 +1,77 @@ + ['data_archiving_id'], + ]; + } + + + /** + * @notes 获取工程监理--项目竣工资料归档明细列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function lists(): array + { + return SupervisionProjectDataArchivingDetail::where($this->searchWhere) + ->field(['id', 'data_archiving_id', 'data_catalog', 'submit_by_project_dept', 'submit_by_production_dept']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档明细数量 + * @return int + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function count(): int + { + return SupervisionProjectDataArchivingDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingLists.php b/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingLists.php new file mode 100644 index 000000000..5d493f609 --- /dev/null +++ b/app/adminapi/lists/supervision_ending/SupervisionProjectDataArchivingLists.php @@ -0,0 +1,82 @@ + ['project_id'], + '%like%' => ['opinion'], + ]; + } + + + /** + * @notes 获取工程监理--项目竣工资料归档列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function lists(): array + { + return SupervisionProjectDataArchiving::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['project_manager'] = $project['project_manager']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档数量 + * @return int + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function count(): int + { + return SupervisionProjectDataArchiving::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingDetailLogic.php b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingDetailLogic.php new file mode 100644 index 000000000..1f5310bfe --- /dev/null +++ b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingDetailLogic.php @@ -0,0 +1,112 @@ + $params['data_archiving_id'], + 'data_catalog' => $params['data_catalog'], + 'submit_by_project_dept' => $params['submit_by_project_dept'], + 'submit_by_production_dept' => $params['submit_by_production_dept'] + ]); + + 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/05 14:04 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionProjectDataArchivingDetail::where('id', $params['id'])->update([ + 'data_archiving_id' => $params['data_archiving_id'], + 'data_catalog' => $params['data_catalog'], + 'submit_by_project_dept' => $params['submit_by_project_dept'], + 'submit_by_production_dept' => $params['submit_by_production_dept'] + ]); + + 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/05 14:04 + */ + public static function delete(array $params): bool + { + return SupervisionProjectDataArchivingDetail::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档明细详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public static function detail($params): array + { + return SupervisionProjectDataArchivingDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php new file mode 100644 index 000000000..067ef96a9 --- /dev/null +++ b/app/adminapi/logic/supervision_ending/SupervisionProjectDataArchivingLogic.php @@ -0,0 +1,150 @@ + $params['project_id'], + 'opinion' => $params['opinion'], + 'remark' => $params['remark'], + ]); + if(!empty($params['detail'])){ + foreach($params['detail'] as $v){ + SupervisionProjectDataArchivingDetail::create([ + 'data_archiving_id' => $res->id, + 'data_catalog' => $v['data_catalog'], + 'submit_by_project_dept' => $v['submit_by_project_dept'], + 'submit_by_production_dept' => $v['submit_by_production_dept'], + ]); + } + } + 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/05 14:04 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionProjectDataArchiving::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'opinion' => $params['opinion'], + 'remark' => $params['remark'], + 'update_time' => time() + ]); + if(!empty($params['detail'])){ + foreach($params['detail'] as $v){ + if(!empty($v['id'])){ + SupervisionProjectDataArchivingDetail::where('id',$v['id'])->update([ + 'data_archiving_id' => $params['id'], + 'data_catalog' => $v['data_catalog'], + 'submit_by_project_dept' => $v['submit_by_project_dept'], + 'submit_by_production_dept' => $v['submit_by_production_dept'], + 'update_time' => time() + ]); + }else{ + SupervisionProjectDataArchivingDetail::create([ + 'data_archiving_id' => $params['id'], + 'data_catalog' => $v['data_catalog'], + 'submit_by_project_dept' => $v['submit_by_project_dept'], + 'submit_by_production_dept' => $v['submit_by_production_dept'], + ]); + } + } + } + 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/05 14:04 + */ + public static function delete(array $params): bool + { + $detail = SupervisionProjectDataArchivingDetail::where('data_archiving_id',$params['id'])->findOrEmpty(); + if(!$detail->isEmpty()){ + self::setError('当前数据下存在资料归档目录信息,须先删除资料归档目录信息'); + return false; + } + return SupervisionProjectDataArchiving::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--项目竣工资料归档详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public static function detail($params): array + { + $data = SupervisionProjectDataArchiving::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $project = SupervisionProject::field('project_name,project_manager')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['project_manager'] = $project['project_manager']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingDetailValidate.php b/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingDetailValidate.php new file mode 100644 index 000000000..e5e99c33d --- /dev/null +++ b/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingDetailValidate.php @@ -0,0 +1,122 @@ + 'require|checkData', + 'data_archiving_id' => 'require|checkDataArchiving', + 'data_catalog' => 'require', + 'submit_by_project_dept' => 'require', + 'submit_by_production_dept' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'data_archiving_id' => '项目竣工资料归档id', + 'data_catalog' => '监理项目竣工资料归档目录', + 'submit_by_project_dept' => '项目部提交资料(份数)', + 'submit_by_production_dept' => '生产管理部核实情况(份数)', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionProjectDataArchivingDetailValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneAdd() + { + return $this->only(['data_archiving_id','data_catalog','submit_by_project_dept','submit_by_production_dept']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionProjectDataArchivingDetailValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneEdit() + { + return $this->only(['id','data_archiving_id','data_catalog','submit_by_project_dept','submit_by_production_dept']); + } + + + /** + * @notes 删除场景 + * @return SupervisionProjectDataArchivingDetailValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionProjectDataArchivingDetailValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionProjectDataArchivingDetail::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = SupervisionProjectDataArchiving::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目竣工资料归档数据不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingValidate.php b/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingValidate.php new file mode 100644 index 000000000..930fc8623 --- /dev/null +++ b/app/adminapi/validate/supervision_ending/SupervisionProjectDataArchivingValidate.php @@ -0,0 +1,139 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'opinion' => 'require', + 'detail' => 'checkDetail' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'opinion' => '项目总监意见', + 'remark' => '备注', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionProjectDataArchivingValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneAdd() + { + return $this->only(['project_id','opinion','remark','detail']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionProjectDataArchivingValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneEdit() + { + return $this->only(['id','project_id','opinion','remark','detail']); + } + + + /** + * @notes 删除场景 + * @return SupervisionProjectDataArchivingValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionProjectDataArchivingValidate + * @author likeadmin + * @date 2024/03/05 14:04 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionProjectDataArchiving::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = SupervisionProject::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目信息不存在'; + } + return true; + } + + public function checkDetail($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '资料归档目录数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionProjectDataArchivingDetail::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '资料归档目录列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['data_catalog'])) return '资料归档目录列表第'.($k+1).'行监理项目竣工资料归档目录为空'; + if(empty($v['submit_by_project_dept'])) return '资料归档目录列表第'.($k+1).'行项目部提交资料为空'; + if(empty($v['submit_by_production_dept'])) return '资料归档目录列表第'.($k+1).'行生产管理部核实情况为空'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_ending/SupervisionProjectDataArchiving.php b/app/common/model/supervision_ending/SupervisionProjectDataArchiving.php new file mode 100644 index 000000000..5393d56a0 --- /dev/null +++ b/app/common/model/supervision_ending/SupervisionProjectDataArchiving.php @@ -0,0 +1,34 @@ +