Merge branch 'master' into master_new

www/protected/modules/j/controllers/JGEmpolyerController.php

@@ -79,9 +79,15 @@ class JgEmpolyerController extends JBaseController
         $c = new EMongoCriteria();
         $c->user_id('==',new MongoId($user_id));
         $emp = JGEmploye::model()->find($c);
+
         if (empty($emp)) {
             CommonFn::requestAjax(false, '查无此人', array());exit;
         } else {
+            $data['id'] = $emp->_id;
+            $data['score'] = $emp->score;
+            $data['store_id'] = $emp->store_id;
+            $sort = $emp->getSort($data);
+            $emp->ranking = $sort;
             CommonFn::requestAjax(true, '成功', $emp);exit;
         }
     }

www/protected/modules/j/controllers/QuestionController.php

@@ -23,9 +23,9 @@ class QuestionController extends JBaseController
         $rows = CommonFn::getRowsFromCursor($cursor);
         $parsedRows = Question::model()->parse($rows);
         $total = $cursor->count();
-        if ($total > 10) {
-            $offset = rand(0,$total-10);
-            $limit = 10;
+        if ($total > 5) {
+            $offset = rand(0,$total-5);
+            $limit = 5;
             $pageParams['offset'] = $offset;
             $pageParams['limit'] = $limit;
             $criteria = new EMongoCriteria($pageParams);

www/protected/modules/j/models/JGEmploye.php

@@ -33,6 +33,7 @@ class JGEmploye extends MongoAr
     public $desc;//备注
     public $score = 0;//积分
     public $degree = 1;//次数
+    public $ranking;
 
     public static $work_type_options = array(
         1 => array('name' => '钟点工'),
@@ -84,6 +85,27 @@ class JGEmploye extends MongoAr
     }
 
 
+    public  function getSort($newRow)
+    {
+        if ($newRow['score'] == 0) {
+            return '暂无排名';
+        } else {
+            $criteria = new EMongoCriteria();
+            $criteria->sort('socre',EMongoCriteria::SORT_DESC);
+            $criteria->store_id('==',$newRow['store_id']);
+            $tmp = JGEmploye::model()->findAll($criteria);
+            $i = 1;
+            foreach ($tmp as $key => $value) {
+                if ($key == $newRow['id']) {
+                    return $i;
+                } else {
+                    $i++;
+                }
+            }
+
+        }
+    }
+
     public static function getStoreInfo() {
         $data = array();
         $criteria = new EMongoCriteria();
@@ -116,7 +138,6 @@ class JGEmploye extends MongoAr
         //$newRow['work_type_str'] = self::$work_type_options[intval($newRow['work_type'])]['name'];
         $newRow['skill'] = CommonFn::get_val_if_isset($row,'skill','');
         //$newRow['skill_str'] = self::$skill_options[intval($newRow['skill'])]['name'];
-
         $newRow['star'] = CommonFn::get_val_if_isset($row,'star','');
         $newRow['degree'] = CommonFn::get_val_if_isset($row,'degree','');
         $newRow['score'] = CommonFn::get_val_if_isset($row,'score','');
@@ -128,6 +149,7 @@ class JGEmploye extends MongoAr
         $newRow['desc'] = CommonFn::get_val_if_isset($row,'desc','');
         $newRow['work_time_part'] = CommonFn::get_val_if_isset($row,'work_time_part','');
         $newRow['extra'] = CommonFn::get_val_if_isset($row,'work_time_part','');
+        $newRow['ranking'] = $this->getSort($newRow);
         if (!empty($newRow['extra'])) {
             $tmp = array();
             $i = 0;

www/protected/views/question/index.php

@@ -90,7 +90,7 @@
                                                 <span>选项D: </span>
                                             </div>
                                             <div class="box_flex f_content">
-                                                <textarea rows="3" id="edit_questions3" name="questions[3]" style="width: 250px;"  ></textarea>
+                                                <textarea rows="3"a d id="edit_questions3" name="questions[3]" style="width: 250px;"  ></textarea>
                                             </div>
                                         </div>
                                     </li>