diff --git a/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php b/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php new file mode 100644 index 000000000..87ba2ed3e --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionMeetingMinutesController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionMeetingMinutesLists()); + } + + + /** + * @notes 添加工程监理--会议纪要 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function add() + { + $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('add'); + $result = SupervisionMeetingMinutesLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionMeetingMinutesLogic::getError()); + } + + + /** + * @notes 编辑工程监理--会议纪要 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function edit() + { + $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('edit'); + $result = SupervisionMeetingMinutesLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionMeetingMinutesLogic::getError()); + } + + + /** + * @notes 删除工程监理--会议纪要 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function delete() + { + $params = (new SupervisionMeetingMinutesValidate())->post()->goCheck('delete'); + SupervisionMeetingMinutesLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--会议纪要详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function detail() + { + $params = (new SupervisionMeetingMinutesValidate())->goCheck('detail'); + $result = SupervisionMeetingMinutesLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php b/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php new file mode 100644 index 000000000..c372e0fef --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionMeetingMinutesLists.php @@ -0,0 +1,81 @@ + ['project_id'], + '%like%' => ['theme', 'type', 'emcee', 'recorder'], + ]; + } + + + /** + * @notes 获取工程监理--会议纪要列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function lists(): array + { + return SupervisionMeetingMinutes::withoutField('create_user,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')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--会议纪要数量 + * @return int + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function count(): int + { + return SupervisionMeetingMinutes::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php new file mode 100644 index 000000000..d47ffbfe0 --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionMeetingMinutesLogic.php @@ -0,0 +1,128 @@ + $params['project_id'], + 'theme' => $params['theme'], + 'type' => $params['type'], + 'time' => !empty($params['time']) ? strtotime($params['time']) : 0, + 'emcee' => $params['emcee'], + 'recorder' => $params['recorder'], + 'location' => $params['location'], + 'attendees' => $params['attendees'], + 'content' => $params['content'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_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 2024/03/01 14:31 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionMeetingMinutes::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'theme' => $params['theme'], + 'type' => $params['type'], + 'time' => !empty($params['time']) ? strtotime($params['time']) : 0, + 'emcee' => $params['emcee'], + 'recorder' => $params['recorder'], + 'location' => $params['location'], + 'attendees' => $params['attendees'], + 'content' => $params['content'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + '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 14:31 + */ + public static function delete(array $params): bool + { + return SupervisionMeetingMinutes::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--会议纪要详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public static function detail($params): array + { + $data = SupervisionMeetingMinutes::withoutField('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/validate/supervision_work/SupervisionMeetingMinutesValidate.php b/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php new file mode 100644 index 000000000..f6ebd20c3 --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionMeetingMinutesValidate.php @@ -0,0 +1,134 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'theme' => 'require', + 'time' => 'dateFormat:Y-m-d', + 'annex' => 'checkAnnex', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'theme' => '会议主题', + 'type' => '会议类型', + 'time' => '会议时间', + 'emcee' => '主持人', + 'recorder' => '记录人', + 'location' => '会议地点', + 'attendees' => '与会人员', + 'content' => '会议内容', + 'create_user' => 'create_user', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionMeetingMinutesValidate + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionMeetingMinutesValidate + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionMeetingMinutesValidate + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionMeetingMinutesValidate + * @author likeadmin + * @date 2024/03/01 14:31 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionMeetingMinutes::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; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionDiary.php b/app/common/model/supervision_work/SupervisionDiary.php index 96a44c075..870e42de8 100644 --- a/app/common/model/supervision_work/SupervisionDiary.php +++ b/app/common/model/supervision_work/SupervisionDiary.php @@ -16,7 +16,7 @@ namespace app\common\model\supervision_work; use app\common\model\BaseModel; - +use think\model\concern\SoftDelete; /** @@ -26,8 +26,9 @@ use app\common\model\BaseModel; */ class SupervisionDiary extends BaseModel { - + use SoftDelete; protected $name = 'supervision_diary'; + protected $deleteTime = 'delete_time'; public function getAnnexAttr($value) { diff --git a/app/common/model/supervision_work/SupervisionMeetingMinutes.php b/app/common/model/supervision_work/SupervisionMeetingMinutes.php new file mode 100644 index 000000000..886eef92a --- /dev/null +++ b/app/common/model/supervision_work/SupervisionMeetingMinutes.php @@ -0,0 +1,42 @@ +