Commit cf62224d by mengxy

消息中心

parent 6999b2bc
...@@ -25,14 +25,12 @@ public class NoticeService{ ...@@ -25,14 +25,12 @@ public class NoticeService{
*/ */
public Page<ReportNotice> selectBySendToId(Page<ReportNotice> page, ReportNotice reportNotice, String sendToId) throws Exception{ public Page<ReportNotice> selectBySendToId(Page<ReportNotice> page, ReportNotice reportNotice, String sendToId) throws Exception{
List<ReportNotice> noticeList = noticeMapper.selectBySendToId(sendToId); List<ReportNotice> noticeList = noticeMapper.selectBySendToId(sendToId);
long l = 0;
for(ReportNotice notice:noticeList){ for(ReportNotice notice:noticeList){
User user = UserUtils.get(notice.getSendFromId()); User user = UserUtils.get(notice.getSendFromId());
notice.setSendFromId(user.getName()); notice.setSendFromId(user.getName());
l++;
} }
page.setList(noticeList); page.setList(noticeList);
page.setCount(l); page.setCount(noticeList.size());
return page; return page;
} }
public void updateByPrimaryKeySelective(ReportNotice record) throws Exception{ public void updateByPrimaryKeySelective(ReportNotice record) throws Exception{
......
...@@ -156,5 +156,6 @@ ...@@ -156,5 +156,6 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM report_notice FROM report_notice
WHERE send_to_id = #{sendToId,jdbcType=VARCHAR} WHERE send_to_id = #{sendToId,jdbcType=VARCHAR}
order by create_date desc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
window.location.href = "${ctx}/notice/read?idArray="+idArray; window.location.href = "${ctx}/notice/read?idArray="+idArray;
}else { }else {
//弹窗 //弹窗
//alert("全部数据已为已读"); top.$.jBox.tip("所有数据已读,请勿重复操作","系统提示",null,null);
} }
} }
},{buttonsFocus:1}); },{buttonsFocus:1});
......
...@@ -247,7 +247,9 @@ ...@@ -247,7 +247,9 @@
<td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td> <td style="width: 10%">&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
</tr> </tr>
<tr height="60"> <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;融创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.offline}</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;电话&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.phone}</td> <td>&nbsp;&nbsp;&nbsp;&nbsp;电话&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.phone}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment