Bläddra i källkod

修复一些bug和添加内容

likeku 8 år sedan
förälder
incheckning
07e1166bd6
2 ändrade filer med 17 tillägg och 1 borttagningar
  1. 14 0
      protected/controller/ApiController.php
  2. 3 1
      protected/controller/MainController.php

+ 14 - 0
protected/controller/ApiController.php

@@ -79,6 +79,20 @@ class ApiController extends DooController {
                 $reportmsg = $report->getRowbyid($v);
                 $infoarr[$k]['id'] = $v;
                 $infoarr[$k]['edittime'] = !empty($reportmsg) ? date('YmdHis',$reportmsg['edittime']) : '';
+
+                Doo::loadModel('category');
+                $category = new Category();
+                if($reportmsg['parentid'] != 0){
+                    $catename = $category->getnamebyid($reportmsg['parentid']).'/'.$category->getnamebyid($reportmsg['cateid']);
+                }else{
+                    $catename = $category->getnamebyid($reportmsg['cateid']);
+                }
+                $infoarr[$k]['catename'] = $catename;
+
+                Doo::loadModel('version');
+                $versions = new Version();
+                $content = $versions->getRowbyVername($infoarr[$k]['edittime'])['content'];
+                $infoarr[$k]['desc'] = !empty($content) ? $content : '';
             }
             $arr = array('status' => 'true', 'msg' => '', 'info' => $infoarr);
             echo $this->decodeUnicode(json_encode($arr));

+ 3 - 1
protected/controller/MainController.php

@@ -481,13 +481,15 @@ class MainController extends DooController {
             if(isset($_POST['firsttime'])){
 //                $version->addtime = $time;
                 $addtime = $time;
-                $report->edittime = $time;
             }else{
                 $version2 = new Version();
                 $addtime = $version2->getvertime($_POST['verid']);
             }
             $version->update();
 
+            if(isset($_POST['online'])){    //发布版本即改变报表的最新版本号值
+                $report->edittime = $time;
+            }
             $report->reportid = $_POST['reportid'];
             $report->lastedit = isset($_POST['firsttime']) ? $time : time();
             $report->lastuser = $this->data['username'];