From 831ff26eecd2840d12c9d2ac3381b65f456e950d Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Fri, 23 Dec 2011 05:36:58 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=BF=A1=E6=81=AF=E5=8F=8A=E5=88=86=E6=9C=88=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=96=87=E5=AD=97=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controllers/StatController.php | 4 ++--
 application/admin/views/scripts/stat/index.phtml | 6 +++---
 application/admin/views/scripts/stat/month.phtml | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/application/admin/controllers/StatController.php b/application/admin/controllers/StatController.php
index be206306..c1a31945 100644
--- a/application/admin/controllers/StatController.php
+++ b/application/admin/controllers/StatController.php
@@ -18,8 +18,8 @@ class Admin_StatController extends Zend_Controller_Action
       (select count(id) from normalmetadata) as alldata,
       (select count(id) as num from dataorder where status=0) as onlinedown,
       (select count(id) as num from dataorder where status=5) as offlinedown,
-      (select count(id) as num from dataorder where offlineappid>0 and status>4) as offlinepass,
-      (select count(id) as num from dataorder where offlineappid>0 and status in (2,3,4)) as offlineunfinished,
+      (select count(id) as num from offlineapp where ts_approved is not null) as offlinepass,
+      (select count(id) as num from offlineapp where ts_approved is null) as offlineunfinished,
       (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied,
       (select count(id) as num from onlineapp) as onlineapp";
       $this->view->stat=$this->db->fetchRow($sql);
diff --git a/application/admin/views/scripts/stat/index.phtml b/application/admin/views/scripts/stat/index.phtml
index 8f669f60..4401f6a7 100644
--- a/application/admin/views/scripts/stat/index.phtml
+++ b/application/admin/views/scripts/stat/index.phtml
@@ -15,11 +15,11 @@
 <li class="title">概况</li>
 <li>用户总数：<?php echo $this->stat['alluser']; ?>人</li>
 <li>元数据条数：<?php echo $this->stat['alldata']; ?>条</li>
-<li>在线数据下载次数：<?php echo $this->stat['onlinedown']; ?>条</li>
-<li>在线数据下载次数：<?php echo $this->stat['offlinedown']; ?>条</li>
+<li>在线数据下载数：<?php echo $this->stat['onlinedown']; ?>条</li>
+<li>离线数据下载数：<?php echo $this->stat['offlinedown']; ?>条</li>
 <li>已通过的离线申请：<?php echo $this->stat['offlinepass']; ?>次</li>
 <li>未完成的离线申请：<?php echo $this->stat['offlineunfinished']; ?>次</li>
-<li>被拒绝的离线申请：<?php echo $this->stat['offlinedenied']; ?>人次</li>
+<li>被拒绝的离线数据：<?php echo $this->stat['offlinedenied']; ?>条</li>
 <li>有记录的在线下载数：<?php echo $this->stat['onlineapp']; ?>次</li>
 </ul>
 </div>
diff --git a/application/admin/views/scripts/stat/month.phtml b/application/admin/views/scripts/stat/month.phtml
index 16db5eb1..3b4b03ac 100644
--- a/application/admin/views/scripts/stat/month.phtml
+++ b/application/admin/views/scripts/stat/month.phtml
@@ -6,7 +6,9 @@
 	$this->headLink()->appendStylesheet('/css/jquery.jqplot.css');
 	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
 	$this->breadcrumb('<a href="/">首页</a>');
-	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb('<a href="/admin/stat">统计</a>');
+	$this->breadcrumb('按月统计');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
 <style>
@@ -86,7 +88,7 @@ $(function () {
 </div>
 
 <div class="charts">
-<div class="title"  id="title_online1"><?php echo $this->y.'年按月在线下载条数（根据用户下载记录，会有数据重复，偏大）统计';?></div>
+<div class="title"  id="title_online1"><?php echo $this->y.'年按月在线下载条数（根据用户下载记录，9月之前无用途记录）统计';?></div>
 <?php
 
 	if($this->online!='' && count($this->online)!= 0)