Commit 64c09567 by java-lixy

修改。。

parent b32f885f
...@@ -18,6 +18,8 @@ public class ReportNoticeEntity extends DataEntity<ReportNoticeEntity> { ...@@ -18,6 +18,8 @@ public class ReportNoticeEntity extends DataEntity<ReportNoticeEntity> {
private String status; private String status;
private String sendFromName;
public String getReportId() { public String getReportId() {
return reportId; return reportId;
} }
...@@ -65,4 +67,12 @@ public class ReportNoticeEntity extends DataEntity<ReportNoticeEntity> { ...@@ -65,4 +67,12 @@ public class ReportNoticeEntity extends DataEntity<ReportNoticeEntity> {
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getSendFromName() {
return sendFromName;
}
public void setSendFromName(String sendFromName) {
this.sendFromName = sendFromName;
}
} }
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<select id="findList" parameterType="ReportNoticeEntity" resultType="ReportNoticeEntity"> <select id="findList" parameterType="ReportNoticeEntity" resultType="ReportNoticeEntity">
SELECT SELECT
c.*, CU."NAME" c.*, CU.name AS "sendFromName"
FROM FROM
CT_BBTC_REPORT_NOTICE c CT_BBTC_REPORT_NOTICE c
LEFT JOIN CT_BBTC_SYS_USER cu ON c.send_to_id = cu.id LEFT JOIN CT_BBTC_SYS_USER cu ON c.send_from_id = cu.id
WHERE c.send_to_id = #{sendToId} WHERE c.send_to_id = #{sendToId}
ORDER BY ORDER BY
c.send_time DESC c.send_time DESC
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报项目/被举报部门:</label> <label class="control-label">被举报项目/被举报部门:</label>
<div class="controls"> <div class="controls">
<form:input path="supplementTitle" htmlEscape="false" maxlength="50" class="input-xlarge required" <form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required"
placeholder="最多输入50个字符"/> placeholder="最多输入50个字符"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">标题:</label> <label class="control-label">标题:</label>
<div class="controls"> <div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required"/> <form:input path="supplementTitle" htmlEscape="false" maxlength="50" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<td></td> <td></td>
<td><a href="${ctx}/notice/view?id=${notice.id}&reportId=${notice.reportId}"><span <c:if test="${notice.status eq '1'}">style="color: #6f4086"</c:if>>${notice.title}。</span></a></td> <td><a href="${ctx}/notice/view?id=${notice.id}&reportId=${notice.reportId}"><span <c:if test="${notice.status eq '1'}">style="color: #6f4086"</c:if>>${notice.title}。</span></a></td>
<td>${notice.sendTime}</td> <td>${notice.sendTime}</td>
<td>${notice.sendFromId}</td> <td>${notice.sendFromName}</td>
<td> <td>
<c:if test="${notice.status eq '0'}">未读</c:if> <c:if test="${notice.status eq '0'}">未读</c:if>
<c:if test="${notice.status eq '1'}">已读</c:if> <c:if test="${notice.status eq '1'}">已读</c:if>
......
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