Merge branch 'dev' of http://gogs.gisvg.com/yzx/caiping into dev

app/admin/controller/Index.php

@@ -704,7 +704,7 @@ class Index extends BaseController
         $sent_review_amount = Db::name("cost_project")->where([
             ["sent_review_unit", "=", get_login_admin("unit_name")],
             ['delete_time', '=', 0],
-            ["project_status", ">", 2],
+            ["proprietor_status", ">", 1],
             ["project_status", "<>", 9],
         ])->field("sent_review_amount,sent_review_cost,review_add_reduce_rate,authorize_amount,engineering_type1")->select();
         //engineering_type1=1是预算，2是结算
@@ -872,12 +872,24 @@ class Index extends BaseController
             ['delete_time', '=', 0],
             ["project_status", '>', 0],
         ])->count();
-        $where = [
-            ["sent_review_unit", "=", get_login_admin("unit_name")],
-            ['delete_time', '=', 0],
-            ["project_status", '>', 0],
-        ];
-        $data = Db::name("cost_project")->where($where)->select();
+
+        $data = Db::name("cost_project")
+            ->where(function($query) {
+                $query->where([
+                    ["sent_review_unit", "=", get_login_admin("unit_name")],
+                    ['delete_time', '=', 0],
+                    ["proprietor_status", '>', 1],
+                    ["project_status", '=', 0],
+                ]);
+            })
+            ->whereOr(function($query) {
+                $query->where([
+                    ["sent_review_unit", "=", get_login_admin("unit_name")],
+                    ['delete_time', '=', 0],
+                    ["project_status", '>', 0],
+                ]);
+            })
+            ->select();
         $num_project = [
             'num' => 0,
             "yu" => 0,