From 1aecc6692f8084a92da3106c1b07f78932a5dba9 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 28 Feb 2024 11:21:23 +0800
Subject: [PATCH] update
---
.../ApplyWithSealLists.php | 152 +++++++++---------
.../ApplyWithSealLogic.php | 14 +-
2 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php
index 9283bd8b3..9127491f4 100644
--- a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php
+++ b/app/adminapi/lists/project_process_management/ApplyWithSealLists.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\ApplyWithSeal;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * ApplyWithSeal列表
- * Class ApplyWithSealLists
- * @package app\adminapi\listsproject_process_management
- */
-class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
- /**
- * @notes 设置搜索条件
- * @return \string[][]
- * @author likeadmin
- * @date 2024/02/23 15:05
- */
- public function setSearch(): array
- {
- return [
- '=' => ['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 15:05
- */
- public function lists(): array
- {
- return ApplyWithSeal::where($this->searchWhere)
- ->field(['id', 'dataid', 'num', 'types', 'filetype', 'ridingseam', 'name', 'frequency', 'limit', 'depar', 'stampman', 'project', 'principal', 'content', 'loan', 'borrow', 'returndate', 'applicant', 'date', 'sjborrow', 'sjborrower', 'sjreturn', 'returnee', 'annex'])
- ->limit($this->limitOffset, $this->limitLength)
- ->order(['id' => 'desc'])
- ->select()
- ->toArray();
- }
-
-
- /**
- * @notes 获取数量
- * @return int
- * @author likeadmin
- * @date 2024/02/23 15:05
- */
- public function count(): int
- {
- return ApplyWithSeal::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\ApplyWithSeal;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * ApplyWithSeal列表
+ * Class ApplyWithSealLists
+ * @package app\adminapi\listsproject_process_management
+ */
+class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+ /**
+ * @notes 设置搜索条件
+ * @return \string[][]
+ * @author likeadmin
+ * @date 2024/02/23 15:05
+ */
+ public function setSearch(): array
+ {
+ return [
+ '=' => ['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 15:05
+ */
+ public function lists(): array
+ {
+ return ApplyWithSeal::where($this->searchWhere)
+ ->limit($this->limitOffset, $this->limitLength)
+ ->order(['id' => 'desc'])
+ ->select()
+ ->toArray();
+ }
+
+
+ /**
+ * @notes 获取数量
+ * @return int
+ * @author likeadmin
+ * @date 2024/02/23 15:05
+ */
+ public function count(): int
+ {
+ return ApplyWithSeal::where($this->searchWhere)->count();
+ }
+
}
\ No newline at end of file
diff --git a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php
index ea0b4c85c..4e840a832 100644
--- a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php
+++ b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php
@@ -41,8 +41,8 @@ class ApplyWithSealLogic extends BaseLogic
Db::startTrans();
try {
ApplyWithSeal::create([
- 'dataid' => $params['dataid'],
- 'num' => $params['num'],
+ 'dataid' => generate_sn(ApplyWithSeal::class, 'dataid'),
+ 'num' => generate_sn(ApplyWithSeal::class, 'num'),
'types' => $params['types'],
'filetype' => $params['filetype'],
'ridingseam' => $params['ridingseam'],
@@ -63,7 +63,7 @@ class ApplyWithSealLogic extends BaseLogic
'sjborrower' => $params['sjborrower'],
'sjreturn' => $params['sjreturn'],
'returnee' => $params['returnee'],
- 'annex' => $params['annex'],
+ 'annex' => json_encode($params['annex']),
]);
Db::commit();
@@ -88,8 +88,6 @@ class ApplyWithSealLogic extends BaseLogic
Db::startTrans();
try {
ApplyWithSeal::where('id', $params['id'])->update([
- 'dataid' => $params['dataid'],
- 'num' => $params['num'],
'types' => $params['types'],
'filetype' => $params['filetype'],
'ridingseam' => $params['ridingseam'],
@@ -110,7 +108,7 @@ class ApplyWithSealLogic extends BaseLogic
'sjborrower' => $params['sjborrower'],
'sjreturn' => $params['sjreturn'],
'returnee' => $params['returnee'],
- 'annex' => $params['annex'],
+ 'annex' => json_encode($params['annex'])
]);
Db::commit();
@@ -145,6 +143,8 @@ class ApplyWithSealLogic extends BaseLogic
*/
public static function detail($params): array
{
- return ApplyWithSeal::findOrEmpty($params['id'])->toArray();
+ $data = ApplyWithSeal::findOrEmpty($params['id'])->toArray();
+ $data['annex'] = json_decode($params['annex'], true);
+ return $data;
}
}
\ No newline at end of file