ad

app/admin/controller/Consult.php

@@ -2350,7 +2350,7 @@ class Consult extends Base
     {
         $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
-        $where = [['cb.is_del', "=", 0],['c.status','<>',6]];//不要'取消转单'状态下的数据
+        $where = [['cb.is_del', "=", 0]];//不要'取消转单'状态下的数据
         $zxNo = isset($this->post['zxNo']) && $this->post['zxNo'] !== "" ? trim($this->post['zxNo']) : "";
         if ($zxNo !== "") $where[] = ['cb.zxNo', 'like', '%' . $zxNo . '%'];
 

app/report/controller/Stats.php

@@ -172,7 +172,7 @@ class Stats extends Base
       foreach ($this->cgdDerpart as $departid=>$depart){
             $uid =$this->GetDepartId($departid);
     	    $temp[$departid]['name'] =$depart;
-    	    $list = $model->whereBetween("addtime",$time)->whereIn("createrid",$uid)->where('is_del',0)->group("createrid,creater")->field
+    	    $list = $model->whereBetween("addtime",$time)->where('is_del',0)->group("createrid,creater")->field
     	    ("creater,createrid,count(1) num")->select();
     	    $temp[$departid]['result'] =$list;
       }
@@ -294,7 +294,7 @@ class Stats extends Base
     			->whereIn("send_status",[1,2])
 	            ->whereIn('apply_id',$uid)
 	            ->whereMonth('addtime',date('Y').'-'.$start)
-	            ->group('send_status')->column('sum(wsend_num) num,send_status','send_status');
+	            ->group('send_status')->column('count(1) num,send_status','send_status');
     			$temp[$departid]['result'][$start]=$list;
     			$start++;
     		}
@@ -310,12 +310,12 @@ class Stats extends Base
     			->whereIn('send_status',[1,2])
 	            ->whereIn('apply_id',$userArr)
 	            ->whereMonth('addtime',date('Y').'-'.$start)
-	            ->field("sale_price,orderCode")
-	            ->append(["no_addr_num"=>function(Query $query,$data){
+	            ->field("sale_price,orderCode,good_num")
+	            ->append(["addr_num"=>function(Query $query,$data){
 	            	$query->name('order_addr')->where(['orderCode'=>$data['orderCode'],'is_del'=>0])->sum('receipt_quantity');
 	            }])
 	            ->find();
-    			$noArr['result'][$start]['total_price']=bcmul($list['sale_price'],$list['no_addr_num'].'',2);
+    			$noArr['result'][$start]['total_price']=bcmul($list['sale_price'],bcsub($list['good_num'],$list['addr_num']),2);
     			$start++;
     		}
     	  $this->success('获取成功',["result"=>array_values($temp),"noAddr"=>$noArr]);