update

2024-02-27 15:59:20 +08:00 · 2024-02-27 15:59:20 +08:00 · b25848903b
commit b25848903b
parent ba9b372500
7 changed files with 95 additions and 95 deletions
--- a/app/adminapi/lists/ProjectCommissionLists.php
+++ b/app/adminapi/lists/ProjectCommissionLists.php
@ -1,77 +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;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\ProjectCommission;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * ProjectCommission列表
- * Class ProjectCommissionLists
- * @package app\adminapi\lists
- */
-class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2024/02/23 09:37
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['num', 'project', 'project_num'],
-        ];
-    }
-
-
-    /**
-     * @notes 获取列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2024/02/23 09:37
-     */
-    public function lists(): array
-    {
-        return ProjectCommission::where($this->searchWhere)
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'head', 'affcontract', 'industry', 'hk', 'rate', 'ticheng', 'paid_amount', 'bczfze', 'djr', 'apptime', 'remark'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-    }
-
-
-    /**
-     * @notes 获取数量
-     * @return int
-     * @author likeadmin
-     * @date 2024/02/23 09:37
-     */
-    public function count(): int
-    {
-        return ProjectCommission::where($this->searchWhere)->count();
-    }
-
+<?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;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\ProjectCommission;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * ProjectCommission列表
+ * Class ProjectCommissionLists
+ * @package app\adminapi\lists
+ */
+class ProjectCommissionLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/23 09:37
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['num', 'project', 'project_num'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/23 09:37
+     */
+    public function lists(): array
+    {
+        return ProjectCommission::where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/23 09:37
+     */
+    public function count(): int
+    {
+        return ProjectCommission::where($this->searchWhere)->count();
+    }
+
 }
--- a/app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php
+++ b/app/adminapi/logic/ApprovalIssuanceAchievementDocumentsLogic.php
@ -43,7 +43,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
            ApprovalIssuanceAchievementDocuments::create([
                'dataid' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'dataid'),
                'num' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'num'),
-                'project_id' => $params['project'],
+                'project_id' => $params['project_id'],
                'task' => $params['task'],
                'processes' => $params['processes'],
                'number' => $params['number'],
@ -77,7 +77,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
        Db::startTrans();
        try {
            ApprovalIssuanceAchievementDocuments::where('id', $params['id'])->update([
-                'project_id' => $params['project'],
+                'project_id' => $params['project_id'],
                'task' => $params['task'],
                'processes' => $params['processes'],
                'number' => $params['number'],
--- a/app/adminapi/logic/DataReceptionLogic.php
+++ b/app/adminapi/logic/DataReceptionLogic.php
@ -41,10 +41,9 @@ class DataReceptionLogic extends BaseLogic
        Db::startTrans();
        try {
            DataReception::create([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
+                'dataid' => generate_sn(DataReception::class, 'dataid'),
+                'num' => generate_sn(DataReception::class, 'num'),
+                'project_id' => $params['project_id'],
                'apptime' => $params['apptime'],
                'person' => $params['person'],
                'number' => $params['number'],
--- a/app/adminapi/logic/ProjectCommissionLogic.php
+++ b/app/adminapi/logic/ProjectCommissionLogic.php
@ -41,11 +41,9 @@ class ProjectCommissionLogic extends BaseLogic
        Db::startTrans();
        try {
            ProjectCommission::create([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
-                'head' => $params['head'],
+                'dataid' => generate_sn(ProjectCommission::class,'dataid'),
+                'num' => generate_sn(ProjectCommission::class,'num'),
+                'project_id' => $params['project_id'],
                'affcontract' => $params['affcontract'],
                'industry' => $params['industry'],
                'hk' => $params['hk'],
@ -80,11 +78,7 @@ class ProjectCommissionLogic extends BaseLogic
        Db::startTrans();
        try {
            ProjectCommission::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
-                'head' => $params['head'],
+                'project_id' => $params['project_id'],
                'affcontract' => $params['affcontract'],
                'industry' => $params['industry'],
                'hk' => $params['hk'],
--- a/app/adminapi/logic/task/TaskTypeLogic.php
+++ b/app/adminapi/logic/task/TaskTypeLogic.php
@ -41,7 +41,7 @@ class TaskTypeLogic extends BaseLogic
        Db::startTrans();
        try {
            TaskType::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(TaskType::class, 'dataid'),
                'cost_project_id' => $params['cost_project_id'],
                'num' => $params['num'],
                'name' => $params['name'],
--- a/app/common/model/ProjectCommission.php
+++ b/app/common/model/ProjectCommission.php
@ -16,6 +16,7 @@ namespace app\common\model;


 use app\common\model\BaseModel;
+use app\common\model\cost_project\CostProject;
 use think\model\concern\SoftDelete;


@ -30,5 +31,8 @@ class ProjectCommission extends BaseModel
    protected $name = 'project_commission';
    protected $deleteTime = 'delete_time';

-    
+    public function projectInfo()
+    {
+        return $this->hasOne(CostProject::class, 'id', 'project_id');
+    }
 }
--- a/app/common/model/ProjectCommissionDetail.php
+++ b/app/common/model/ProjectCommissionDetail.php
@ -30,5 +30,8 @@ class ProjectCommissionDetail extends BaseModel
    protected $name = 'project_commission_detail';
    protected $deleteTime = 'delete_time';

-    
+    public function projectCommission()
+    {
+        return $this->belongsTo(ProjectCommission::class, 'project_commission_id', 'id');
+    }
 }