update

app/adminapi/lists/project_process_management/ProjectProgressPaymentLists.php

@@ -1,77 +1,77 @@
-<?php
+<?php
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
+// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
+// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
+// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
+// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-// | author: likeadminTeam
+// | author: likeadminTeam
-// +----------------------------------------------------------------------
+// +----------------------------------------------------------------------
-
+
-namespace app\adminapi\lists\project_process_management;
+namespace app\adminapi\lists\project_process_management;
-
+
-
+
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\ProjectProgressPayment;
+use app\common\model\project_process_management\ProjectProgressPayment;
-use app\common\lists\ListsSearchInterface;
+use app\common\lists\ListsSearchInterface;
-
+
-
+
-/**
+/**
- * ProjectProgressPayment列表
+ * ProjectProgressPayment列表
- * Class ProjectProgressPaymentLists
+ * Class ProjectProgressPaymentLists
- * @package app\adminapi\listsproject_process_management
+ * @package app\adminapi\listsproject_process_management
- */
+ */
-class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface
+class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface
-{
+{
-
+
-
+
-    /**
+    /**
-     * @notes 设置搜索条件
+     * @notes 设置搜索条件
-     * @return \string[][]
+     * @return \string[][]
-     * @author likeadmin
+     * @author likeadmin
-     * @date 2024/02/23 13:47
+     * @date 2024/02/23 13:47
-     */
+     */
-    public function setSearch(): array
+    public function setSearch(): array
-    {
+    {
-        return [
+        return [
-            '=' => ['num', 'project', 'project_num'],
+            '=' => ['num', 'project', 'project_num'],
-        ];
+
-    }
+        ];
-
+    }
-
+
-    /**
+
-     * @notes 获取列表
+    /**
-     * @return array
+     * @notes 获取列表
-     * @throws \think\db\exception\DataNotFoundException
+     * @return array
-     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DbException
-     * @author likeadmin
+     * @throws \think\db\exception\ModelNotFoundException
-     * @date 2024/02/23 13:47
+     * @author likeadmin
-     */
+     * @date 2024/02/23 13:47
-    public function lists(): array
+     */
-    {
+    public function lists(): array
-        return ProjectProgressPayment::where($this->searchWhere)
+    {
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'djr', 'djrq', 'sbhj', 'shhj', 'ljhj', 'annex'])
+        return ProjectProgressPayment::with(['projectInfo'])->where($this->searchWhere)
-            ->limit($this->limitOffset, $this->limitLength)
+            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
+            ->order(['id' => 'desc'])
-            ->select()
+            ->select()
-            ->toArray();
+            ->toArray();
-    }
+    }
-
+
-
+
-    /**
+    /**
-     * @notes 获取数量
+     * @notes 获取数量
-     * @return int
+     * @return int
-     * @author likeadmin
+     * @author likeadmin
-     * @date 2024/02/23 13:47
+     * @date 2024/02/23 13:47
-     */
+     */
-    public function count(): int
+    public function count(): int
-    {
+    {
-        return ProjectProgressPayment::where($this->searchWhere)->count();
+        return ProjectProgressPayment::where($this->searchWhere)->count();
-    }
+    }
-
+
 }

app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php

@@ -41,10 +41,9 @@ class ProjectProgressPaymentLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectProgressPayment::create([
-                'dataid' => $params['dataid'],
+                'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
-                'num' => $params['num'],
+                'num' => generate_sn(ProjectProgressPayment::class, 'num'),
-                'project' => $params['project'],
+                'project_id' => $params['project_id'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
                 'sbhj' => $params['sbhj'],
@@ -75,10 +74,7 @@ class ProjectProgressPaymentLogic extends BaseLogic
         Db::startTrans();
         try {
             ProjectProgressPayment::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
+                'project_id' => $params['project_id'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
                 'sbhj' => $params['sbhj'],
@@ -119,6 +115,6 @@ class ProjectProgressPaymentLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return ProjectProgressPayment::findOrEmpty($params['id'])->toArray();
+        return ProjectProgressPayment::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
     }
 }

app/common/model/project_process_management/ProjectProgressPayment.php

@@ -16,6 +16,7 @@ namespace app\common\model\project_process_management;
 
 
 use app\common\model\BaseModel;
+use app\common\model\cost_project\CostProject;
 use think\model\concern\SoftDelete;
 
 
@@ -30,5 +31,8 @@ class ProjectProgressPayment extends BaseModel
     protected $name = 'project_progress_payment';
     protected $deleteTime = 'delete_time';
 
-    
+    public function projectInfo()
+    {
+        return $this->hasOne(CostProject::class, 'id', 'project_id');
+    }
 }