wugg 2 years ago
parent
commit
f661299a79
2 changed files with 44 additions and 3 deletions
  1. 43 2
      app/admin/controller/Version.php
  2. 1 1
      app/admin/model/ProcessOrder.php

+ 43 - 2
app/admin/controller/Version.php

@@ -305,16 +305,35 @@ class Version extends BaseController
                     $value['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($value);
                     if($up){
-
+                        ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
+                            "order_code" => $value['pgNo'],//项目编码
+                            "status" =>$old_value_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "edit"//新建create,编辑edit更改状态status
+                        ], "PRI", 3, ["status" =>3, "updatetime" => date("Y-m-d H:i:s")]);
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
+                            $pr=Db::name("project")->where(["projectNo" => $value['projectNo']])->find();
+                            if($pr==false){
+                                Db::rollback();
+                                return error_show(1004, "未找到项目信息");
+                            }
                             $proc =Db::name("project")->where(["projectNo"=>$value['projectNo']])->save
                             (["status"=>3,"updatetime"=>date("Y-m-d H:i:s")]);
                             if(!$proc){
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
                             }
+                            ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
+                                "order_code" => $value['projectNo'],//项目编码
+                                "status" =>$pr['status'],//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "edit"//新建create,编辑edit更改状态status
+                            ], "PRO", 3, ["status" => 3, "updatetime" => date("Y-m-d H:i:s")]);
+
+                            $process = ["order_code" => $value['projectNo'], "order_id" => $pr['id'], "order_status" =>3, "order_type" => 'PRO'];
+                            ProcessOrder::AddProcess(['id'=>0,"nickname"=>'客户'], $process);
                         }
                     }else{
                         Db::rollback();
@@ -364,14 +383,36 @@ class Version extends BaseController
         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")]);
             if($up) {
+                foreach ($selec as $value){
+                    ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
+                        "order_code" => $value['planNo'],//项目编码
+                        "status" =>0,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create,编辑edit更改状态status
+                    ], "PRP", 1, ["status" =>1, "updatetime" => date("Y-m-d H:i:s")]);
+                }
                 $project = array_column($selec, "projectNo");
                 if (empty($project)) {
                     Db::rollback();
                     return error_show(1004, "方案选择失败");
                 }
-                $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
+                $pr=Db::name("project")->where(["projectNo" => $project, "status" => 4])->find();
+                if($pr==false){
+                    Db::rollback();
+                    return error_show(1004, "未找到项目信息");
+                }
+                $pro = Db::name("project")->where($pr)->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
 
+                ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
+                    "order_code" => $project,//项目编码
+                    "status" =>4,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create,编辑edit更改状态status
+                ], "PRO", 5, ["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
+
+                $process = ["order_code" => $project, "order_id" => $pr['id'], "order_status" =>5, "order_type" => 'PRO'];
+                ProcessOrder::AddProcess(['id'=>0,"nickname"=>'客户'], $process);
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }

+ 1 - 1
app/admin/model/ProcessOrder.php

@@ -30,7 +30,7 @@ class ProcessOrder extends \think\Model
         ];
         OrderMsg::addmsg($data);
         if(self::insert($data)){
-         //   Workflow::SaveFlow($data);
+          Workflow::SaveFlow($data);
         };
     }
     public static function workdel($order){