This commit is contained in:
chenbo 2024-02-28 11:12:29 +08:00
parent a05482cfda
commit 2fd360b7e3
3 changed files with 86 additions and 86 deletions

View File

@ -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\ProjectProgressPayment;
use app\common\lists\ListsSearchInterface;
/**
* ProjectProgressPayment列表
* Class ProjectProgressPaymentLists
* @package app\adminapi\listsproject_process_management
*/
class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author likeadmin
* @date 2024/02/23 13:47
*/
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 13:47
*/
public function lists(): array
{
return ProjectProgressPayment::where($this->searchWhere)
->field(['id', 'dataid', 'num', 'project', 'project_num', 'djr', 'djrq', 'sbhj', 'shhj', 'ljhj', 'annex'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
}
/**
* @notes 获取数量
* @return int
* @author likeadmin
* @date 2024/02/23 13:47
*/
public function count(): int
{
return ProjectProgressPayment::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\ProjectProgressPayment;
use app\common\lists\ListsSearchInterface;
/**
* ProjectProgressPayment列表
* Class ProjectProgressPaymentLists
* @package app\adminapi\listsproject_process_management
*/
class ProjectProgressPaymentLists extends BaseAdminDataLists implements ListsSearchInterface
{
/**
* @notes 设置搜索条件
* @return \string[][]
* @author likeadmin
* @date 2024/02/23 13:47
*/
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 13:47
*/
public function lists(): array
{
return ProjectProgressPayment::with(['projectInfo'])->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->toArray();
}
/**
* @notes 获取数量
* @return int
* @author likeadmin
* @date 2024/02/23 13:47
*/
public function count(): int
{
return ProjectProgressPayment::where($this->searchWhere)->count();
}
}

View File

@ -41,10 +41,9 @@ class ProjectProgressPaymentLogic extends BaseLogic
Db::startTrans();
try {
ProjectProgressPayment::create([
'dataid' => $params['dataid'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'dataid' => generate_sn(ProjectProgressPayment::class, 'dataid'),
'num' => generate_sn(ProjectProgressPayment::class, 'num'),
'project_id' => $params['project_id'],
'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'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'project_id' => $params['project_id'],
'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();
}
}

View File

@ -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');
}
}