This commit is contained in:
weiz 2024-03-23 17:01:21 +08:00
parent 7b2c61a989
commit ab2a6931bb
2 changed files with 207 additions and 195 deletions

View File

@ -13,23 +13,23 @@
// +----------------------------------------------------------------------
namespace app\adminapi\controller\project;
namespace app\adminapi\controller\project;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\project\ProjectJobTypeLists;
use app\adminapi\logic\project\ProjectJobTypeLogic;
use app\adminapi\validate\project\ProjectJobTypeValidate;
use app\common\model\project\ProjectJobType;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\project\ProjectJobTypeLists;
use app\adminapi\logic\project\ProjectJobTypeLogic;
use app\adminapi\validate\project\ProjectJobTypeValidate;
use app\common\model\project\ProjectJobType;
/**
/**
* 工种设置控制器
* Class ProjectJobTypeController
* @package app\adminapi\controller\project
*/
class ProjectJobTypeController extends BaseAdminController
{
class ProjectJobTypeController extends BaseAdminController
{
/**
@ -108,8 +108,13 @@ class ProjectJobTypeController extends BaseAdminController
public function all(): \think\response\Json
{
$data = ProjectJobType::field('id,type_name,type_unit_price,per_daily_living')->select()->toArray();
return $this->success('请求成功',$data);
return $this->success('请求成功', $data);
}
public function datas()
{
return $this->data(ProjectJobTypeLogic::datas());
}
}
}

View File

@ -12,21 +12,21 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\project;
namespace app\adminapi\logic\project;
use app\common\model\project\ProjectJobType;
use app\common\logic\BaseLogic;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\project\ProjectJobType;
use think\facade\Db;
/**
/**
* 工种设置逻辑
* Class ProjectJobTypeLogic
* @package app\adminapi\logic\project
*/
class ProjectJobTypeLogic extends BaseLogic
{
class ProjectJobTypeLogic extends BaseLogic
{
/**
@ -103,6 +103,13 @@ class ProjectJobTypeLogic extends BaseLogic
*/
public static function detail($params): array
{
return ProjectJobType::field(['id','type_name','type_unit_price','per_daily_living'])->findOrEmpty($params['id'])->toArray();
return ProjectJobType::field(['id', 'type_name', 'type_unit_price', 'per_daily_living'])->findOrEmpty($params['id'])->toArray();
}
public static function datas()
{
return ProjectJobType::field(['id', 'type_name'])->order(['id' => 'desc'])->select()->each(function ($data) {
$data['projectinfo'] = 'ID' . $data['id'] . ' / 名称:' . $data['type_name'];
})->toArray();
}
}
}