1

application/admin/controller/Kfnotice.php

@@ -65,11 +65,11 @@ class Kfnotice extends Base
 
             $model = new ServicenoticeModel();
             if (!$bibao) {
-                $result = $model->where($where)->limit($offset, $limit)->order('id', 'desc')->select();
+                $result = $model->where($where)->limit($offset, $limit)->order('sendtime', 'desc')->select();
             } else {
                 $result = $model->where($where)->where(function ($query) use ($biaaodata) {
                     $query->where(['sendtime' => ['>=', $biaaodata['0']]])->where(['sendtime' => ['<=', $biaaodata['1']]]);
-                })->limit($offset, $limit)->order('id', 'desc')->select();
+                })->limit($offset, $limit)->order('sendtime', 'desc')->select();
             }
 
             //管理员
@@ -86,6 +86,42 @@ class Kfnotice extends Base
                         $result[$key]['admin_name'] = $admins[$i]['user_name'];
                     }
                 }
+
+                $date = explode(' ',$vo->ctime);
+                $year = explode('-',$vo->ctime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['ctime'] = $date[1];
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['ctime'] = '昨天 '.$date[1];
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['ctime'] = date('m-d H:i:s',strtotime($vo->ctime));
+                    }
+                }
+
+                $date = explode(' ',$vo->readtime);
+                $year = explode('-',$vo->readtime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['readtime'] = $date[1];
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['readtime'] = '昨天 '.$date[1];
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['readtime'] = date('m-d H:i:s',strtotime($vo->readtime));
+                    }
+                }
+
+                $date = explode(' ',$vo->sendtime);
+                $year = explode('-',$vo->sendtime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['sendtime'] = $date[1];
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['sendtime'] = '昨天 '.$date[1];
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['sendtime'] = date('m-d H:i:s',strtotime($vo->sendtime));
+                    }
+                }
             }
 
             if (!$bibao) {

application/admin/controller/Messages.php

@@ -60,18 +60,21 @@ class Messages extends Base
             $result = model('Accountsmessage')->selectJoin($join,$leftjoin,$where, $start,$end,$offset, $limit);
             foreach($result as $key=>$vo){
 
-                // 优化显示附件
-                $images = $result[$key]['image'];
-                //转换成数组格式
-                $images = explode(",", $images);
-                if(!empty($images)){
-                    $img = '';
-                    for($i=0;$i<count($images);$i++){
-                        $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;margin-top:5px;">';
+                if(!empty($result[$key]['image'])){
+                    // 优化显示附件
+                    $images = $result[$key]['image'];
+                    //转换成数组格式
+                    $images = explode(",", $images);
+                    if(!empty($images)){
+                        $img = '';
+                        for($i=0;$i<count($images);$i++){
+                            $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;margin-top:5px;">';
+                        }
+                        $result[$key]['image'] = $img;
                     }
-                    $result[$key]['image'] = $img;
                 }
 
+
                 // 优化时间
                 if(null != $vo['add_time']){
                     $result[$key]['add_time'] = date('Y-m-d H:m:s',$result[$key]['add_time']);

application/admin/view/report/attendancereport.html

@@ -34,8 +34,9 @@
                     </div>
 
                     <div class="form-group">
-                        <div class="layui-input-inline">
-                            <select name="groupid" id="groupid" class="form-control">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="groupid" value="0"/>
+                            <select lay-verify="required" lay-filter="groupid">
                                 <option value="0" selected>所有分组</option>
                                 {volist name="groups" id="vo"}
                                 <option value="{$vo.id}">{$vo.name}</option>
@@ -44,6 +45,17 @@
                         </div>
                     </div>
 
+                    <!--<div class="form-group">-->
+                        <!--<div class="layui-input-inline">-->
+                            <!--<select name="groupid" id="groupid" class="form-control">-->
+                                <!--<option value="0" selected>所有分组</option>-->
+                                <!--{volist name="groups" id="vo"}-->
+                                <!--<option value="{$vo.id}">{$vo.name}</option>-->
+                                <!--{/volist}-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
+
                     <div class="form-group">
                         <button class="btn btn-primary" type="button" id="search"><strong>搜 索</strong>
                         </button>
@@ -89,6 +101,18 @@
 <script src="__JS__/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="__JS__/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
 <script src="__JS__/layui/layui.all.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(groupid)', function(value){
+            $("#groupid").val(value.value);
+            onSearch()
+        });
+    });
+
+</script>
 <script type="text/javascript">
     var ReturnRes;
 
@@ -123,6 +147,7 @@
                 var param = {
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
+                    groupid:$('#groupid').val(),
                     searchText: getSearch()
                 };
                 return param;

application/database.php

@@ -13,13 +13,13 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '192.168.2.200',
+    'hostname'        => '192.168.2.220',
     // 数据库名
     'database'        => 'customer_service',
     // 用户名
-    'username'        => 'vali',
+    'username'        => 'ethan',
     // 密码
-    'password'        => '1234',
+    'password'        => 'ethan1234',
     // 端口
     'hostport'        => '3306',
     // 连接dsn