From 8e0e0ed129d8b5f918023e128a2e466f6ff7b6cf Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 3 Jun 2024 15:17:21 +0800
Subject: [PATCH] update

---
 .../jxgl/OaExamineTempController.php          | 21 +++++++++++++++
 .../logic/jxgl/OaExamineTempLogic.php         | 26 +++++++++++++------
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/app/adminapi/controller/jxgl/OaExamineTempController.php b/app/adminapi/controller/jxgl/OaExamineTempController.php
index 431fba4e7..306df4f65 100644
--- a/app/adminapi/controller/jxgl/OaExamineTempController.php
+++ b/app/adminapi/controller/jxgl/OaExamineTempController.php
@@ -20,6 +20,7 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\jxgl\OaExamineTempLists;
 use app\adminapi\logic\jxgl\OaExamineTempLogic;
 use app\adminapi\validate\jxgl\OaExamineTempValidate;
+use app\common\model\jxgl\OaExamineTempItem;
 
 
 /**
@@ -106,6 +107,26 @@ class OaExamineTempController extends BaseAdminController
         $result = OaExamineTempLogic::detail($params);
         return $this->data($result);
     }
+	
+	/**
+	 * @notes 删除考核项
+	 * @return \think\response\Json
+	 * @author likeadmin
+	 * @date 2024/06/03 13:35
+	 */
+	public function delete_item()
+	{
+		$id = $this->request->post('id');
+		if(empty($id)){
+			return $this->fail('参数错误');
+		}
+		$data = OaExamineTempItem::where('id',$id)->findOrEmpty();
+		if($data->isEmpty()){
+			return $this->fail('考核项信息不存在');
+		}
+		$result = OaExamineTempItem::destroy($id);
+		return $result ? $this->success('删除成功' ,[], 1, 1) : $this->fail('删除失败');
+	}
 
 
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/jxgl/OaExamineTempLogic.php b/app/adminapi/logic/jxgl/OaExamineTempLogic.php
index 00b43a02e..9fa5dc7a4 100644
--- a/app/adminapi/logic/jxgl/OaExamineTempLogic.php
+++ b/app/adminapi/logic/jxgl/OaExamineTempLogic.php
@@ -80,15 +80,25 @@ class OaExamineTempLogic extends BaseLogic
 	            'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : 0,
 	            'update_time' => time()
             ]);
-			//删除原数据
-	        OaExamineTempItem::destroy(function($query)use($params){
-		        $query->where('examine_temp_id','=',$params['id']);
-	        });
-	        foreach($params['detail'] as &$v){
-		        $v['examine_temp_id'] = $params['id'];
-		        $v['create_time'] = time();
+	        foreach($params['detail'] as $v){
+		        if(!empty($v['id'])){
+			        OaExamineTempItem::where('id',$v['id'])->update([
+				        'examine_temp_id' => $params['id'],
+				        'examine_item' => $v['examine_item'],
+				        'score' => $v['score'],
+				        'examine_desc' => $v['examine_desc'],
+				        'update_time' => time(),
+			        ]);
+		        }else{
+			        OaExamineTempItem::create([
+				        'examine_temp_id' => $params['id'],
+				        'examine_item' => $v['examine_item'],
+				        'score' => $v['score'],
+				        'examine_desc' => $v['examine_desc'],
+				        'create_time' => time()
+			        ]);
+		        }
 	        }
-	        (new OaExamineTempItem)->saveAll($params['detail']);
             Db::commit();
             return true;
         } catch (\Exception $e) {