通知公告查询

tianhu-system/src/main/java/com/tianhu/system/controller/OwnNoticeController.java

@@ -4,13 +4,18 @@ import com.keao.tianhu.core.entity.R;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.core.web.page.TableDataInfo;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.domain.SysNotice;
 import com.tianhu.system.service.IOwnNoticeService;
 import com.tianhu.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 通知Controller
@@ -28,14 +33,31 @@ public class OwnNoticeController extends BaseController
     @Autowired
     private IOwnNoticeService iOwnNoticeService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 查询通知列表
      */
     @GetMapping("/list")
     public TableDataInfo list(SysNotice sysNotice)
     {
+        //获取当前企业的编号
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        Map map = new HashMap();
+        //用户id
+        map.put("userId",use.getUserId());
+        //企业id
+        map.put("companyId",use.getCompanyId());
+        //类型 00：待办 01：消息
+        map.put("type",sysNotice.getType());
+        //消息类型
+        map.put("noticeType",sysNotice.getNoticeType());
+        //待办类型
+        map.put("workType",sysNotice.getWorkType());
         startPage();
-        List<SysNotice> list = iSysNoticeService.selectNoticeList(sysNotice);
+        List<Map> list = iOwnNoticeService.selectOwnNoticeList(map);
         return getDataTable(list);
     }
 

tianhu-system/src/main/java/com/tianhu/system/mapper/OwnNoticeMapper.java

@@ -0,0 +1,24 @@
+package com.tianhu.system.mapper;
+
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.domain.OwnSysUser;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户表 数据层
+ *
+ * @author tianhu
+ */
+public interface OwnNoticeMapper
+{
+    /**
+     * 查询待办通知
+     *
+     * @param map 公告信息
+     * @return 公告集合
+     */
+    public List<Map> selectOwnNoticeList(Map map);
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IOwnNoticeService.java

@@ -1,8 +1,10 @@
 package com.tianhu.system.service;
 
 import com.keao.tianhu.core.entity.R;
+import com.tianhu.system.domain.SysNotice;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 通知Service接口
@@ -13,6 +15,14 @@ import java.util.List;
 public interface IOwnNoticeService
 {
     /**
+     * 查询待办通知
+     *
+     * @param map 公告信息
+     * @return 公告集合
+     */
+    public List<Map> selectOwnNoticeList(Map map);
+
+    /**
      *发送通知
      * @param companyId     企业id
      * @param tableId       表主键

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnNoticeServiceImpl.java

@@ -8,6 +8,7 @@ import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.common.impl.MessageUtilsServiceImpl;
 import com.tianhu.system.domain.SysNotice;
 import com.tianhu.system.domain.SysNoticeUserRel;
+import com.tianhu.system.mapper.OwnNoticeMapper;
 import com.tianhu.system.service.IOwnNoticeService;
 import com.tianhu.system.service.ISysNoticeService;
 import com.tianhu.system.service.ISysNoticeUserRelService;
@@ -35,12 +36,15 @@ public class OwnNoticeServiceImpl implements IOwnNoticeService
     @Autowired
     private ISysNoticeUserRelService iSysNoticeUserRelService;
 
-    @Autowired
-    private MessageUtilsServiceImpl messageUtilsService;
+//    @Autowired
+//    private MessageUtilsServiceImpl messageUtilsService;
 
     @Autowired
     private ISysUserService iSysUserService;
 
+    @Autowired
+    private OwnNoticeMapper ownNoticeMapper;
+
     /**
      * 通知类型 00待办
      */
@@ -57,6 +61,18 @@ public class OwnNoticeServiceImpl implements IOwnNoticeService
     static final String  SEND_MESSAGES = "1";
 
     /**
+     * 查询待办通知
+     *
+     * @param map 公告信息
+     * @return 公告集合
+     */
+    @Override
+    public List<Map> selectOwnNoticeList(Map map)
+    {
+        return ownNoticeMapper.selectOwnNoticeList(map);
+    }
+
+    /**
      * @param companyId     企业id
      * @param tableId       表主键
      * @param title         标题

tianhu-system/src/main/resources/mapper/system/OwnNoticeMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tianhu.system.mapper.OwnNoticeMapper">
+
+	<select id="selectOwnNoticeList" parameterType="map" resultType="map">
+		SELECT
+			notice_id			'noticeId',
+			table_id			'tableId',
+			notice_title		'noticeTitle',
+			type				'type',
+			notice_type			'noticeType',
+			work_type			'workType',
+			create_time			'createTime',
+			snyr_user_status	'snyrUserStatus'
+		FROM
+			sys_notice
+		LEFT JOIN sys_notice_user_rel
+			ON snyr_notice_id = notice_id
+		WHERE STATUS = '0'
+		<if test="companyId != null and companyId != ''">
+			AND company_id = #{companyId}
+		</if>
+		<if test="userId != null and userId != ''">
+			AND snyr_user_id = #{userId}
+		</if>
+		<if test="type != null and type != ''">
+			AND type = #{type}
+		</if>
+		<if test="noticeType != null and noticeType != ''">
+			AND notice_type = #{noticeType}
+		</if>
+		<if test="workType != null and workType != ''">
+			AND work_type = #{workType}
+		</if>
+		ORDER BY snyr_user_status,create_time DESC
+	</select>
+</mapper>