Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ejweb/modules/workbench/dao/ReportNoticeMapper.java

+package com.ejweb.modules.workbench.dao;
+
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.workbench.entity.ReportNotice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@MyBatisDao
+public interface ReportNoticeMapper extends CrudDao<ReportNotice> {
+    int deleteByPrimaryKey(String id);
+
+    int insert(ReportNotice record);
+
+    int insertSelective(ReportNotice record);
+
+    ReportNotice selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(ReportNotice record) throws Exception;
+
+    int updateByPrimaryKey(ReportNotice record);
+
+    /**
+     * 获取列表
+     */
+    List<ReportNotice> selectBySendToId(@Param("sendToId") String sendToId) throws Exception;
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/workbench/entity/ReportNotice.java

+package com.ejweb.modules.workbench.entity;
+
+import com.ejweb.core.persistence.DataEntity;
+import com.ejweb.core.persistence.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlTransient;
+import java.util.Date;
+
+public class ReportNotice{
+
+    private String id;
+
+    private String reportId;
+
+    private String title;
+
+    private String sendTime;
+
+    private String sendFromId;
+
+    private String sendToId;
+
+    private String status;
+
+    private String createBy;
+
+    private Date createDate;
+
+    private String updateBy;
+
+    private Date updateDate;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(String sendTime) {
+        this.sendTime = sendTime;
+    }
+
+    public String getSendFromId() {
+        return sendFromId;
+    }
+
+    public void setSendFromId(String sendFromId) {
+        this.sendFromId = sendFromId;
+    }
+
+    public String getSendToId() {
+        return sendToId;
+    }
+
+    public void setSendToId(String sendToId) {
+        this.sendToId = sendToId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+}
\ No newline at end of file

src/main/java/com/ejweb/modules/workbench/service/NoticeService.java

+package com.ejweb.modules.workbench.service;
+
+import com.ejweb.core.persistence.Page;
+import com.ejweb.core.service.CrudService;
+import com.ejweb.modules.sys.entity.User;
+import com.ejweb.modules.sys.utils.UserUtils;
+import com.ejweb.modules.workbench.dao.ReportNoticeMapper;
+import com.ejweb.modules.workbench.entity.ReportNotice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by mengxy on 2017/9/15.
+ */
+@Service
+public class NoticeService{
+
+    @Autowired
+    private ReportNoticeMapper noticeMapper;
+
+    /**
+     * 获取列表
+     */
+    public Page<ReportNotice> selectBySendToId(Page<ReportNotice> page, ReportNotice reportNotice, String sendToId) throws Exception{
+        List<ReportNotice> noticeList = noticeMapper.selectBySendToId(sendToId);
+        for(ReportNotice notice:noticeList){
+            User user = UserUtils.get(notice.getSendFromId());
+            notice.setSendFromId(user.getName());
+        }
+        page.setList(noticeList);
+        page.setCount(noticeList.size());
+        return page;
+    }
+    public void updateByPrimaryKeySelective(ReportNotice record) throws Exception{
+        record.setStatus("1");
+        noticeMapper.updateByPrimaryKeySelective(record);
+    }
+}

src/main/java/com/ejweb/modules/workbench/web/NoticeController.java

+package com.ejweb.modules.workbench.web;
+
+import com.ejweb.core.base.BaseController;
+import com.ejweb.core.persistence.Page;
+import com.ejweb.modules.report.service.ReportService;
+import com.ejweb.modules.sys.entity.User;
+import com.ejweb.modules.sys.utils.UserUtils;
+import com.ejweb.modules.workbench.entity.ReportNotice;
+import com.ejweb.modules.workbench.service.NoticeService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by mengxy on 2017/9/15.
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/notice")
+public class NoticeController extends BaseController {
+
+    @Autowired
+    private NoticeService noticeService;
+    @Autowired
+    private ReportService reportService;
+
+    @RequiresPermissions("notice:view")
+    @RequestMapping("list")
+    public String list(HttpServletRequest request, HttpServletResponse response, Model model){
+        try {
+            //获取登录用户
+            User user = UserUtils.getUser();
+            if(user != null){
+                //判断登录人的角色
+                String roleName = reportService.findRole(user);
+                if (StringUtils.isNotBlank(roleName)) {
+                    String isAdmin = "";
+                    if (roleName.equals("系统管理员")) {
+                        isAdmin = "Y";
+                    }else {
+                        isAdmin = "N";
+                    }
+                    Page<ReportNotice> noticePage = noticeService.selectBySendToId(new Page<ReportNotice>(request, response),new ReportNotice(),user.getId());
+                    int i = 0;
+                    String idArray = "";
+                    for(ReportNotice notice:noticePage.getList()) {
+                        if("0".equals(notice.getStatus())){
+                            if (i == 0) {
+                                idArray += notice.getId();
+                            } else {
+                                idArray += "," + notice.getId();
+                            }
+                            i++;
+                        }
+                    }
+                    model.addAttribute("isAdmin",isAdmin);
+                    model.addAttribute("noticePage",noticePage);
+                    model.addAttribute("idArray",idArray);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "modules/workbench/notice";
+    }
+
+    @RequestMapping("view")
+    public String view(String id,String reportId){
+        try {
+            ReportNotice notice = new ReportNotice();
+            notice.setId(id);
+            noticeService.updateByPrimaryKeySelective(notice);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "redirect:" + adminPath + "/report/view?id="+reportId;
+    }
+
+    @RequestMapping("read")
+    public String read(String idArray){
+        try {
+            if(StringUtils.isNotBlank(idArray)){
+                String[] ids = idArray.split(",");
+                for (int i=0;i<ids.length;i++){
+                    ReportNotice notice = new ReportNotice();
+                    notice.setId(ids[i]);
+                    noticeService.updateByPrimaryKeySelective(notice);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "redirect:" + adminPath + "/notice/list";
+    }
+}

src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java

@@ -87,46 +87,6 @@ public class WorkbenchController extends BaseController {
         return res;
     }
 
-//    @RequestMapping("/getRepResult")
-//    @ResponseBody
-//    public JSONObject getRepResult(WorkbenchBean bean){
-//        JSONObject res = new JSONObject();
-//        try {
-//            User user = UserUtils.getUser();
-//            bean = getWorkbenchByUser(user, bean);
-//            res.put("invalid",bean.getInvalid());
-//            res.put("complainNum",bean.getComplainNum());
-//            res.put("verified",bean.getVerified());
-//            res.put("startDate",bean.getStartDate());
-//            res.put("endDate",bean.getEndDate());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return res;
-//    }
-
-//    @RequestMapping("/getRepType")
-//    @ResponseBody
-//    public JSONObject getRepType(WorkbenchBean bean){
-//        JSONObject res = new JSONObject();
-//        try {
-//            User user = UserUtils.getUser();
-//            bean = getWorkbenchByUser(user, bean);
-//            res.put("sale",bean.getSale());
-//            res.put("project",bean.getProject());
-//            res.put("cost",bean.getCost());
-//            res.put("forMining",bean.getForMining());
-//            res.put("manpower",bean.getManpower());
-//            res.put("tenement",bean.getTenement());
-//            res.put("complain",bean.getComplain());
-//            res.put("startDate",bean.getStartDate());
-//            res.put("endDate",bean.getEndDate());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return res;
-//    }
-
     public WorkbenchBean getWorkbenchByUser(User user,WorkbenchBean bean){
         if(user != null) {
             try {

src/main/resources/mappings/modules/workbench/ReportNoticeMapper.xml

+<?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.ejweb.modules.workbench.dao.ReportNoticeMapper" >
+  <resultMap id="BaseResultMap" type="com.ejweb.modules.workbench.entity.ReportNotice" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="report_id" property="reportId" jdbcType="VARCHAR" />
+    <result column="title" property="title" jdbcType="VARCHAR" />
+    <result column="send_time" property="sendTime" jdbcType="VARCHAR" />
+    <result column="send_from_id" property="sendFromId" jdbcType="VARCHAR" />
+    <result column="send_to_id" property="sendToId" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="VARCHAR" />
+    <result column="create_by" property="createBy" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, report_id, title, send_time, send_from_id, send_to_id, status, create_by, DATE_FORMAT(create_date,'%Y-%m-%d %H:%i:%s'), update_by,
+    DATE_FORMAT(update_date,'%Y-%m-%d %H:%i:%s')
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from report_notice
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from report_notice
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.ejweb.modules.workbench.entity.ReportNotice" >
+    insert into report_notice (id, title, send_time, 
+      send_from_id, send_to_id, status, 
+      create_by, create_date, update_by, 
+      update_date)
+    values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{sendTime,jdbcType=VARCHAR}, 
+      #{sendFromId,jdbcType=VARCHAR}, #{sendToId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ejweb.modules.workbench.entity.ReportNotice" >
+    insert into report_notice
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="title != null" >
+        title,
+      </if>
+      <if test="sendTime != null" >
+        send_time,
+      </if>
+      <if test="sendFromId != null" >
+        send_from_id,
+      </if>
+      <if test="sendToId != null" >
+        send_to_id,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="createBy != null" >
+        create_by,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateBy != null" >
+        update_by,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null" >
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null" >
+        #{sendTime,jdbcType=VARCHAR},
+      </if>
+      <if test="sendFromId != null" >
+        #{sendFromId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendToId != null" >
+        #{sendToId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null" >
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null" >
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ejweb.modules.workbench.entity.ReportNotice" >
+    update report_notice
+    <set >
+      <if test="title != null" >
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null" >
+        send_time = #{sendTime,jdbcType=VARCHAR},
+      </if>
+      <if test="sendFromId != null" >
+        send_from_id = #{sendFromId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendToId != null" >
+        send_to_id = #{sendToId,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null" >
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null" >
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ejweb.modules.workbench.entity.ReportNotice" >
+    update report_notice
+    set title = #{title,jdbcType=VARCHAR},
+      send_time = #{sendTime,jdbcType=VARCHAR},
+      send_from_id = #{sendFromId,jdbcType=VARCHAR},
+      send_to_id = #{sendToId,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectBySendToId" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM report_notice
+    WHERE send_to_id = #{sendToId,jdbcType=VARCHAR}
+    order by create_date desc
+  </select>
+</mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/workbench/notice.jsp

+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+    <title>消息中心</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#read").click(function () {
+                top.$.jBox.confirm("确认要全部设为已读吗？","系统提示",function(v,h,f){
+                    if(v=="ok"){
+                        var idArray= $("#idArray").val();
+                        if(idArray != null && idArray != ""){
+                            window.location.href = "${ctx}/notice/read?idArray="+idArray;
+                        }else {
+                            //弹窗
+                            top.$.jBox.tip("所有数据已读，请勿重复操作","系统提示",null,null);
+                        }
+                    }
+                },{buttonsFocus:1});
+                top.$('.jbox-body .jbox-icon').css('top','55px');
+            });
+            $("#refresh").click(function () {
+                window.location.href = "${ctx}/notice/list";
+            });
+        });
+    </script>
+</head>
+<body>
+    <ul class="nav nav-tabs">
+        <li style="float: right;"><input id="refresh" class="btn btn-primary" type="button" value="刷新"/></li>
+        <li style="float: right;"><label>&nbsp;&nbsp;</label></li>
+        <li style="float: right;"><input id="read" class="btn btn-primary" type="button" value="全部设为已读"/></li>
+    </ul>
+    <form:form id="searchForm" modelAttribute="" action="" method="post" class="breadcrumb form-search">
+        <input id="pageNo" name="pageNo" type="hidden" value="${noticePage.pageNo}"/>
+        <input id="pageSize" name="pageSize" type="hidden" value="${noticePage.pageSize}"/>
+        <input id="idArray" name="" type="hidden" value="${idArray}"/>
+    </form:form>
+    <sys:message content="${message}"/>
+    <table id="contentTable" class="table table-striped table-bordered table-condensed">
+        <thead>
+            <tr>
+                <th>ID</th>
+                <th>标题</th>
+                <th>发送时间</th>
+                <th>发送人</th>
+                <th>状态</th>
+            </tr>
+        </thead>
+        <tbody>
+        <c:if test="${noticePage.list.size()>0}">
+            <c:forEach items="${noticePage.list}" var="notice" varStatus="vs">
+                <tr>
+                    <td>${vs.count}</td>
+                    <td>
+                        <c:if test="${isAdmin eq 'Y'}"><a href="${ctx}/notice/view?id=${notice.id}&reportId=${notice.reportId}">"${notice.title}"-已由${notice.sendFromId}于${notice.sendTime}处理完成。</a></c:if>
+                        <c:if test="${isAdmin eq 'N'}"><a href="${ctx}/notice/view?id=${notice.id}&reportId=${notice.reportId}">请处理-"${notice.title}"。</a></c:if>
+                    </td>
+                    <td>${notice.sendTime}</td>
+                    <td>${notice.sendFromId}</td>
+                    <td>
+                        <c:if test="${notice.status eq '0'}">未读</c:if>
+                        <c:if test="${notice.status eq '1'}">已读</c:if>
+                    </td>
+                </tr>
+            </c:forEach>
+        </c:if>
+        </tbody>
+    </table>
+    <c:if test="${noticePage.list.size()=='0'}">
+        <span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
+    </c:if>
+    <c:if test="${noticePage.list.size()>0}">
+        <div class="pagination">${noticePage}</div>
+    </c:if>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp

@@ -247,7 +247,9 @@
                         <td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
                     </tr>
                     <tr height="60">
-                        <td style="width: 10%"><h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.total}</h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;举报事件</td>
+                        <td style="width: 10%"><h4>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.total}</h4>
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;举报事件
+                        </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;融创OA系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.oa}</td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;线下扫码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.offline}</td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;电话&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.phone}</td>