edit

tool/work/assets/pc/html/email.html

@@ -165,7 +165,7 @@ th{
     <{foreach($app as $k => $v):}>
 <tr style="border:1px solid #A7A7A6">
 <td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:131px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['cdate']}></blockquote></td>
-<td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:139px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['zhipai']}><br/><{$v['chu']}></blockquote></td>
+<td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:139px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['zhipai']}></blockquote></td>
 <td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:131px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['cate_name']}></blockquote></td>
 <td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:131px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['priority_name']}></blockquote></td>
 <td style="border-right:1px solid #A7A7A6;border-bottom:1px solid #A7A7A6;padding:3px 8px;height: 36px;word-break: break-all; word-wrap: break-word; width:131px;"class=""><blockquote style="margin: 0 0 0 6px; border: none; padding: 0px;"><{$v['desc']}></blockquote></td>

tool/work/lib/Cron.php

@@ -40,9 +40,9 @@ Class Cron
         $question = Dever::db('work/question')->state(array('branch_id'=>$dbranch['group_id']));
         $question = array_keys($question);
 
-        $data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'end'=>$end));
-        echo Dever::sql();
-        $data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$dbranch['group_id'],'end'=>$end,'status'=>2));
+        $data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'start'=>$start,'end'=>$end));
+        // echo Dever::sql();
+        $data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$dbranch['group_id'],'start'=>$start,'end'=>$end,'status'=>2));
         $admin = explode(',',$dbranch['group']);
         if ($dbranch['coor']) {
             $coor = explode(',',$dbranch['coor']);
@@ -54,7 +54,7 @@ Class Cron
         } else {
             $people = $admin[1];
         }
-        $data['info']['yi'] = Dever::db('work/info')->getCount(array('fpeople'=>$people,'end'=>$end,'status'=>'3,4'));
+        $data['info']['yi'] = Dever::db('work/info')->getCount(array('fpeople'=>$people,'start'=>$start,'end'=>$end,'status'=>'3,4'));
 
         $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$dbranch['group_id']));
         $question = implode(',',$question);
@@ -63,12 +63,12 @@ Class Cron
             foreach ($data['app'] as $k1 => $v1) {
                 $data['app'][$k1]['cdate'] = date('Y-m-d H:i:s',$v1['cdate']);
                 if ($v1['zdate']) {
-                    $data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['zdate']);
+                    $data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['zdate']).'<br/>'.date('Y-m-d H:i:s',$v1['chdate']);
                 } else {
-                    $data['app'][$k1]['zhipai'] = '';
+                    $data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['chdate']);
                 }
                 
-                $data['app'][$k1]['chu'] = date('Y-m-d H:i:s',$v1['chdate']);
+                // $data['app'][$k1]['chu'] = date('Y-m-d H:i:s',$v1['chdate']);
                 $cate = Dever::db('work/q_cate')->find($v1['cate_id']);
                 $data['app'][$k1]['cate_name'] = $cate['name'];
                 $priority = Dever::db('work/priority')->find($v1['priority_id']);