|
|
@@ -2071,31 +2071,35 @@ class Whlabel_bh extends Start_Controller {
|
|
|
$info = $this->whlabel_bh->read($id);
|
|
|
$list = $this->whlabel_bh_transfer->find_all(" orderinfo= '".$info['orderinfo']."'");
|
|
|
$ids = array_column($list,'id');
|
|
|
- $log_list = $this->whlabel_bh_transfer_cr->find_all( " type = 1 and fid in (".implode(",",$ids).")","*","id asc");
|
|
|
- $collect_list = [];
|
|
|
- foreach($log_list as $k=>$v){
|
|
|
- $collect_list[$v['lx']][$v['fid']] = $v;
|
|
|
- }
|
|
|
$final_list = [];
|
|
|
- foreach($collect_list as $k=>$v){
|
|
|
- $js_num = $zk_num = $wc_num = 0;
|
|
|
- foreach($v as $kk=>$vv){
|
|
|
- $js_num += 1;
|
|
|
- if($vv['is_over'] == 0){
|
|
|
- $zk_num += 1;
|
|
|
- }
|
|
|
- if($vv['is_over'] == 1){
|
|
|
- $wc_num += 1;
|
|
|
+ if(empty($ids)){
|
|
|
+ $log_list = $this->whlabel_bh_transfer_cr->find_all( " type = 1 and fid in (".implode(",",$ids).")","*","id asc");
|
|
|
+ $collect_list = [];
|
|
|
+ foreach($log_list as $k=>$v){
|
|
|
+ $collect_list[$v['lx']][$v['fid']] = $v;
|
|
|
+ }
|
|
|
+
|
|
|
+ foreach($collect_list as $k=>$v){
|
|
|
+ $js_num = $zk_num = $wc_num = 0;
|
|
|
+ foreach($v as $kk=>$vv){
|
|
|
+ $js_num += 1;
|
|
|
+ if($vv['is_over'] == 0){
|
|
|
+ $zk_num += 1;
|
|
|
+ }
|
|
|
+ if($vv['is_over'] == 1){
|
|
|
+ $wc_num += 1;
|
|
|
+ }
|
|
|
}
|
|
|
+ $final_list[$k] = [
|
|
|
+ 'cj' => $t_list[$k],
|
|
|
+ 'js_num' => $js_num,
|
|
|
+ 'zk_num' => $zk_num,
|
|
|
+ 'wc_num' => $wc_num,
|
|
|
+ 'list' => $v,
|
|
|
+ ];
|
|
|
}
|
|
|
- $final_list[$k] = [
|
|
|
- 'cj' => $t_list[$k],
|
|
|
- 'js_num' => $js_num,
|
|
|
- 'zk_num' => $zk_num,
|
|
|
- 'wc_num' => $wc_num,
|
|
|
- 'list' => $v,
|
|
|
- ];
|
|
|
}
|
|
|
+
|
|
|
// echo "<pre>";
|
|
|
// print_r($final_list);
|
|
|
// die;
|
