diff --git a/app/adminapi/controller/supervision_work/SupervisionWorkContactController.php b/app/adminapi/controller/supervision_work/SupervisionWorkContactController.php new file mode 100644 index 000000000..f487efe60 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionWorkContactController.php @@ -0,0 +1,111 @@ +dataLists(new SupervisionWorkContactLists()); + } + + + /** + * @notes 添加工程监理--监理工作联系单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function add() + { + $params = (new SupervisionWorkContactValidate())->post()->goCheck('add'); + $result = SupervisionWorkContactLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionWorkContactLogic::getError()); + } + + + /** + * @notes 编辑工程监理--监理工作联系单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function edit() + { + $params = (new SupervisionWorkContactValidate())->post()->goCheck('edit'); + $result = SupervisionWorkContactLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionWorkContactLogic::getError()); + } + + + /** + * @notes 删除工程监理--监理工作联系单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function delete() + { + $params = (new SupervisionWorkContactValidate())->post()->goCheck('delete'); + $result = SupervisionWorkContactLogic::delete($params); + if (true === $result) { + return $this->success('删除成功', [], 1, 1); + } + return $this->fail(SupervisionWorkContactLogic::getError()); + } + + + /** + * @notes 获取工程监理--监理工作联系单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function detail() + { + $params = (new SupervisionWorkContactValidate())->goCheck('detail'); + $result = SupervisionWorkContactLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_work/SupervisionWorkContactProblemController.php b/app/adminapi/controller/supervision_work/SupervisionWorkContactProblemController.php new file mode 100644 index 000000000..c5264aaed --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionWorkContactProblemController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionWorkContactProblemLists()); + } + + + /** + * @notes 添加工程监理--监理工作联系单问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function add() + { + $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('add'); + $result = SupervisionWorkContactProblemLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionWorkContactProblemLogic::getError()); + } + + + /** + * @notes 编辑工程监理--监理工作联系单问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function edit() + { + $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('edit'); + $result = SupervisionWorkContactProblemLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionWorkContactProblemLogic::getError()); + } + + + /** + * @notes 删除工程监理--监理工作联系单问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function delete() + { + $params = (new SupervisionWorkContactProblemValidate())->post()->goCheck('delete'); + SupervisionWorkContactProblemLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--监理工作联系单问题详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function detail() + { + $params = (new SupervisionWorkContactProblemValidate())->goCheck('detail'); + $result = SupervisionWorkContactProblemLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionWorkContactLists.php b/app/adminapi/lists/supervision_work/SupervisionWorkContactLists.php new file mode 100644 index 000000000..fae36a4ec --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionWorkContactLists.php @@ -0,0 +1,82 @@ + ['project_id'], + '%like%' => ['code', 'initiator', 'theme', 'copy_user'], + ]; + } + + + /** + * @notes 获取工程监理--监理工作联系单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function lists(): array + { + return SupervisionWorkContact::where($this->searchWhere) + ->field(['id', 'project_id', 'code', 'initiator', 'initiation_date', 'theme', 'copy_user']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--监理工作联系单数量 + * @return int + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function count(): int + { + return SupervisionWorkContact::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionWorkContactProblemLists.php b/app/adminapi/lists/supervision_work/SupervisionWorkContactProblemLists.php new file mode 100644 index 000000000..f3e035450 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionWorkContactProblemLists.php @@ -0,0 +1,80 @@ + ['work_contact_id'], + ]; + } + + + /** + * @notes 获取工程监理--监理工作联系单问题列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function lists(): array + { + return SupervisionWorkContactProblem::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $work_contact = SupervisionWorkContact::field('code')->where('id',$data['work_contact_id'])->findOrEmpty(); + $data['code'] = $work_contact['code']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--监理工作联系单问题数量 + * @return int + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function count(): int + { + return SupervisionWorkContactProblem::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php b/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php new file mode 100644 index 000000000..ebdf3633b --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionWorkContactLogic.php @@ -0,0 +1,152 @@ + $params['project_id'], + 'code' => data_unique_code('GZLXD'), + 'initiator' => $params['initiator'], + 'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0, + 'theme' => $params['theme'], + 'copy_user' => $params['copy_user'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + ]); + if(!empty($params['problem'])){ + foreach($params['problem'] as $v){ + SupervisionWorkContactProblem::create([ + 'work_contact_id' => $res->id, + 'problem_name' => $v['problem_name'], + 'problem_description' => $v['problem_description'], + ]); + } + } + 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/01 11:01 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionWorkContact::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'initiator' => $params['initiator'], + 'initiation_date' => !empty($params['initiation_date']) ? strtotime($params['initiation_date']) : 0, + 'theme' => $params['theme'], + 'copy_user' => $params['copy_user'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'update_time' => time() + ]); + if(!empty($params['problem'])){ + foreach($params['problem'] as $v){ + if(!empty($v['id'])){ + SupervisionWorkContactProblem::where('id',$v['id'])->update([ + 'work_contact_id' => $params['id'], + 'problem_name' => $v['problem_name'], + 'problem_description' => $v['problem_description'], + ]); + }else{ + SupervisionWorkContactProblem::create([ + 'work_contact_id' => $params['id'], + 'problem_name' => $v['problem_name'], + 'problem_description' => $v['problem_description'], + ]); + } + } + } + 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/01 11:01 + */ + public static function delete(array $params): bool + { + $problem = SupervisionWorkContactProblem::where('work_contact_id',$params['id'])->findOrEmpty(); + if(!$problem->isEmpty()){ + self::setError('该数据下存在通知问题数据,请先删除通知问题数据'); + return false; + } + return SupervisionWorkContact::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--监理工作联系单详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public static function detail($params): array + { + $data = SupervisionWorkContact::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionWorkContactProblemLogic.php b/app/adminapi/logic/supervision_work/SupervisionWorkContactProblemLogic.php new file mode 100644 index 000000000..d0308b3f4 --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionWorkContactProblemLogic.php @@ -0,0 +1,113 @@ + $params['work_contact_id'], + 'problem_name' => $params['problem_name'], + 'problem_description' => $params['problem_description'], + ]); + 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/01 11:01 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionWorkContactProblem::where('id', $params['id'])->update([ + 'work_contact_id' => $params['work_contact_id'], + 'problem_name' => $params['problem_name'], + 'problem_description' => $params['problem_description'], + '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/01 11:01 + */ + public static function delete(array $params): bool + { + return SupervisionWorkContactProblem::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--监理工作联系单问题详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public static function detail($params): array + { + $data = SupervisionWorkContactProblem::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $work_contact = SupervisionWorkContact::field('code')->where('id',$data['work_contact_id'])->findOrEmpty(); + $data['code'] = $work_contact['code']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionWorkContactProblemValidate.php b/app/adminapi/validate/supervision_work/SupervisionWorkContactProblemValidate.php new file mode 100644 index 000000000..068ef0692 --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionWorkContactProblemValidate.php @@ -0,0 +1,120 @@ + 'require|checkData', + 'work_contact_id' => 'require|checkWorkContact', + 'problem_name' => 'require', + 'problem_description' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'work_contact_id' => '监理工作联系单id', + 'problem_name' => '问题名称', + 'problem_description' => '问题说明', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionWorkContactProblemValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneAdd() + { + return $this->only(['work_contact_id','problem_name','problem_description']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionWorkContactProblemValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneEdit() + { + return $this->only(['id','work_contact_id','problem_name','problem_description']); + } + + + /** + * @notes 删除场景 + * @return SupervisionWorkContactProblemValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionWorkContactProblemValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionWorkContactProblem::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkWorkContact($value): bool|string + { + $data = SupervisionWorkContact::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '工作联系单信息不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php b/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php new file mode 100644 index 000000000..2941229ad --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionWorkContactValidate.php @@ -0,0 +1,150 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'initiator' => 'require', + 'initiation_date' => 'require|dateFormat:Y-m-d', + 'theme' => 'require', + 'annex' => 'checkAnnex', + 'problem' => 'checkProblem' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'code' => '联系编号', + 'initiator' => '发起人', + 'initiation_date' => '发起日期', + 'theme' => '主题', + 'copy_user' => '抄送人员', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionWorkContactValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionWorkContactValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionWorkContactValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionWorkContactValidate + * @author likeadmin + * @date 2024/03/01 11:01 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionWorkContact::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 checkAnnex($value): bool|string + { + if(!empty($value) && $value != '' && !is_array($value)){ + return '附件格式错误'; + } + return true; + } + + public function checkProblem($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '工作联系单问题数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionWorkContactProblem::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '工作联系单问题列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['problem_name'])) return '工作联系单问题列表第'.($k+1).'行问题名称为空'; + if(empty($v['problem_description'])) return '工作联系单问题列表第'.($k+1).'行问题说明为空'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionWorkContact.php b/app/common/model/supervision_work/SupervisionWorkContact.php new file mode 100644 index 000000000..d4ca7714c --- /dev/null +++ b/app/common/model/supervision_work/SupervisionWorkContact.php @@ -0,0 +1,42 @@ +