From a05482cfda9e23623e594a3829e21e49fb00a47d Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 28 Feb 2024 11:10:18 +0800
Subject: [PATCH] update

---
 .../JianliProjectProgressReportLists.php      | 152 +++++++++---------
 .../JianliProjectProgressReportLogic.php      |  11 +-
 .../JianliProjectProgressReport.php           |   6 +-
 3 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.php b/app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.php
index 18ee5d176..75a6705fb 100644
--- a/app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.php
+++ b/app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.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\project_process_management;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\project_process_management\JianliProjectProgressReport;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * JianliProjectProgressReport列表
- * Class JianliProjectProgressReportLists
- * @package app\adminapi\listsproject_process_management
- */
-class JianliProjectProgressReportLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2024/02/23 11:47
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['num', 'project', 'project_num', 'datas'],

-        ];
-    }
-
-
-    /**
-     * @notes 获取列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2024/02/23 11:47
-     */
-    public function lists(): array
-    {
-        return JianliProjectProgressReport::where($this->searchWhere)
-            ->field(['id', 'dataid', 'num', 'project', 'project_num', 'bm_master', 'wt_unit', 'xm_master', 'start_date', 'end_date', 'duration', 'working_hours', 'done_progress', 'bjd_progress', 'djr', 'apptime', 'jdms'])
-            ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-    }
-
-
-    /**
-     * @notes 获取数量
-     * @return int
-     * @author likeadmin
-     * @date 2024/02/23 11:47
-     */
-    public function count(): int
-    {
-        return JianliProjectProgressReport::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\project_process_management;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project_process_management\JianliProjectProgressReport;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * JianliProjectProgressReport列表
+ * Class JianliProjectProgressReportLists
+ * @package app\adminapi\listsproject_process_management
+ */
+class JianliProjectProgressReportLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/02/23 11:47
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['num', 'project', 'project_num', 'datas'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/02/23 11:47
+     */
+    public function lists(): array
+    {
+        return JianliProjectProgressReport::with(['projectInfo'])->where($this->searchWhere)
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/02/23 11:47
+     */
+    public function count(): int
+    {
+        return JianliProjectProgressReport::where($this->searchWhere)->count();
+    }
+
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php b/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
index ade0dad22..5538d6e1f 100644
--- a/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
+++ b/app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
@@ -41,8 +41,8 @@ class JianliProjectProgressReportLogic extends BaseLogic
         Db::startTrans();
         try {
             JianliProjectProgressReport::create([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
+                'dataid' => generate_sn(JianliProjectProgressReport::class, 'dataid'),
+                'num' => generate_sn(JianliProjectProgressReport::class, 'num'),
                 'project' => $params['project'],
                 'project_num' => $params['project_num'],
                 'bm_master' => $params['bm_master'],
@@ -83,10 +83,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
         Db::startTrans();
         try {
             JianliProjectProgressReport::where('id', $params['id'])->update([
-                'dataid' => $params['dataid'],
-                'num' => $params['num'],
-                'project' => $params['project'],
-                'project_num' => $params['project_num'],
+                'project_id' => $params['project_id'],
                 'bm_master' => $params['bm_master'],
                 'wt_unit' => $params['wt_unit'],
                 'xm_master' => $params['xm_master'],
@@ -135,6 +132,6 @@ class JianliProjectProgressReportLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return JianliProjectProgressReport::findOrEmpty($params['id'])->toArray();
+        return JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/common/model/project_process_management/JianliProjectProgressReport.php b/app/common/model/project_process_management/JianliProjectProgressReport.php
index 39efb8c44..ffea3d46b 100644
--- a/app/common/model/project_process_management/JianliProjectProgressReport.php
+++ b/app/common/model/project_process_management/JianliProjectProgressReport.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 JianliProjectProgressReport extends BaseModel
     protected $name = 'jianli_project_progress_report';
     protected $deleteTime = 'delete_time';
 
-    
+    public function projectInfo()
+    {
+        return $this->hasOne(CostProject::class, 'id', 'project_id');
+    }
 }
\ No newline at end of file