1

application/admin/controller/Accounts.php

@@ -165,7 +165,7 @@ class Accounts extends Base
         $start = time()-2592000;
         //当前时间戳
         $end = time();
-        $service_log = db('service_log a')->join('users b','a.kf_id=b.id')->field('a.servicelog_id,a.start_time,b.user_name')->whereBetween('a.start_time', [$start, $end])->where('a.user_id', $id)->select();
+        $service_log = db('service_log a')->join('users b','a.kf_id=b.id')->field('a.servicelog_id,a.start_time,b.user_name')->whereBetween('a.start_time', [$start, $end])->where('a.user_id', $id)->order('a.start_time','desc')->select();
         for($i=0;$i<count($service_log);$i++){
             $service_log[$i]['start_time'] = date("Y-m-d H:i:s",$service_log[$i]['start_time']);
         }

application/admin/view/report/workreport.html

@@ -24,7 +24,7 @@
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <div class="content clearfix m-b">
                     <div class="form-group">
-                        <label>留言日期：</label>
+                        <label>工作日期：</label>
                         <input type="text" class="form-control" id="start" value="<?php echo date('Y-m-d',time()-86400);?>" style="width: 100px;"> --
                         <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time()-86400);?>" style="width: 100px;">
                     </div>
@@ -172,7 +172,8 @@
             $("#toExcel").val(1);
             $("#start").val();
             $("#end").val();
-            var url = "{:url('report/workreport')}" + "?pageNumber=1&pageSize=100&start="+$("#start").val()+"&end="+$("#end").val()+"&toExcel=1";
+            $("#user_name").val();
+            var url = "{:url('report/workreport')}" + "?pageNumber=1&pageSize=100&start="+$("#start").val()+"&end="+$("#end").val()+"&searchText="+$("#user_name").val()+"&toExcel=1";
             window.open(url);
             return false;
         });