dever 6 年之前
父节点
当前提交
9568514ad1
共有 2 个文件被更改,包括 23 次插入7 次删除
  1. 13 4
      stat/database/journal.php
  2. 10 3
      stat/database/source.php

+ 13 - 4
stat/database/journal.php

@@ -34,6 +34,14 @@ $cate = function() use ($auth)
     }
     return $array;
 };
+
+$zhou = Dever::input('search_zhou');
+if ($zhou) {
+    $group = 'cate_id';
+} else {
+    $group = 'day_int,cate_id';
+}
+
 $list = array
 (
     # 匹配的正则或函数 选填项
@@ -48,14 +56,14 @@ $list = array
     ),
     'type' => 'all',
     'order' => array('day_int' => 'desc', 'id' => 'desc'),
-    'group' => 'day_int,cate_id',
+    'group' => $group,
     'page' => array(20, 'list'),
     'col' => 'id,sum(order_num) as order_num,sum(order_yes_num) as order_yes_num,sum(order_no_num) as order_no_num,sum(buy_num) as buy_num,sum(buy_cash) as buy_cash,cdate,journal_id,day_int,day_string,cate_id',
 );
 
 //$search = Dever::input('search_option_journal_id');
 $search = Dever::input('search_linkage_cate_journal');
-if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
+if (!$zhou && $search && $search != -1 && isset($search[1]) && $search[1] > 0) {
     Dever::setInput('search_option_journal_id', $search[1]);
     unset($list['group']);
     $list['col'] = '*';
@@ -64,6 +72,7 @@ if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
 if ($auth) {
     $list['option']['cate_id'] = array($auth, 'in');
 }
+
 return array
 (
     # 表名
@@ -94,7 +103,7 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             //'search'    => 'fulltext',
-            'list'      => true,
+            'list'      => $zhou ? false : true,
         ),
 
         'day_int'        => array
@@ -143,7 +152,7 @@ return array
             'update'    => 'select',
             //'search'    => 'select',
             'option'    => $journal,
-            'list'      => 'Dever::load("stat/lib/manage.info", {journal_id})',
+            'list'      => $zhou ? false : 'Dever::load("stat/lib/manage.info", {journal_id})',
         ),
 
         'order_num'       => array

+ 10 - 3
stat/database/source.php

@@ -44,6 +44,13 @@ $source = function()
     return $array;
 };
 
+$zhou = Dever::input('search_zhou');
+if ($zhou) {
+    $group = 'source_id,cate_id';
+} else {
+    $group = 'day_int,source_id,cate_id';
+}
+
 $list = array
 (
     # 匹配的正则或函数 选填项
@@ -66,7 +73,7 @@ $list = array
 
 //$search = Dever::input('search_option_journal_id');
 $search = Dever::input('search_linkage_cate_journal');
-if ($search && $search != -1 && isset($search[1]) && $search[1] > 0) {
+if (!$zhou && $search && $search != -1 && isset($search[1]) && $search[1] > 0) {
     Dever::setInput('search_option_journal_id', $search[1]);
     unset($list['group']);
     $list['col'] = 'id,order_num,order_yes_num,order_no_num,buy_num,buy_cash,cdate,journal_id,source_id,day_int,day_string,cate_id';
@@ -106,7 +113,7 @@ $config = array
             'match'     => 'is_string',
             'update'    => 'text',
             //'search'    => 'fulltext',
-            'list'      => true,
+            'list'      => $zhou ? false : true,
         ),
 
         'day_int'        => array
@@ -168,7 +175,7 @@ $config = array
             'update'    => 'select',
             //'search'    => 'select',
             'option'    => $journal,
-            'list'      => 'Dever::load("stat/lib/manage.info", {journal_id})',
+            'list'      => $zhou ? false : 'Dever::load("stat/lib/manage.info", {journal_id})',
         ),
 
         'pv'       => array