From 1c9f579796c1c0678cb39346ec68363aafde2fac Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Tue, 26 Dec 2023 15:34:56 +0800
Subject: [PATCH 1/3] ProjectAttendanceDetail&&ProjectAttendanceRecord
---
.../ProjectAttendanceDetailController.php | 108 ++++++++
.../ProjectAttendanceRecordController.php | 108 ++++++++
.../project/ProjectAttendanceDetailLists.php | 77 ++++++
.../project/ProjectAttendanceRecordLists.php | 91 +++++++
.../project/ProjectAttendanceDetailLogic.php | 124 +++++++++
.../project/ProjectAttendanceRecordLogic.php | 179 +++++++++++++
.../ProjectAttendanceDetailValidate.php | 162 ++++++++++++
.../ProjectAttendanceRecordValidate.php | 245 ++++++++++++++++++
.../model/project/ProjectAttendanceDetail.php | 42 +++
.../model/project/ProjectAttendanceRecord.php | 41 +++
10 files changed, 1177 insertions(+)
create mode 100644 app/adminapi/controller/project/ProjectAttendanceDetailController.php
create mode 100644 app/adminapi/controller/project/ProjectAttendanceRecordController.php
create mode 100644 app/adminapi/lists/project/ProjectAttendanceDetailLists.php
create mode 100644 app/adminapi/lists/project/ProjectAttendanceRecordLists.php
create mode 100644 app/adminapi/logic/project/ProjectAttendanceDetailLogic.php
create mode 100644 app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
create mode 100644 app/adminapi/validate/project/ProjectAttendanceDetailValidate.php
create mode 100644 app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
create mode 100644 app/common/model/project/ProjectAttendanceDetail.php
create mode 100644 app/common/model/project/ProjectAttendanceRecord.php
diff --git a/app/adminapi/controller/project/ProjectAttendanceDetailController.php b/app/adminapi/controller/project/ProjectAttendanceDetailController.php
new file mode 100644
index 000000000..7eccf038d
--- /dev/null
+++ b/app/adminapi/controller/project/ProjectAttendanceDetailController.php
@@ -0,0 +1,108 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\adminapi\controller\project;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\project\ProjectAttendanceDetailLists;
+use app\adminapi\logic\project\ProjectAttendanceDetailLogic;
+use app\adminapi\validate\project\ProjectAttendanceDetailValidate;
+
+
+/**
+ * 考勤明细控制器
+ * Class ProjectAttendanceDetailController
+ * @package app\adminapi\controller\project
+ */
+class ProjectAttendanceDetailController extends BaseAdminController
+{
+
+
+ /**
+ * @notes 获取考勤明细列表
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function lists()
+ {
+ return $this->dataLists(new ProjectAttendanceDetailLists());
+ }
+
+
+ /**
+ * @notes 添加考勤明细
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function add()
+ {
+ $params = (new ProjectAttendanceDetailValidate())->post()->goCheck('add');
+ $result = ProjectAttendanceDetailLogic::add($params);
+ if (true === $result) {
+ return $this->success('添加成功', [], 1, 1);
+ }
+ return $this->fail(ProjectAttendanceDetailLogic::getError());
+ }
+
+
+ /**
+ * @notes 编辑考勤明细
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function edit()
+ {
+ $params = (new ProjectAttendanceDetailValidate())->post()->goCheck('edit');
+ $result = ProjectAttendanceDetailLogic::edit($params);
+ if (true === $result) {
+ return $this->success('编辑成功', [], 1, 1);
+ }
+ return $this->fail(ProjectAttendanceDetailLogic::getError());
+ }
+
+
+ /**
+ * @notes 删除考勤明细
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function delete()
+ {
+ $params = (new ProjectAttendanceDetailValidate())->post()->goCheck('delete');
+ ProjectAttendanceDetailLogic::delete($params);
+ return $this->success('删除成功', [], 1, 1);
+ }
+
+
+ /**
+ * @notes 获取考勤明细详情
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function detail()
+ {
+ $params = (new ProjectAttendanceDetailValidate())->goCheck('detail');
+ $result = ProjectAttendanceDetailLogic::detail($params);
+ return $this->data($result);
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/adminapi/controller/project/ProjectAttendanceRecordController.php b/app/adminapi/controller/project/ProjectAttendanceRecordController.php
new file mode 100644
index 000000000..93dd769b2
--- /dev/null
+++ b/app/adminapi/controller/project/ProjectAttendanceRecordController.php
@@ -0,0 +1,108 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\adminapi\controller\project;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\project\ProjectAttendanceRecordLists;
+use app\adminapi\logic\project\ProjectAttendanceRecordLogic;
+use app\adminapi\validate\project\ProjectAttendanceRecordValidate;
+
+
+/**
+ * 考勤记录控制器
+ * Class ProjectAttendanceRecordController
+ * @package app\adminapi\controller\project
+ */
+class ProjectAttendanceRecordController extends BaseAdminController
+{
+
+
+ /**
+ * @notes 获取考勤记录列表
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function lists()
+ {
+ return $this->dataLists(new ProjectAttendanceRecordLists());
+ }
+
+
+ /**
+ * @notes 添加考勤记录
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function add()
+ {
+ $params = (new ProjectAttendanceRecordValidate())->post()->goCheck('add');
+ $result = ProjectAttendanceRecordLogic::add($params,$this->adminId);
+ if (true === $result) {
+ return $this->success('添加成功', [], 1, 1);
+ }
+ return $this->fail(ProjectAttendanceRecordLogic::getError());
+ }
+
+
+ /**
+ * @notes 编辑考勤记录
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function edit()
+ {
+ $params = (new ProjectAttendanceRecordValidate())->post()->goCheck('edit');
+ $result = ProjectAttendanceRecordLogic::edit($params);
+ if (true === $result) {
+ return $this->success('编辑成功', [], 1, 1);
+ }
+ return $this->fail(ProjectAttendanceRecordLogic::getError());
+ }
+
+
+ /**
+ * @notes 删除考勤记录
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function delete()
+ {
+ $params = (new ProjectAttendanceRecordValidate())->post()->goCheck('delete');
+ $res = ProjectAttendanceRecordLogic::delete($params);
+ return $res ? $this->success('删除成功', [], 1, 1) : $this->fail(ProjectAttendanceRecordLogic::getError());
+ }
+
+
+ /**
+ * @notes 获取考勤记录详情
+ * @return \think\response\Json
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function detail()
+ {
+ $params = (new ProjectAttendanceRecordValidate())->goCheck('detail');
+ $result = ProjectAttendanceRecordLogic::detail($params);
+ return $this->data($result);
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/adminapi/lists/project/ProjectAttendanceDetailLists.php b/app/adminapi/lists/project/ProjectAttendanceDetailLists.php
new file mode 100644
index 000000000..64b5da9c6
--- /dev/null
+++ b/app/adminapi/lists/project/ProjectAttendanceDetailLists.php
@@ -0,0 +1,77 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\project;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project\ProjectAttendanceDetail;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 考勤明细列表
+ * Class ProjectAttendanceDetailLists
+ * @package app\adminapi\listsproject
+ */
+class ProjectAttendanceDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+ /**
+ * @notes 设置搜索条件
+ * @return \string[][]
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function setSearch(): array
+ {
+ return [
+
+ ];
+ }
+
+
+ /**
+ * @notes 获取考勤明细列表
+ * @return array
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function lists(): array
+ {
+ return ProjectAttendanceDetail::where($this->searchWhere)
+ ->field(['id', 'attendance_id', 'project_id', 'person_id', 'work_start_time', 'work_end_time', 'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income', 'remark'])
+ ->limit($this->limitOffset, $this->limitLength)
+ ->order(['id' => 'desc'])
+ ->select()
+ ->toArray();
+ }
+
+
+ /**
+ * @notes 获取考勤明细数量
+ * @return int
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function count(): int
+ {
+ return ProjectAttendanceDetail::where($this->searchWhere)->count();
+ }
+
+}
\ No newline at end of file
diff --git a/app/adminapi/lists/project/ProjectAttendanceRecordLists.php b/app/adminapi/lists/project/ProjectAttendanceRecordLists.php
new file mode 100644
index 000000000..28eb1ae97
--- /dev/null
+++ b/app/adminapi/lists/project/ProjectAttendanceRecordLists.php
@@ -0,0 +1,91 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\project;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project\Project;
+use app\common\model\project\ProjectAttendanceDetail;
+use app\common\model\project\ProjectAttendanceRecord;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 考勤记录列表
+ * Class ProjectAttendanceRecordLists
+ * @package app\adminapi\listsproject
+ */
+class ProjectAttendanceRecordLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+ /**
+ * @notes 设置搜索条件
+ * @return \string[][]
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function setSearch(): array
+ {
+ return [
+ '=' => ['attendance_date'],
+ ];
+ }
+
+
+ /**
+ * @notes 获取考勤记录列表
+ * @return array
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function lists(): array
+ {
+ return ProjectAttendanceRecord::where($this->searchWhere)
+ ->field(['id','attendance_code','project_id', 'attendance_date','remark', 'file'])
+ ->limit($this->limitOffset, $this->limitLength)
+ ->order(['id' => 'desc'])
+ ->select()->each(function($item){
+ //'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income',
+ $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty();
+ $item['project_name'] = $project['name'];
+ $item['project_code'] = $project['project_code'];
+ $item['work_record_num_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('work_record_num');
+ $item['daily_salary_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('daily_salary');
+ $item['daily_living_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('daily_living');
+ $item['daily_subsidy_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('daily_subsidy');
+ $item['daily_other_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('daily_other');
+ $item['daily_income_total'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$item['id'])->sum('daily_income');
+ return $item;
+ })
+ ->toArray();
+ }
+
+
+ /**
+ * @notes 获取考勤记录数量
+ * @return int
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function count(): int
+ {
+ return ProjectAttendanceRecord::where($this->searchWhere)->count();
+ }
+
+}
\ No newline at end of file
diff --git a/app/adminapi/logic/project/ProjectAttendanceDetailLogic.php b/app/adminapi/logic/project/ProjectAttendanceDetailLogic.php
new file mode 100644
index 000000000..6415c997c
--- /dev/null
+++ b/app/adminapi/logic/project/ProjectAttendanceDetailLogic.php
@@ -0,0 +1,124 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\logic\project;
+
+
+use app\common\model\project\ProjectAttendanceDetail;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * 考勤明细逻辑
+ * Class ProjectAttendanceDetailLogic
+ * @package app\adminapi\logic\project
+ */
+class ProjectAttendanceDetailLogic extends BaseLogic
+{
+
+
+ /**
+ * @notes 添加考勤明细
+ * @param array $params
+ * @return bool
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public static function add(array $params): bool
+ {
+ Db::startTrans();
+ try {
+ ProjectAttendanceDetail::create([
+ 'project_id' => $params['project_id'],
+ 'person_id' => $params['person_id'],
+ 'attendance_date' => strtotime($params['attendance_date']),
+ 'work_start_time' => strtotime($params['work_start_time']),
+ 'work_end_time' => strtotime($params['work_end_time']),
+ 'work_record_num' => $params['work_record_num'],
+ 'daily_salary' => $params['daily_salary'],
+ 'daily_living' => $params['daily_living'],
+ 'daily_subsidy' => $params['daily_subsidy'],
+ 'daily_other' => $params['daily_other'],
+ 'daily_income' => $params['daily_income'],
+ 'remark' => $params['remark'],
+ ]);
+ 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/26 10:54
+ */
+ public static function edit(array $params): bool
+ {
+ Db::startTrans();
+ try {
+ ProjectAttendanceDetail::where('id', $params['id'])->update([
+ 'attendance_date' => strtotime($params['attendance_date']),
+ 'work_start_time' => strtotime($params['work_start_time']),
+ 'work_end_time' => strtotime($params['work_end_time']),
+ 'work_record_num' => $params['work_record_num'],
+ 'daily_salary' => $params['daily_salary'],
+ 'daily_living' => $params['daily_living'],
+ 'daily_subsidy' => $params['daily_subsidy'],
+ 'daily_other' => $params['daily_other'],
+ 'daily_income' => $params['daily_income'],
+ 'remark' => $params['remark'],
+ ]);
+ 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/26 10:54
+ */
+ public static function delete(array $params): bool
+ {
+ return ProjectAttendanceDetail::destroy($params['id']);
+ }
+
+
+ /**
+ * @notes 获取考勤明细详情
+ * @param $params
+ * @return array
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public static function detail($params): array
+ {
+ return ProjectAttendanceDetail::findOrEmpty($params['id'])->toArray();
+ }
+}
\ No newline at end of file
diff --git a/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
new file mode 100644
index 000000000..801683a99
--- /dev/null
+++ b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
@@ -0,0 +1,179 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\logic\project;
+
+
+use app\common\model\process_approval\ProcessApproval;
+use app\common\model\process_approval\ProcessApprovalLogs;
+use app\common\model\project\Project;
+use app\common\model\project\ProjectAttendanceDetail;
+use app\common\model\project\ProjectAttendanceRecord;
+use app\common\logic\BaseLogic;
+use app\common\model\project\ProjectPersonnel;
+use think\facade\Db;
+
+
+/**
+ * 考勤记录逻辑
+ * Class ProjectAttendanceRecordLogic
+ * @package app\adminapi\logic\project
+ */
+class ProjectAttendanceRecordLogic extends BaseLogic
+{
+
+
+ /**
+ * @notes 添加考勤记录
+ * @param array $params
+ * @return bool
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public static function add(array $params,$admin_id): bool
+ {
+ Db::startTrans();
+ try {
+ $attendance_detail = json_decode($params['attendance_detail'],true);
+ $process_approval_data = json_decode($params['process_approval'],true);
+ $attendance_code = process_code('项目考勤记录');
+ $ProjectAttendanceRecordRes = ProjectAttendanceRecord::create([
+ 'project_id' => $params['project_id'],
+ 'attendance_code' => $attendance_code,
+ 'attendance_date' => strtotime($params['attendance_date']),
+ 'remark' => $params['remark'],
+ 'file' => !empty($params['file']) ? $params['file'] : null,
+ ]);
+ foreach($attendance_detail as $v){
+ ProjectAttendanceDetail::create([
+ 'attendance_code' => $attendance_code,
+ 'attendance_id' => $ProjectAttendanceRecordRes->id,
+ 'project_id' => $params['project_id'],
+ 'person_id' => $v['person_id'],
+ 'attendance_date' => strtotime($params['attendance_date']),
+ 'work_start_time' => strtotime($v['work_start_time']),
+ 'work_end_time' => strtotime($v['work_end_time']),
+ 'work_record_num' => $v['work_record_num'],
+ 'daily_salary' => $v['daily_salary'],
+ 'daily_living' => $v['daily_living'],
+ 'daily_subsidy' => $v['daily_subsidy'],
+ 'daily_other' => $v['daily_other'],
+ 'daily_income' => $v['daily_income'],
+ 'remark' => $v['work_num']??'',
+ ]);
+ }
+ $processRes = ProcessApproval::create([
+ 'process_code' => $attendance_code,
+ 'current_step' => $process_approval_data['current_step'],
+ 'action' => $process_approval_data['action'],
+ 'submit_step' => $process_approval_data['submit_step'],
+ 'check_user' => $process_approval_data['check_user'],
+ 'check_opinions' => $process_approval_data['check_opinions'] ?? '',
+ 'copy_user' => $process_approval_data['copy_user'] ?? '',
+ 'promoter' => $admin_id,
+ 'schedule' => 0,
+ 'model' => 'ProjectAttendanceRecord',
+ 'data_id' => $ProjectAttendanceRecordRes->id,
+ ]);
+ ProcessApprovalLogs::create([
+ 'process_id' => $processRes->id,
+ 'step' => $process_approval_data['current_step'],
+ 'action' => $process_approval_data['action'],
+ 'create_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/26 09:44
+ */
+ public static function edit(array $params): bool
+ {
+ Db::startTrans();
+ try {
+ ProjectAttendanceRecord::where('id', $params['id'])->update([
+ 'attendance_date' => strtotime($params['attendance_date']),
+ 'remark' => $params['remark'],
+ ]);
+ 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/26 09:44
+ */
+ public static function delete(array $params): bool
+ {
+ Db::startTrans();
+ try {
+ $detailIds = ProjectAttendanceDetail::where('attendance_id',$params['id'])->column('id');
+ ProjectAttendanceDetail::destroy($detailIds);
+ ProjectAttendanceRecord::destroy($params['id']);
+ Db::commit();
+ return true;
+ } catch (\Exception $e) {
+ Db::rollback();
+ self::setError($e->getMessage());
+ return false;
+ }
+ }
+
+
+ /**
+ * @notes 获取考勤记录详情
+ * @param $params
+ * @return array
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public static function detail($params): array
+ {
+ $data = ProjectAttendanceRecord::field(['id','attendance_code','project_id', 'attendance_date','remark', 'file'])->findOrEmpty($params['id'])->toArray();
+ $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
+ $data['project_name'] = $project['name'];
+ $data['project_code'] = $project['project_code'];
+ $data['attendance_num'] = ProjectAttendanceDetail::field('id')->where('attendance_id',$data['id'])->count();
+ $data['attendance_detail'] = ProjectAttendanceDetail::field(['id', 'person_id', 'work_start_time', 'work_end_time', 'work_record_num', 'daily_salary', 'daily_living', 'daily_subsidy', 'daily_other', 'daily_income', 'remark'])->where('attendance_id',$data['id'])
+ ->select()->each(function($item){
+ $person = ProjectPersonnel::field('name,idcard,work_type')->where('id',$item['person_id'])->findOrEmpty();
+ $item['name'] = $person['name'];
+ $item['idcard'] = $person['idcard'];
+ $item['work_type_text'] = $person->work_type_text;
+ return $item;
+ })
+ ->toArray();
+ return $data;
+ }
+}
\ No newline at end of file
diff --git a/app/adminapi/validate/project/ProjectAttendanceDetailValidate.php b/app/adminapi/validate/project/ProjectAttendanceDetailValidate.php
new file mode 100644
index 000000000..eed8cdb13
--- /dev/null
+++ b/app/adminapi/validate/project/ProjectAttendanceDetailValidate.php
@@ -0,0 +1,162 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\project;
+
+
+use app\common\model\project\Project;
+use app\common\model\project\ProjectPersonnel;
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 考勤明细验证器
+ * Class ProjectAttendanceDetailValidate
+ * @package app\adminapi\validate\project
+ */
+class ProjectAttendanceDetailValidate extends BaseValidate
+{
+
+ /**
+ * 设置校验规则
+ * @var string[]
+ */
+ protected $rule = [
+ 'id' => 'require',
+ 'project_id' => 'require|checkProject',
+ 'person_id' => 'require|checkPerson',
+ 'attendance_date' => 'require|dateFormat:Y-m-d',
+ 'work_start_time' => 'checkWorkStartTime',
+ 'work_end_time' => 'checkWorkEndTime',
+ 'work_record_num' => 'require|float|gt:0',
+ 'daily_salary' => 'require|float|gt:0',
+ 'daily_living' => 'require|float|gt:0',
+ 'daily_subsidy' => 'require|float|egt:0',
+ 'daily_other' => 'require|float|egt:0',
+ 'daily_income' => 'require|float|gt:0',
+ ];
+
+ protected $message = [
+ 'id.require' => '缺少必要参数',
+ 'project_id.require' => '请选择项目',
+ 'person_id.require' => '请选择项目人员',
+ 'attendance_date.require' => '请选择考勤日期',
+ 'attendance_date.dateFormat' => '考勤日期格式错误',
+ 'work_record_num.require' => '请填写记工数量',
+ 'work_record_num.float' => '记工数量值必须是数字',
+ 'work_record_num.gt' => '记工数量值必须大于0',
+ 'daily_salary.require' => '请填写日工资',
+ 'daily_salary.float' => '日工资值必须是数字',
+ 'daily_salary.gt' => '日工资值必须大于0',
+ 'daily_living.require' => '请填写日生活费',
+ 'daily_living.float' => '日生活费值必须是数字',
+ 'daily_living.gt' => '日生活费值必须大于0',
+ 'daily_subsidy.require' => '请填写日补贴',
+ 'daily_subsidy.float' => '日补贴值必须是数字',
+ 'daily_subsidy.egt' => '日补贴值必须大于等于0',
+ 'daily_other.require' => '请填写日其它',
+ 'daily_other.float' => '日其它值必须是数字',
+ 'daily_other.egt' => '日其它值必须大于等于0',
+ 'daily_income.require' => '请填写日收入',
+ 'daily_income.float' => '日收入必须是数字',
+ 'daily_income.gt' => '日收入值必须大于0',
+ ];
+
+ /**
+ * @notes 添加场景
+ * @return ProjectAttendanceDetailValidate
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function sceneAdd()
+ {
+ return $this->remove('id',true);
+ }
+
+ /**
+ * @notes 编辑场景
+ * @return ProjectAttendanceDetailValidate
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function sceneEdit()
+ {
+ return $this->only(['id','attendance_date','work_start_time','work_end_time','work_record_num','daily_salary','daily_living','daily_subsidy','daily_other','daily_income']);
+ }
+
+ /**
+ * @notes 删除场景
+ * @return ProjectAttendanceDetailValidate
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function sceneDelete()
+ {
+ return $this->only(['id']);
+ }
+
+
+ /**
+ * @notes 详情场景
+ * @return ProjectAttendanceDetailValidate
+ * @author likeadmin
+ * @date 2023/12/26 10:54
+ */
+ public function sceneDetail()
+ {
+ return $this->only(['id']);
+ }
+
+ public function checkProject($value): bool|string
+ {
+ $data = Project::where('id',$value)->findOrEmpty();
+ if($data->isEmpty()){
+ return '项目不存在';
+ }
+ return true;
+ }
+
+ public function checkPerson($value,$rule,$data): bool|string
+ {
+ $person = ProjectPersonnel::where('id',$value)->findOrEmpty();
+ if($person->isEmpty() || $person['project_id'] != $data['project_id']){
+ return '项目人员不存在';
+ }
+ return true;
+ }
+
+ public function checkWorkStartTime($value): bool|string
+ {
+ if($value != ''){
+ if(date('Y-m-d H:i:s',strtotime($value)) != $value){
+ return '上班时间格式错误';
+ }
+ }
+ return true;
+ }
+
+ public function checkWorkEndTime($value,$rule,$data): bool|string
+ {
+ if($value != ''){
+ if(date('Y-m-d H:i:s',strtotime($value)) != $value){
+ return '下班时间格式错误';
+ }
+ if(strtotime($value) - strtotime($data['work_start_time']) <= 0){
+ return '下班时间不能小于上班时间';
+ }
+ }
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
new file mode 100644
index 000000000..8fd9e5a25
--- /dev/null
+++ b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
@@ -0,0 +1,245 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\project;
+
+
+use app\common\model\auth\Admin;
+use app\common\model\dept\Orgs;
+use app\common\model\dict\DictData;
+use app\common\model\project\Project;
+use app\common\model\project\ProjectPersonnel;
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 考勤记录验证器
+ * Class ProjectAttendanceRecordValidate
+ * @package app\adminapi\validate\project
+ */
+class ProjectAttendanceRecordValidate extends BaseValidate
+{
+
+ /**
+ * 设置校验规则
+ * @var string[]
+ */
+ protected $rule = [
+ 'id' => 'require',
+ 'project_id' => 'require|checkProject',
+ 'attendance_date' => 'require|dateFormat:Y-m-d',
+ 'attendance_detail' => 'require|checkAttendanceDetail',
+ 'process_approval' => 'require|checkProcessApproval',
+ 'file' => 'checkFile',
+ ];
+
+ protected $message = [
+ 'id.require' => '缺少必要参数',
+ 'project_id.require' => '请选择项目',
+ 'attendance_date.require' => '请选择考勤日期',
+ 'attendance_date.dateFormat' => '考勤日期格式错误',
+ 'attendance_detail.require' => '考勤记录清单信息不能为空',
+ 'process_approval.require' => '流程审批信息不能为空',
+ ];
+
+
+
+ /**
+ * @notes 添加场景
+ * @return ProjectAttendanceRecordValidate
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function sceneAdd()
+ {
+ return $this->remove('id',true);
+ }
+
+
+ /**
+ * @notes 编辑场景
+ * @return ProjectAttendanceRecordValidate
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function sceneEdit()
+ {
+ return $this->only(['id','attendance_date']);
+ }
+
+
+ /**
+ * @notes 删除场景
+ * @return ProjectAttendanceRecordValidate
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function sceneDelete()
+ {
+ return $this->only(['id']);
+ }
+
+
+ /**
+ * @notes 详情场景
+ * @return ProjectAttendanceRecordValidate
+ * @author likeadmin
+ * @date 2023/12/26 09:44
+ */
+ public function sceneDetail()
+ {
+ return $this->only(['id']);
+ }
+
+ public function checkProject($value): bool|string
+ {
+ $data = Project::where('id',$value)->findOrEmpty();
+ if($data->isEmpty()){
+ return '项目不存在';
+ }
+ return true;
+ }
+
+ public function checkFile($value): bool|string
+ {
+ if($value != ''){
+ $file = json_decode($value,true);
+ if(empty($file)){
+ return '附件必须是json数组';
+ }
+ }
+ return true;
+ }
+
+ public function checkAttendanceDetail($value,$rule,$data): bool|string
+ {
+ $attendance_detail = json_decode($value,true);
+ if(empty($attendance_detail) || !is_array($attendance_detail)){
+ return '考勤记录清单数据格式错误';
+ }
+ foreach($attendance_detail as $v) {
+ if(empty($v['person_id'])){
+ return '请选择项目人员';
+ }else{
+ $person = ProjectPersonnel::where('id',$v['person_id'])->findOrEmpty();
+ if($person->isEmpty() || $person['project_id'] != $data['project_id']){
+ return '项目人员不存在';
+ }
+ }
+ if(isset($v['work_start_time']) && $v['work_start_time'] != ''){
+ if(date('Y-m-d H:i:s',strtotime($v['work_start_time'])) != $v['work_start_time']){
+ return '上班时间格式错误';
+ }
+ }
+ if(isset($v['work_end_time']) && $v['work_end_time'] != ''){
+ if(date('Y-m-d H:i:s',strtotime($v['work_end_time'])) != $v['work_end_time']){
+ return '下班时间格式错误';
+ }
+ if(strtotime($v['work_end_time']) - strtotime($v['work_start_time']) < 0){
+ return '下班时间不能小于上班时间';
+ }
+ }
+ if(empty($v['work_record_num'])){
+ return '记工数量不能为空';
+ }else{
+ if(!is_numeric($v['work_record_num']) || $v['work_record_num'] < 0){
+ return '记工数量必须是大于0的数字';
+ }
+ }
+ if(empty($v['daily_salary'])){
+ return '日工资不能为空';
+ }else{
+ if(!is_numeric($v['daily_salary']) || $v['daily_salary'] < 0){
+ return '日工资必须是大于0的数字';
+ }
+ }
+ if(empty($v['daily_living'])){
+ return '日生活费不能为空';
+ }else{
+ if(!is_numeric($v['daily_living']) || $v['daily_living'] < 0){
+ return '日生活费必须是大于0的数字';
+ }
+ }
+ if(isset($v['daily_subsidy']) && $v['daily_subsidy'] != ''){
+ if(!is_numeric($v['daily_subsidy']) || $v['daily_subsidy'] < 0){
+ return '日补贴必须是大于等于0的数字';
+ }
+ }
+ if(isset($v['daily_other']) && $v['daily_other'] != ''){
+ if(!is_numeric($v['daily_other']) || $v['daily_other'] < 0){
+ return '日其它必须是大于等于0的数字';
+ }
+ }
+ if(empty($v['daily_income'])){
+ return '日收入不能为空';
+ }else{
+ if(!is_numeric($v['daily_income']) || $v['daily_income'] < 0){
+ return '日收入必须是大于0的数字';
+ }
+ }
+ }
+ return true;
+ }
+
+ public function checkProcessApproval($value): bool|string
+ {
+ $param = json_decode($value,true);
+ if(empty($param)){
+ return '流程审批信息错误';
+ }
+ if(empty($param['current_step'])){
+ return '请选择当前步骤';
+ }else{
+ $curr_steps = DictData::where('type_value','project_person_attendance_approval_process')->column('value');
+ if(!in_array($param['current_step'],$curr_steps)){
+ return '当前步骤无效';
+ }
+ }
+ if(empty($param['action'])){
+ return '请选择处理动作';
+ }else{
+ $action = DictData::where('type_value','approval_process_action')->column('value');
+ if(!in_array($param['action'],$action)){
+ return '处理动作无效';
+ }
+ }
+ if(empty($param['submit_step'])){
+ return '请选择送审步骤';
+ }else{
+ $submit_steps = DictData::where('type_value','project_manager_entrusted_approval_process')->column('value');
+ if(!in_array($param['submit_step'],$submit_steps)){
+ return '送审步骤无效';
+ }
+ }
+ if(empty($param['check_user'])){
+ return '请指定处理人';
+ }else{
+ $data = Admin::where('id',$param['check_user'])->findOrEmpty();
+ if($data->isEmpty()){
+ return '处理人不存在';
+ }
+ }
+ if(isset($param['copy_user']) || $param['copy_user'] != ''){
+ $copy_user_ids = explode(',',$param['copy_user']);
+ foreach ($copy_user_ids as $v) {
+ $data = Admin::where('id',$v)->findOrEmpty();
+ if($data->isEmpty()){
+ return '抄送人不存在';
+ }
+ }
+ }
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/app/common/model/project/ProjectAttendanceDetail.php b/app/common/model/project/ProjectAttendanceDetail.php
new file mode 100644
index 000000000..5672cb08e
--- /dev/null
+++ b/app/common/model/project/ProjectAttendanceDetail.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\project;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 考勤明细模型
+ * Class ProjectAttendanceDetail
+ * @package app\common\model\project
+ */
+class ProjectAttendanceDetail extends BaseModel
+{
+ use SoftDelete;
+ protected $name = 'project_attendance_detail';
+ protected $deleteTime = 'delete_time';
+
+ public function getWorkStartTimeAttr($value): string
+ {
+ return !empty($value) ? date('Y-m-d H:i:s',$value) : '';
+ }
+
+ public function getWorkEndTimeAttr($value): string
+ {
+ return !empty($value) ? date('Y-m-d H:i:s',$value) : '';
+ }
+}
\ No newline at end of file
diff --git a/app/common/model/project/ProjectAttendanceRecord.php b/app/common/model/project/ProjectAttendanceRecord.php
new file mode 100644
index 000000000..44cb8d00b
--- /dev/null
+++ b/app/common/model/project/ProjectAttendanceRecord.php
@@ -0,0 +1,41 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\project;
+
+
+use app\common\model\BaseModel;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 考勤记录模型
+ * Class ProjectAttendanceRecord
+ * @package app\common\model\project
+ */
+class ProjectAttendanceRecord extends BaseModel
+{
+ use SoftDelete;
+ protected $name = 'project_attendance_record';
+ protected $deleteTime = 'delete_time';
+
+ public function getFileAttr($value)
+ {
+ return json_decode($value,true);
+ }
+ public function getAttendanceDateAttr($value): string
+ {
+ return !empty($value) ? date('Y-m-d',$value) : '';
+ }
+}
\ No newline at end of file
From 7ec9cb6ecc7bd459082a0bc3ca1050b6ed652946 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Tue, 26 Dec 2023 15:54:22 +0800
Subject: [PATCH 2/3] fixed
---
.../ProjectAttendanceRecordController.php | 2 +-
.../ProjectManagerAppointmentController.php | 2 +-
.../ProjectManagerAppointmentLists.php | 4 --
.../project/ProjectAttendanceRecordLogic.php | 25 +--------
.../ProjectManagerAppointmentLogic.php | 26 +--------
.../logic/project/ProjectPlanLogic.php | 24 +--------
.../ProjectAttendanceRecordValidate.php | 53 -------------------
.../ProjectManagerAppointmentValidate.php | 52 ------------------
.../validate/project/ProjectPlanValidate.php | 52 ------------------
.../process_approval/ProcessApproval.php | 13 -----
.../process_approval/ProcessApprovalLogs.php | 13 -----
11 files changed, 6 insertions(+), 260 deletions(-)
delete mode 100644 app/common/model/process_approval/ProcessApproval.php
delete mode 100644 app/common/model/process_approval/ProcessApprovalLogs.php
diff --git a/app/adminapi/controller/project/ProjectAttendanceRecordController.php b/app/adminapi/controller/project/ProjectAttendanceRecordController.php
index 93dd769b2..0b8565cb6 100644
--- a/app/adminapi/controller/project/ProjectAttendanceRecordController.php
+++ b/app/adminapi/controller/project/ProjectAttendanceRecordController.php
@@ -52,7 +52,7 @@ class ProjectAttendanceRecordController extends BaseAdminController
public function add()
{
$params = (new ProjectAttendanceRecordValidate())->post()->goCheck('add');
- $result = ProjectAttendanceRecordLogic::add($params,$this->adminId);
+ $result = ProjectAttendanceRecordLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
diff --git a/app/adminapi/controller/project/ProjectManagerAppointmentController.php b/app/adminapi/controller/project/ProjectManagerAppointmentController.php
index 82cad1285..ca08edcbd 100644
--- a/app/adminapi/controller/project/ProjectManagerAppointmentController.php
+++ b/app/adminapi/controller/project/ProjectManagerAppointmentController.php
@@ -52,7 +52,7 @@ class ProjectManagerAppointmentController extends BaseAdminController
public function add()
{
$params = (new ProjectManagerAppointmentValidate())->post()->goCheck('add');
- $result = ProjectManagerAppointmentLogic::add($params,$this->adminId);
+ $result = ProjectManagerAppointmentLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
diff --git a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
index 3fff5b7e5..610e8851e 100644
--- a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
+++ b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
@@ -20,7 +20,6 @@ use app\common\model\auth\Admin;
use app\common\model\contract\Contract;
use app\common\model\custom\Custom;
use app\common\model\dict\DictData;
-use app\common\model\process_approval\ProcessApproval;
use app\common\model\project\Project;
use app\common\model\project\ProjectManagerAppointment;
use app\common\lists\ListsSearchInterface;
@@ -66,15 +65,12 @@ class ProjectManagerAppointmentLists extends BaseAdminDataLists implements Lists
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($item){
- $process = ProcessApproval::field('process_code,submit_step')->where('model','ProjectManagerAppointment')->where('data_id',$item['id'])->findOrEmpty();
$step = DictData::where('type_value','project_manager_entrusted_approval_process')->column('name','value');
$project = Project::field('name,project_code,custom_id')->where('id',$item['project_id'])->findOrEmpty();
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
$contract = Contract::field('contract_code')->where('id',$item['contract_id'])->findOrEmpty();
$projectType = ProjectTypeSet::field('name')->where('id',$item['project_type_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id',$item['project_manager'])->findOrEmpty();
- $item['process_code'] = $process['process_code'];
- $item['process_step'] = $step[$process['submit_step']];
$item['project_name'] = $project['name'];
$item['project_code'] = $project['project_code'];
$item['custom_name'] = $custom['name'];
diff --git a/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
index 801683a99..4b979b6cc 100644
--- a/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
+++ b/app/adminapi/logic/project/ProjectAttendanceRecordLogic.php
@@ -14,9 +14,6 @@
namespace app\adminapi\logic\project;
-
-use app\common\model\process_approval\ProcessApproval;
-use app\common\model\process_approval\ProcessApprovalLogs;
use app\common\model\project\Project;
use app\common\model\project\ProjectAttendanceDetail;
use app\common\model\project\ProjectAttendanceRecord;
@@ -41,12 +38,11 @@ class ProjectAttendanceRecordLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/26 09:44
*/
- public static function add(array $params,$admin_id): bool
+ public static function add(array $params): bool
{
Db::startTrans();
try {
$attendance_detail = json_decode($params['attendance_detail'],true);
- $process_approval_data = json_decode($params['process_approval'],true);
$attendance_code = process_code('项目考勤记录');
$ProjectAttendanceRecordRes = ProjectAttendanceRecord::create([
'project_id' => $params['project_id'],
@@ -73,25 +69,6 @@ class ProjectAttendanceRecordLogic extends BaseLogic
'remark' => $v['work_num']??'',
]);
}
- $processRes = ProcessApproval::create([
- 'process_code' => $attendance_code,
- 'current_step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'submit_step' => $process_approval_data['submit_step'],
- 'check_user' => $process_approval_data['check_user'],
- 'check_opinions' => $process_approval_data['check_opinions'] ?? '',
- 'copy_user' => $process_approval_data['copy_user'] ?? '',
- 'promoter' => $admin_id,
- 'schedule' => 0,
- 'model' => 'ProjectAttendanceRecord',
- 'data_id' => $ProjectAttendanceRecordRes->id,
- ]);
- ProcessApprovalLogs::create([
- 'process_id' => $processRes->id,
- 'step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'create_time' => time()
- ]);
Db::commit();
return true;
} catch (\Exception $e) {
diff --git a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
index bf7c23e50..b6f0de882 100644
--- a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
+++ b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
@@ -18,8 +18,6 @@ namespace app\adminapi\logic\project;
use app\common\model\auth\Admin;
use app\common\model\contract\Contract;
use app\common\model\custom\Custom;
-use app\common\model\process_approval\ProcessApproval;
-use app\common\model\process_approval\ProcessApprovalLogs;
use app\common\model\project\Project;
use app\common\model\project\ProjectManagerAppointment;
use app\common\logic\BaseLogic;
@@ -43,12 +41,11 @@ class ProjectManagerAppointmentLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/15 15:22
*/
- public static function add(array $params,$adminId): bool
+ public static function add(array $params): bool
{
Db::startTrans();
try {
- $process_approval_data = json_decode($params['process_approval'],true);
- $projectRes = ProjectManagerAppointment::create([
+ ProjectManagerAppointment::create([
'org_id' => $params['org_id'],
'dept_id' => $params['dept_id'],
'project_id' => $params['project_id'],
@@ -62,25 +59,6 @@ class ProjectManagerAppointmentLogic extends BaseLogic
'remark' => $params['remark'],
'annex' => !empty($params['annex']) ? $params['annex'] : null,
]);
- $processRes = ProcessApproval::create([
- 'process_code' => process_code('项目经理委任'),
- 'current_step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'submit_step' => $process_approval_data['submit_step'],
- 'check_user' => $process_approval_data['check_user'],
- 'check_opinions' => $process_approval_data['check_opinions'] ?? '',
- 'copy_user' => $process_approval_data['copy_user'] ?? '',
- 'promoter' => $adminId,
- 'schedule' => 0,
- 'model' => 'ProjectManagerAppointment',
- 'data_id' => $projectRes->id,
- ]);
- ProcessApprovalLogs::create([
- 'process_id' => $processRes->id,
- 'step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'create_time' => time()
- ]);
Db::commit();
return true;
} catch (\Exception $e) {
diff --git a/app/adminapi/logic/project/ProjectPlanLogic.php b/app/adminapi/logic/project/ProjectPlanLogic.php
index 834e8e8ef..f9fe4c006 100644
--- a/app/adminapi/logic/project/ProjectPlanLogic.php
+++ b/app/adminapi/logic/project/ProjectPlanLogic.php
@@ -16,8 +16,6 @@ namespace app\adminapi\logic\project;
use app\common\model\auth\Admin;
-use app\common\model\process_approval\ProcessApproval;
-use app\common\model\process_approval\ProcessApprovalLogs;
use app\common\model\project\Project;
use app\common\model\project\ProjectPlan;
use app\common\logic\BaseLogic;
@@ -44,8 +42,7 @@ class ProjectPlanLogic extends BaseLogic
{
Db::startTrans();
try {
- $process_approval_data = json_decode($params['process_approval'],true);
- $projectPlanRes = ProjectPlan::create([
+ ProjectPlan::create([
'org_id' => $params['org_id'],
'dept_id' => $params['dept_id'],
'project_id' => $params['project_id'],
@@ -57,25 +54,6 @@ class ProjectPlanLogic extends BaseLogic
'annex' => !empty($params['annex']) ? $params['annex'] : null,
'add_user' => $adminId,
]);
- $processRes = ProcessApproval::create([
- 'process_code' => process_code('项目计划'),
- 'current_step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'submit_step' => $process_approval_data['submit_step'],
- 'check_user' => $process_approval_data['check_user'],
- 'check_opinions' => $process_approval_data['check_opinions'] ?? '',
- 'copy_user' => $process_approval_data['copy_user'] ?? '',
- 'promoter' => $adminId,
- 'schedule' => 0,
- 'model' => 'ProjectPlan',
- 'data_id' => $projectPlanRes->id,
- ]);
- ProcessApprovalLogs::create([
- 'process_id' => $processRes->id,
- 'step' => $process_approval_data['current_step'],
- 'action' => $process_approval_data['action'],
- 'create_time' => time()
- ]);
Db::commit();
return true;
} catch (\Exception $e) {
diff --git a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
index 8fd9e5a25..9224da02a 100644
--- a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
+++ b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php
@@ -40,7 +40,6 @@ class ProjectAttendanceRecordValidate extends BaseValidate
'project_id' => 'require|checkProject',
'attendance_date' => 'require|dateFormat:Y-m-d',
'attendance_detail' => 'require|checkAttendanceDetail',
- 'process_approval' => 'require|checkProcessApproval',
'file' => 'checkFile',
];
@@ -50,7 +49,6 @@ class ProjectAttendanceRecordValidate extends BaseValidate
'attendance_date.require' => '请选择考勤日期',
'attendance_date.dateFormat' => '考勤日期格式错误',
'attendance_detail.require' => '考勤记录清单信息不能为空',
- 'process_approval.require' => '流程审批信息不能为空',
];
@@ -191,55 +189,4 @@ class ProjectAttendanceRecordValidate extends BaseValidate
}
return true;
}
-
- public function checkProcessApproval($value): bool|string
- {
- $param = json_decode($value,true);
- if(empty($param)){
- return '流程审批信息错误';
- }
- if(empty($param['current_step'])){
- return '请选择当前步骤';
- }else{
- $curr_steps = DictData::where('type_value','project_person_attendance_approval_process')->column('value');
- if(!in_array($param['current_step'],$curr_steps)){
- return '当前步骤无效';
- }
- }
- if(empty($param['action'])){
- return '请选择处理动作';
- }else{
- $action = DictData::where('type_value','approval_process_action')->column('value');
- if(!in_array($param['action'],$action)){
- return '处理动作无效';
- }
- }
- if(empty($param['submit_step'])){
- return '请选择送审步骤';
- }else{
- $submit_steps = DictData::where('type_value','project_manager_entrusted_approval_process')->column('value');
- if(!in_array($param['submit_step'],$submit_steps)){
- return '送审步骤无效';
- }
- }
- if(empty($param['check_user'])){
- return '请指定处理人';
- }else{
- $data = Admin::where('id',$param['check_user'])->findOrEmpty();
- if($data->isEmpty()){
- return '处理人不存在';
- }
- }
- if(isset($param['copy_user']) || $param['copy_user'] != ''){
- $copy_user_ids = explode(',',$param['copy_user']);
- foreach ($copy_user_ids as $v) {
- $data = Admin::where('id',$v)->findOrEmpty();
- if($data->isEmpty()){
- return '抄送人不存在';
- }
- }
- }
- return true;
- }
-
}
\ No newline at end of file
diff --git a/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php
index c3586e774..edd7d970a 100644
--- a/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php
+++ b/app/adminapi/validate/project/ProjectManagerAppointmentValidate.php
@@ -50,7 +50,6 @@ class ProjectManagerAppointmentValidate extends BaseValidate
'project_approval_date' => 'require|date',
'start_date' => 'require|date',
'delivery_date' => 'require|date',
- 'process_approval' => 'require|checkProcessApproval'
];
protected $message = [
@@ -70,7 +69,6 @@ class ProjectManagerAppointmentValidate extends BaseValidate
'start_date.date' => '项目开始日期格式错误',
'delivery_date.require' => '请选择项目交付日期',
'delivery_date.date' => '项目交付日期格式错误',
- 'process_approval.require' => '请填写流程审批信息'
];
@@ -207,54 +205,4 @@ class ProjectManagerAppointmentValidate extends BaseValidate
return true;
}
- public function checkProcessApproval($value): bool|string
- {
- $param = json_decode($value,true);
- if(empty($param)){
- return '流程审批信息错误';
- }
- if(empty($param['current_step'])){
- return '请选择当前步骤';
- }else{
- $curr_steps = DictData::where('type_value','project_manager_entrusted_approval_process')->column('value');
- if(!in_array($param['current_step'],$curr_steps)){
- return '当前步骤无效';
- }
- }
- if(empty($param['action'])){
- return '请选择处理动作';
- }else{
- $action = DictData::where('type_value','approval_process_action')->column('value');
- if(!in_array($param['action'],$action)){
- return '处理动作无效';
- }
- }
- if(empty($param['submit_step'])){
- return '请选择送审步骤';
- }else{
- $submit_steps = DictData::where('type_value','project_manager_entrusted_approval_process')->column('value');
- if(!in_array($param['submit_step'],$submit_steps)){
- return '送审步骤无效';
- }
- }
- if(empty($param['check_user'])){
- return '请指定处理人';
- }else{
- $data = Admin::where('id',$param['check_user'])->findOrEmpty();
- if($data->isEmpty()){
- return '处理人不存在';
- }
- }
- if(isset($param['copy_user']) || $param['copy_user'] != ''){
- $copy_user_ids = explode(',',$param['copy_user']);
- foreach ($copy_user_ids as $v) {
- $data = Admin::where('id',$v)->findOrEmpty();
- if($data->isEmpty()){
- return '抄送人不存在';
- }
- }
- }
- return true;
- }
-
}
\ No newline at end of file
diff --git a/app/adminapi/validate/project/ProjectPlanValidate.php b/app/adminapi/validate/project/ProjectPlanValidate.php
index fbd7cdce1..69b261eed 100644
--- a/app/adminapi/validate/project/ProjectPlanValidate.php
+++ b/app/adminapi/validate/project/ProjectPlanValidate.php
@@ -44,7 +44,6 @@ class ProjectPlanValidate extends BaseValidate
'start_time' => 'require|date',
'deliver_time' => 'require|date',
'declare_time' => 'require|date',
- 'process_approval' => 'require|checkProcessApproval'
];
protected $message = [
@@ -59,7 +58,6 @@ class ProjectPlanValidate extends BaseValidate
'deliver_time.date' => '项目交付日期格式错误',
'declare_time.require' => '请选择填报日期',
'declare_time.date' => '填报日期格式错误',
- 'process_approval.require' => '请填写流程审批信息'
];
@@ -165,54 +163,4 @@ class ProjectPlanValidate extends BaseValidate
return true;
}
- public function checkProcessApproval($value): bool|string
- {
- $param = json_decode($value,true);
- if(empty($param)){
- return '流程审批信息错误';
- }
- if(empty($param['current_step'])){
- return '请选择当前步骤';
- }else{
- $curr_steps = DictData::where('type_value','project_plan_approval_process')->column('value');
- if(!in_array($param['current_step'],$curr_steps)){
- return '当前步骤无效';
- }
- }
- if(empty($param['action'])){
- return '请选择处理动作';
- }else{
- $action = DictData::where('type_value','approval_process_action')->column('value');
- if(!in_array($param['action'],$action)){
- return '处理动作无效';
- }
- }
- if(empty($param['submit_step'])){
- return '请选择送审步骤';
- }else{
- $submit_steps = DictData::where('type_value','project_plan_approval_process')->column('value');
- if(!in_array($param['submit_step'],$submit_steps)){
- return '送审步骤无效';
- }
- }
- if(empty($param['check_user'])){
- return '请指定处理人';
- }else{
- $data = Admin::where('id',$param['check_user'])->findOrEmpty();
- if($data->isEmpty()){
- return '处理人不存在';
- }
- }
- if(isset($param['copy_user']) || $param['copy_user'] != ''){
- $copy_user_ids = explode(',',$param['copy_user']);
- foreach ($copy_user_ids as $v) {
- $data = Admin::where('id',$v)->findOrEmpty();
- if($data->isEmpty()){
- return '抄送人不存在';
- }
- }
- }
- return true;
- }
-
}
\ No newline at end of file
diff --git a/app/common/model/process_approval/ProcessApproval.php b/app/common/model/process_approval/ProcessApproval.php
deleted file mode 100644
index f11aeeb82..000000000
--- a/app/common/model/process_approval/ProcessApproval.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
- namespace app\common\model\process_approval;
-
- use app\common\model\BaseModel;
- use think\model\concern\SoftDelete;
-
- class ProcessApproval extends BaseModel
- {
- use SoftDelete;
- protected $name = 'process_approval';
- protected $deleteTime = 'delete_time';
- }
\ No newline at end of file
diff --git a/app/common/model/process_approval/ProcessApprovalLogs.php b/app/common/model/process_approval/ProcessApprovalLogs.php
deleted file mode 100644
index 3684d5ffe..000000000
--- a/app/common/model/process_approval/ProcessApprovalLogs.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
- namespace app\common\model\process_approval;
-
- use app\common\model\BaseModel;
- use think\model\concern\SoftDelete;
-
- class ProcessApprovalLogs extends BaseModel
- {
- use SoftDelete;
- protected $name = 'process_approval_logs';
- protected $deleteTime = 'delete_time';
- }
\ No newline at end of file
From fc9c8bebc6da7635fa3456096e02d681fa31a6ba Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Tue, 26 Dec 2023 15:57:34 +0800
Subject: [PATCH 3/3] fixed
---
app/adminapi/lists/project/ProjectManagerAppointmentLists.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
index 610e8851e..6421b3086 100644
--- a/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
+++ b/app/adminapi/lists/project/ProjectManagerAppointmentLists.php
@@ -65,7 +65,6 @@ class ProjectManagerAppointmentLists extends BaseAdminDataLists implements Lists
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()->each(function($item){
- $step = DictData::where('type_value','project_manager_entrusted_approval_process')->column('name','value');
$project = Project::field('name,project_code,custom_id')->where('id',$item['project_id'])->findOrEmpty();
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
$contract = Contract::field('contract_code')->where('id',$item['contract_id'])->findOrEmpty();