update
This commit is contained in:
parent
59239952d1
commit
d7652ed93d
@ -39,6 +39,7 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'=' => ['project', 'project_num'],
|
'=' => ['project', 'project_num'],
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,7 +56,7 @@ class ApprovalIssuanceAchievementDocumentsLists extends BaseAdminDataLists imple
|
|||||||
public function lists(): array
|
public function lists(): array
|
||||||
{
|
{
|
||||||
return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)
|
return ApprovalIssuanceAchievementDocuments::where($this->searchWhere)
|
||||||
->field(['id', 'dataid', 'num', 'project', 'project_num', 'task', 'processes', 'number', 'apptime', 'person', 'tips', 'fd_1', 'fd_2', 'fd_3'])
|
->with(['projectInfo'])
|
||||||
->limit($this->limitOffset, $this->limitLength)
|
->limit($this->limitOffset, $this->limitLength)
|
||||||
->order(['id' => 'desc'])
|
->order(['id' => 'desc'])
|
||||||
->select()
|
->select()
|
||||||
|
@ -41,10 +41,9 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
|
|||||||
Db::startTrans();
|
Db::startTrans();
|
||||||
try {
|
try {
|
||||||
ApprovalIssuanceAchievementDocuments::create([
|
ApprovalIssuanceAchievementDocuments::create([
|
||||||
'dataid' => $params['dataid'],
|
'dataid' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'dataid'),
|
||||||
'num' => $params['num'],
|
'num' => generate_sn(ApprovalIssuanceAchievementDocuments::class, 'num'),
|
||||||
'project' => $params['project'],
|
'project_id' => $params['project'],
|
||||||
'project_num' => $params['project_num'],
|
|
||||||
'task' => $params['task'],
|
'task' => $params['task'],
|
||||||
'processes' => $params['processes'],
|
'processes' => $params['processes'],
|
||||||
'number' => $params['number'],
|
'number' => $params['number'],
|
||||||
@ -78,10 +77,7 @@ class ApprovalIssuanceAchievementDocumentsLogic extends BaseLogic
|
|||||||
Db::startTrans();
|
Db::startTrans();
|
||||||
try {
|
try {
|
||||||
ApprovalIssuanceAchievementDocuments::where('id', $params['id'])->update([
|
ApprovalIssuanceAchievementDocuments::where('id', $params['id'])->update([
|
||||||
'dataid' => $params['dataid'],
|
'project_id' => $params['project'],
|
||||||
'num' => $params['num'],
|
|
||||||
'project' => $params['project'],
|
|
||||||
'project_num' => $params['project_num'],
|
|
||||||
'task' => $params['task'],
|
'task' => $params['task'],
|
||||||
'processes' => $params['processes'],
|
'processes' => $params['processes'],
|
||||||
'number' => $params['number'],
|
'number' => $params['number'],
|
||||||
|
@ -16,6 +16,7 @@ namespace app\common\model;
|
|||||||
|
|
||||||
|
|
||||||
use app\common\model\BaseModel;
|
use app\common\model\BaseModel;
|
||||||
|
use app\common\model\cost_project\CostProject;
|
||||||
use think\model\concern\SoftDelete;
|
use think\model\concern\SoftDelete;
|
||||||
|
|
||||||
|
|
||||||
@ -30,5 +31,8 @@ class ApprovalIssuanceAchievementDocuments extends BaseModel
|
|||||||
protected $name = 'approval_issuance_achievement_documents';
|
protected $name = 'approval_issuance_achievement_documents';
|
||||||
protected $deleteTime = 'delete_time';
|
protected $deleteTime = 'delete_time';
|
||||||
|
|
||||||
|
public function projectInfo()
|
||||||
|
{
|
||||||
|
return $this->hasOne(CostProject::class, 'id', 'project_id');
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user