From 8e8030f85faec350ab33c72ca473f138f909a8e5 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Wed, 5 Jun 2024 10:43:12 +0800 Subject: [PATCH] update --- app/adminapi/logic/jxgl/OaExamineLogic.php | 1 + app/adminapi/logic/jxgl/OaSelfExamineLogic.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/adminapi/logic/jxgl/OaExamineLogic.php b/app/adminapi/logic/jxgl/OaExamineLogic.php index 7a2006033..9d939404f 100644 --- a/app/adminapi/logic/jxgl/OaExamineLogic.php +++ b/app/adminapi/logic/jxgl/OaExamineLogic.php @@ -169,6 +169,7 @@ class OaExamineLogic extends BaseLogic $data['total_self_score'] = OaExamineDetail::where('examine_id',$data['id'])->sum('self_score'); $data['total_superior_score'] = OaExamineDetail::where('examine_id',$data['id'])->sum('superior_score'); $data['final_score'] = bcadd($data['total_self_score'],$data['total_superior_score'],2) / 2; + $data['detail'] = OaExamineDetail::field('id,examine_item,score,examine_desc,self_score,superior_score')->where('examine_id',$data['id'])->select()->toArray(); return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/logic/jxgl/OaSelfExamineLogic.php b/app/adminapi/logic/jxgl/OaSelfExamineLogic.php index 7ec92ca1b..bd3bb1d18 100644 --- a/app/adminapi/logic/jxgl/OaSelfExamineLogic.php +++ b/app/adminapi/logic/jxgl/OaSelfExamineLogic.php @@ -171,7 +171,7 @@ class OaSelfExamineLogic extends BaseLogic $data['examine_type_text'] = $data->examine_type_text; $data['total_score'] = OaSelfExamineDetail::where('self_examine_id',$data['id'])->sum('score'); $data['total_self_score'] = OaSelfExamineDetail::where('self_examine_id',$data['id'])->sum('self_score'); - $data['detail'] = OaSelfExamineDetail::field('id,self_examine_id,self_score,examine_item,score,examine_desc')->where('self_examine_id',$data['id'])->select()->toArray(); + $data['detail'] = OaSelfExamineDetail::field('id,self_score,examine_item,score,examine_desc')->where('self_examine_id',$data['id'])->select()->toArray(); return $data->toArray(); } } \ No newline at end of file