mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
chenbo 2024-02-28 11:10:18 +08:00
parent fa330ad525
commit a05482cfda
3 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/project_process_management/JianliProjectProgressReportLists.php
View File

@ -39,6 +39,7 @@ class JianliProjectProgressReportLists extends BaseAdminDataLists implements Lis
{ {
return [ return [
'=' => ['num', 'project', 'project_num', 'datas'], '=' => ['num', 'project', 'project_num', 'datas'],
]; ];
} }
@ -54,8 +55,7 @@ class JianliProjectProgressReportLists extends BaseAdminDataLists implements Lis
*/ */
public function lists(): array public function lists(): array
{ {
return JianliProjectProgressReport::where($this->searchWhere) return JianliProjectProgressReport::with(['projectInfo'])->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) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()

11
app/adminapi/logic/project_process_management/JianliProjectProgressReportLogic.php
View File

@ -41,8 +41,8 @@ class JianliProjectProgressReportLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
JianliProjectProgressReport::create([ JianliProjectProgressReport::create([
'dataid' => $params['dataid'], 'dataid' => generate_sn(JianliProjectProgressReport::class, 'dataid'),
'num' => $params['num'], 'num' => generate_sn(JianliProjectProgressReport::class, 'num'),
'project' => $params['project'], 'project' => $params['project'],
'project_num' => $params['project_num'], 'project_num' => $params['project_num'],
'bm_master' => $params['bm_master'], 'bm_master' => $params['bm_master'],
@ -83,10 +83,7 @@ class JianliProjectProgressReportLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
JianliProjectProgressReport::where('id', $params['id'])->update([ JianliProjectProgressReport::where('id', $params['id'])->update([
'dataid' => $params['dataid'], 'project_id' => $params['project_id'],
'num' => $params['num'],
'project' => $params['project'],
'project_num' => $params['project_num'],
'bm_master' => $params['bm_master'], 'bm_master' => $params['bm_master'],
'wt_unit' => $params['wt_unit'], 'wt_unit' => $params['wt_unit'],
'xm_master' => $params['xm_master'], 'xm_master' => $params['xm_master'],
@ -135,6 +132,6 @@ class JianliProjectProgressReportLogic extends BaseLogic
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return JianliProjectProgressReport::findOrEmpty($params['id'])->toArray(); return JianliProjectProgressReport::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
} }
} }

6
app/common/model/project_process_management/JianliProjectProgressReport.php
View File

@ -16,6 +16,7 @@ namespace app\common\model\project_process_management;
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 JianliProjectProgressReport extends BaseModel
protected $name = 'jianli_project_progress_report'; protected $name = 'jianli_project_progress_report';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function projectInfo()
{
return $this->hasOne(CostProject::class, 'id', 'project_id');
}
} }