wugg 2 年之前
父節點
當前提交
5ccc0ff5bb
共有 1 個文件被更改,包括 32 次插入20 次删除
  1. 32 20
      app/admin/controller/Project.php

+ 32 - 20
app/admin/controller/Project.php

@@ -765,7 +765,7 @@ class Project extends Base
             return error_show(1004,"反馈数据信息未找到");
         }
         $pgnos =array_column($selec,"pgNo");
-        $infolist =   Db::name("project_info")->where(['pgNo'=>$pgnos])->select()->toArray();
+        $infolist = Db::name("project_info")->where(['pgNo'=>$pgnos])->select()->toArray();
         if(empty($infolist)){
             return error_show(1004,"项目商品数据未找到");
         }
@@ -775,6 +775,11 @@ class Project extends Base
             if($up){
 
                 foreach ($infolist as $value){
+                    $poject=Db::name("project")->where(["projectNo"=>$value['projectNo']])->find();
+                    if($poject==false){
+                        Db::rollback();
+                        return error_show(1004,"项目单未找到");
+                    }
                     $old_projectinfo_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
@@ -798,20 +803,19 @@ class Project extends Base
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
                             }else{
-
                                 //修改状态,添加待办
                                 ActionLog::logAdd($this->post['token'], [
                                     "order_code" =>$value['projectNo'],//项目编码
-                                    "status" => $old_project_status,//这里的status是之前的值
+                                    "status" => $poject['status'],//这里的status是之前的值
                                     "action_remark" => '',//备注
                                     "action_type" => "status"//新建create,编辑edit,更改状态status
-                                ], "PRO", 4, $info);
+                                ], "PRO", 3, ["status"=>3,"updatetime"=>date("Y-m-d H:i:s")]);
 
                                 ProcessOrder::AddProcess($this->post['token'], [
                                     "order_type" => 'PRO',
-                                    "order_code" => $projectNo,
-                                    "order_id" => $info['id'],
-                                    "order_status" => 4
+                                    "order_code" =>$value['projectNo'],
+                                    "order_id" => $poject['id'],
+                                    "order_status" => 3
                                 ]);
                             }
                         }
@@ -845,6 +849,7 @@ class Project extends Base
         if(empty($selec)){
             return error_show(1004,"项目方案数据信息未找到");
         }
+
         Db::startTrans();
         try{
             $up = Db::name("project_plan")->where(["planNo"=>$planNos,'is_del'=>0,"status"=>0])->save(["status"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
@@ -865,21 +870,28 @@ class Project extends Base
                 }
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
+                    foreach ($project as $value){
+                        $poject=Db::name("project")->where(["projectNo"=>$value])->find();
+                        if($poject==false){
+                            Db::rollback();
+                            return error_show(1004,"项目单未找到");
+                        }
+                        //修改状态,添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" =>$value,//项目编码
+                            "status" => 4,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create,编辑edit,更改状态status
+                        ], "PRO", 5, ["status"=>5,"updatetime"=>date("Y-m-d H:i:s")]);
 
-                    //修改状态,添加待办
-                    ActionLog::logAdd($this->post['token'], [
-                        "order_code" => $project,//项目编码
-                        "status" => 4,//这里的status是之前的值
-                        "action_remark" => '',//备注
-                        "action_type" => "status"//新建create,编辑edit,更改状态status
-                    ], "PRO", 5, $this->post);
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'PRO',
+                            "order_code" =>$value,
+                            "order_id" => $poject['id'],
+                            "order_status" => 5
+                        ]);
+                    }
 
-                    ProcessOrder::AddProcess($this->post['token'], [
-                        "order_type" => 'PRO',
-                        "order_code" => $project,
-                        "order_id" => 0,
-                        "order_status" => 5
-                    ]);
 
                     Db::commit();
                     return app_show(0, "方案数据修改成功");