dever 7 gadi atpakaļ
vecāks
revīzija
903058a781
3 mainītis faili ar 18 papildinājumiem un 4 dzēšanām
  1. 13 0
      task/database/user_report.php
  2. 3 2
      task/src/Info.php
  3. 2 2
      task/src/Report.php

+ 13 - 0
task/database/user_report.php

@@ -234,5 +234,18 @@ return array
 			'page' => array(15, 'list'),
 			'col' => '*',
 		),
+
+		'getTotal' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'uid' => 'yes',
+				'taskid' => 'yes',
+				'status' => array(3, '!='),
+				'state' => 1,
+			),
+			'type' => 'count',
+		),
 	)
 );

+ 3 - 2
task/src/Info.php

@@ -278,12 +278,12 @@ class Info extends Base
                     # 判断是否已经超过报告上限
                     $where = array();
                     $where['task_id'] = $data['id'];
-                    $total = Dever::db('task/user_report')->total($where);
+                    $total = Dever::db('task/user_report')->getTotal($where);
                     if ($total >= $data['report_num']) {
                         $button = 8;
                     }
                     $where['uid'] = $this->data['uid'];
-                    $total = Dever::db('task/user_report')->total($where);
+                    $total = Dever::db('task/user_report')->getTotal($where);
                     if ($total >= $data['report_user_num']) {
                         $button = 9;
                     }
@@ -335,6 +335,7 @@ class Info extends Base
 
         } elseif ($result['status'] >= 8) {
             $result['name'] = '提交报告';
+            $result['class'] = 'button';
         } elseif ($result['status'] > 1) {
             if ($result['status'] == 3) {
                 $result['name'] = '抢光了';

+ 2 - 2
task/src/Report.php

@@ -110,12 +110,12 @@ class Report extends Base
 
             # 验证$info['report_num'] 和 $info['report_user_num']
             $where['task_id'] = $info['id'];
-            $total = Dever::db('task/user_report')->total($where);
+            $total = Dever::db('task/user_report')->getTotal($where);
             if ($total >= $info['report_num']) {
                 Dever::alert('已经超过报告数量上限', array('url' => Dever::url('task/view?id=' . $info['id'], 'main')));
             }
             $where['uid'] = $this->data['uid'];
-            $total = Dever::db('task/user_report')->total($where);
+            $total = Dever::db('task/user_report')->getTotal($where);
             if ($total >= $info['report_user_num']) {
                 Dever::alert('已经超过人均报告数量上限', array('url' => Dever::url('task/view?id=' . $info['id'], 'main')));
             }