update

app/adminapi/controller/project/ProjectSubcontractSettlementController.php

@@ -11,85 +11,102 @@
 // +----------------------------------------------------------------------
 // | author: likeadminTeam
 // +----------------------------------------------------------------------
-
-
-namespace app\adminapi\controller\project;
-
-
-use app\adminapi\controller\BaseAdminController;
-use app\adminapi\lists\project\ProjectSubcontractSettlementLists;
-use app\adminapi\logic\project\ProjectSubcontractSettlementLogic;
-use app\adminapi\validate\project\ProjectSubcontractSettlementValidate;
-use app\common\model\oa\Flow;
-use app\common\model\oa\FlowType;
-
-
-/**
- * 分包结算控制器
- * Class ProjectSubcontractSettlementController
- * @package app\adminapi\controller\project
- */
-class ProjectSubcontractSettlementController extends BaseAdminController
-{
-
-
-    /**
-     * @notes 获取分包结算列表
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2023/12/29 13:59
-     */
-    public function lists()
-    {
-        return $this->dataLists(new ProjectSubcontractSettlementLists());
-    }
 	
-    /**
-     * @notes 添加分包结算
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2023/12/29 13:59
-     */
-    public function add()
-    {
-        $params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('add');
-        $result = ProjectSubcontractSettlementLogic::add($params,$this->adminId);
-        if (true === $result) {
-            return $this->success('添加成功', [], 1, 1);
-        }
-        return $this->fail(ProjectSubcontractSettlementLogic::getError());
-    }
 	
-    /**
+	namespace app\adminapi\controller\project;
-     * @notes 获取分包结算详情
-     * @return \think\response\Json
-     * @author likeadmin
-     * @date 2023/12/29 13:59
-     */
-    public function detail()
-    {
-        $params = (new ProjectSubcontractSettlementValidate())->goCheck('detail');
-        $result = ProjectSubcontractSettlementLogic::detail($params);
-        return $this->data($result);
-    }
 	
-	public function flows(): \think\response\Json
+	
+	use app\adminapi\controller\BaseAdminController;
+	use app\adminapi\lists\project\ProjectSubcontractSettlementLists;
+	use app\adminapi\logic\project\ProjectSubcontractSettlementLogic;
+	use app\adminapi\validate\project\ProjectSubcontractSettlementValidate;
+	use app\common\model\oa\Flow;
+	use app\common\model\oa\FlowType;
+	
+	
+	/**
+	 * 分包结算控制器
+	 * Class ProjectSubcontractSettlementController
+	 * @package app\adminapi\controller\project
+	 */
+	class ProjectSubcontractSettlementController extends BaseAdminController
 	{
-		$flow_type = FlowType::where('type',4)->where('name','fbjs')->findOrEmpty();
+		
-		$data = Flow::field('id,name')->where('flow_cate',$flow_type['id'])->where('status',2)->select();
+		
-		return $this->success('请求成功',$data->toArray());
+		/**
-	}
+		 * @notes 获取分包结算列表
-	
+		 * @return \think\response\Json
-	//添加审批
+		 * @author likeadmin
-	public function approve(): \think\response\Json
+		 * @date 2023/12/29 13:59
-	{
+		 */
-		$params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('approve');
+		public function lists()
-		$result = ProjectSubcontractSettlementLogic::approve($params,$this->adminId);
+		{
-		if (true === $result) {
+			return $this->dataLists(new ProjectSubcontractSettlementLists());
-			return $this->success('提交审核信息成功', [], 1, 1);
 		}
-		return $this->fail(ProjectSubcontractSettlementLogic::getError());
+		
-	}
+		/**
-
+		 * @notes 添加分包结算
-
+		 * @return \think\response\Json
-}
+		 * @author likeadmin
+		 * @date 2023/12/29 13:59
+		 */
+		public function add()
+		{
+			$params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('add');
+			$result = ProjectSubcontractSettlementLogic::add($params, $this->adminId);
+			if (true === $result) {
+				return $this->success('添加成功', [], 1, 1);
+			}
+			return $this->fail(ProjectSubcontractSettlementLogic::getError());
+		}
+		
+		public function edit()
+		{
+			$params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('edit');
+			$result = ProjectSubcontractSettlementLogic::edit($params);
+			if (true === $result) {
+				return $this->success('编辑成功', [], 1, 1);
+			}
+			return $this->fail(ProjectSubcontractSettlementLogic::getError());
+		}
+		
+		public function delete()
+		{
+			$params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('delete');
+			ProjectSubcontractSettlementLogic::delete($params);
+			return $this->success('删除成功', [], 1, 1);
+		}
+		
+		/**
+		 * @notes 获取分包结算详情
+		 * @return \think\response\Json
+		 * @author likeadmin
+		 * @date 2023/12/29 13:59
+		 */
+		public function detail()
+		{
+			$params = (new ProjectSubcontractSettlementValidate())->goCheck('detail');
+			$result = ProjectSubcontractSettlementLogic::detail($params);
+			return $this->data($result);
+		}
+		
+		public function flows(): \think\response\Json
+		{
+			$flow_type = FlowType::where('type', 4)->where('name', 'fbjs')->findOrEmpty();
+			$data = Flow::field('id,name')->where('flow_cate', $flow_type['id'])->where('status', 2)->select();
+			return $this->success('请求成功', $data->toArray());
+		}
+		
+		//添加审批
+		public function approve(): \think\response\Json
+		{
+			$params = (new ProjectSubcontractSettlementValidate())->post()->goCheck('approve');
+			$result = ProjectSubcontractSettlementLogic::approve($params, $this->adminId);
+			if (true === $result) {
+				return $this->success('提交审核信息成功', [], 1, 1);
+			}
+			return $this->fail(ProjectSubcontractSettlementLogic::getError());
+		}
+		
+		
+	}

app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php

@@ -45,7 +45,7 @@
 		{
 			Db::startTrans();
 			try {
-				$res = ProjectSubcontractSettlement::create([
+				ProjectSubcontractSettlement::create([
 					'settlement_code' => data_unique_code('分包结算'),
 					'project_id' => $params['project_id'],
 					'contract_id' => $params['contract_id'],