bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge heihedata branch from r3921 to r3924

This commit is contained in:
wlx 2013-09-26 10:40:36 +00:00
parent 3dc9186923
commit b854b5cb53
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/admin/controllers/DownController.php
View File

@ -548,8 +548,9 @@ class Admin_DownController extends Zend_Controller_Action
} }
//如果是wsn数据则生成数据 //如果是wsn数据则生成数据
$dataservice = new DataService(); //wsn数据在ftp服务器端进行处理
@$dataservice->makeWsnData(); /*$dataservice = new DataService();
@$dataservice->makeWsnData();*/
$sql="update dataorder set status=5,ts_approved=now() where offlineappid=?"; $sql="update dataorder set status=5,ts_approved=now() where offlineappid=?";
$this->db->query($sql,array($finish)); $this->db->query($sql,array($finish));