Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

application/admin/controller/Sensitivec.php

@@ -173,7 +173,7 @@ class Sensitivec extends Base
         Loader::import('PHPExcel.PHPExcel.PHPExcel_Cell');
         //获取表单上传文件
         $file = request()->file('excel');
-        //return $file;
+//        return $file;
 
 //        if(request()->isAjax()){
 //            $file = input('param.file');
@@ -181,8 +181,8 @@ class Sensitivec extends Base
 //        }
 
         if(empty($file)){
-            $this->error('请先上传文件');
-            return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
+            //$this->error('请先上传文件');
+            return json(['code' => -4, 'data' => url('sensitivec/index'), 'msg' => '请先上传文件']);
         }
 
         $info = $file->validate(['ext' => 'xlsx'])->move(ROOT_PATH . 'public' . DS . 'uploads');

application/service/controller/Index.php

@@ -202,4 +202,56 @@ class Index extends Common
             return json(['code' => -1, 'data' => '', 'msg' => '失败']);
         }
     }
+
+
+    /**
+     * 获取未读公告
+     * @access public
+     * @return array JsonString
+     */
+    public function readnotice()
+    {
+        $user_id = input('post.user_id');
+        //获取未读公告
+        $readnotice = db('servicenotice')->field('id,uid,title,atext,sendtime')->where('readtime',0)->where('uid',$user_id)->where('sendtime','<',date('Y-m-d H:i:s',time()))->order('sendtime','desc')->select();
+
+        return json(['code' => 1, 'data' => $readnotice, 'msg' => '成功']);
+
+    }
+
+    /**
+     * 获取已读公告
+     * @access public
+     * @return array JsonString
+     */
+    public function unreadnotice()
+    {
+        $user_id = input('post.user_id');
+        //获取未读公告
+        $unreadnotice = db('servicenotice')->where('readtime','<>',0)->where('uid',$user_id)->order('sendtime','desc')->select();
+
+        return json(['code' => 1, 'data' => $unreadnotice, 'msg' => '成功']);
+
+    }
+
+    /**
+     * 修改公告阅读状态
+     * @access public
+     * @return array JsonString
+     */
+    public function updatenotice()
+    {
+        $servicenotice_id = input('post.servicenotice_id');
+
+        $data = db('servicenotice')->where('id',$servicenotice_id)->find();
+        if(empty($data)){
+            return json(['code' => 1, 'data' => '', 'msg' => '公告不存在']);
+        }
+
+        //修改公告阅读状态
+        db('servicenotice')->where('id',$servicenotice_id)->update(['readtime' => time()]);
+
+        return json(['code' => 1, 'data' => '', 'msg' => '公告阅读状态修改成功']);
+
+    }
 }