Commit 058c0933 by xurui

放开root的退出

parent a83eed6f
...@@ -38,12 +38,20 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -38,12 +38,20 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String exchangeType; //举报改变类型 1移交 2转交 private String exchangeType; //举报改变类型 1移交 2转交
private String reportTimeFrom; //举报时间起 private String reportTimeFrom; //举报时间起
private String reportTimeTo; //举报时间止 private String reportTimeTo; //举报时间止
private List<ReportAttachmentEntity> reportAttachmentEntityList;
private String reportAttachment; //举报提交文件 private String reportAttachment; //举报提交文件
private String supplementAttachment; //补充提交文件 private String supplementAttachment; //补充提交文件
private String dealAttachment; //处理成果文件 private String dealAttachment; //处理成果文件
// private String ifDone; //是否完成
//
//
// public String getIfDone() {
// return ifDone;
// }
//
// public void setIfDone(String ifDone) {
// this.ifDone = ifDone;
// }
private List<ReportAttachmentEntity> reportAttachmentEntityList;
@ExcelField(title="被举报项目", align=2, sort=24) @ExcelField(title="被举报项目", align=2, sort=24)
public String getReportProject() { public String getReportProject() {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
}, },
subtitle: {//副标题 subtitle: {//副标题
align: 'right', align: 'right',
text: '总数&nbsp;:&nbsp;'+result.bench.repStatusTotal+'<br/><br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/><br/>核查中&nbsp;:&nbsp;'+result.processing+'<br/><br/>已处理&nbsp;:&nbsp;'+result.processed, text: '总数&nbsp;:&nbsp;'+result.bench.repStatusTotal+'<br/><br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/><br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/><br/>已处理&nbsp;:&nbsp;'+result.processed,
useHTML: true, useHTML: true,
verticalAlign: 'top' , verticalAlign: 'top' ,
x: -5 , x: -5 ,
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
name: '举报', name: '举报',
data: [ data: [
['未处理', result.unProcess], ['未处理', result.unProcess],
['核查中', result.processing], ['跟踪中', result.processing],
['已处理', result.processed], ['已处理', result.processed],
// { // {
// name: 'Chrome', // name: 'Chrome',
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
}, },
subtitle: {//副标题 subtitle: {//副标题
align: 'right', align: 'right',
text: '总数&nbsp;:&nbsp;'+result.bench.repResultTotal+'<br/><br/>无效&nbsp;:&nbsp;'+result.invalid+'<br/><br/>投诉&nbsp;:&nbsp;'+result.complainNum+'<br/><br/>举报&nbsp;:&nbsp;'+result.verified, text: '总数&nbsp;:&nbsp;'+result.bench.repResultTotal+'<br/><br/>举报无效&nbsp;:&nbsp;'+result.invalid+'<br/><br/>举报投诉&nbsp;:&nbsp;'+result.complainNum+'<br/><br/>举报受理&nbsp;:&nbsp;'+result.verified,
useHTML: true, useHTML: true,
verticalAlign: 'top' , verticalAlign: 'top' ,
x: -5 , x: -5 ,
...@@ -210,9 +210,9 @@ ...@@ -210,9 +210,9 @@
type: 'pie', type: 'pie',
name: '举报', name: '举报',
data: [ data: [
['无效', result.invalid], ['举报无效', result.invalid],
['投诉', result.complainNum], ['举报投诉', result.complainNum],
['举报', result.verified], ['举报受理', result.verified],
] ]
}] }]
}); });
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
</form:form> </form:form>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li <c:if test="${workbench.processStatus eq '0'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=0&startDate=${workbench.startDate}&endDate=${workbench.endDate}">未处理举报</a></li> <li <c:if test="${workbench.processStatus eq '0'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=0&startDate=${workbench.startDate}&endDate=${workbench.endDate}">未处理举报</a></li>
<li <c:if test="${workbench.processStatus eq '1'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=1&startDate=${workbench.startDate}&endDate=${workbench.endDate}">核查中举报</a></li> <li <c:if test="${workbench.processStatus eq '1'}">class="active"</c:if>><a href="${ctx}/workbench/list?processStatus=1&startDate=${workbench.startDate}&endDate=${workbench.endDate}">跟踪中举报</a></li>
<li style="float: right;"><a href="${ctx}/report/list">查看更多</a></li> <li style="float: right;"><a href="${ctx}/report/list">查看更多</a></li>
</ul> </ul>
<sys:message content="${message}"/> <sys:message content="${message}"/>
......
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