Skip to content

S
sunac_report
Commit 686492f9 by java-lixy
Options

1128修改方案

parent 2421542b
Showing with 132 additions and 156 deletions
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -66,7 +66,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String[] types;//新业务类型
@ExcelField(title="被举报项目", align=2, sort=24)
@ExcelField(title="被举报项目/被举报部门", align=2, sort=24)
public String getReportProject() {
return reportProject;
}
......
src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
......@@ -96,6 +96,10 @@ public class ReportToWordController {
reportProject.getCell(0).setText("被举报项目：");
reportProject.addNewTableCell().setText(reportEntity.getReportProject()==null?"":reportEntity.getReportProject());
XWPFTableRow supplementTitle = basicInfoTable.createRow();
supplementTitle.getCell(0).setText("标题：");
supplementTitle.addNewTableCell().setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
//表格第二行
XWPFTableRow supplementInformant = basicInfoTable.createRow();
supplementInformant.getCell(0).setText("被举报人：");
......@@ -229,17 +233,7 @@ public class ReportToWordController {
supplementInfoTableWidth.setW(BigInteger.valueOf(9072));
//表格第一行
XWPFTableRow supplementTitle = supplementInfoTable.getRow(0);
supplementTitle.getCell(0).setText("标题：");
supplementTitle.addNewTableCell().setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
//表格第二行
XWPFTableRow supplementCompany = supplementInfoTable.createRow();
supplementCompany.getCell(0).setText("被举报公司：");
supplementCompany.getCell(1).setText(reportEntity.getSupplementCompany() == null ? "" : reportEntity.getSupplementCompany());
//表格第三行
XWPFTableRow supplementDepartment = supplementInfoTable.createRow();
supplementDepartment.getCell(0).setText("被举报部门：");
supplementDepartment.getCell(1).setText(reportEntity.getSupplementDepartment() == null ? "" : reportEntity.getSupplementDepartment());
//表格第四行
XWPFTableRow supplementType = supplementInfoTable.createRow();
supplementType.getCell(0).setText("业务类型：");
......
src/main/resources/mappings/modules/front/report/FrontReportDao.xml
......@@ -42,6 +42,7 @@
report_source,
report_status,
supplement_informant,
supplement_title,
exchange_before_user,
exchange_after_user,
create_by,
......@@ -61,6 +62,7 @@
#{reportSource},
#{reportStatus},
#{supplementInformant},
#{supplementTitle},
#{exchangeBeforeUser},
#{exchangeAfterUser},
#{createBy},
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -210,10 +210,7 @@
<update id="addTrack">
UPDATE ct_bbtc_report SET
supplement_company = #{supplementCompany},
supplement_department = #{supplementDepartment},
supplement_informant = #{supplementInformant},
supplement_title = #{supplementTitle},
supplement_type = #{supplementType},
supplement_area = #{supplementArea},
supplement_project = #{supplementProject},
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -92,6 +92,12 @@
</div>
</div>
<div class="control-group">
<label class="control-label">标题:</label>
<div class="controls">
<form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报人:</label>
<div class="controls">
<form:input path="supplementInformant" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -141,7 +141,7 @@
<td>${vs.count}</td>
<td>${report.supplementTitle}</td>
<td>${report.supplementType}</td>
<td>${report.reportProject}/${report.supplementDepartment}</td>
<td>${report.reportProject}</td>
<td>${report.oaname}</td>
<td>${report.reportPersonName}</td>
<td>${report.reportPersonTel}</td>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -62,94 +62,12 @@
ck[number[i]-1].checked=true;
}
//发邮件
<%--$("#btnMail").click(function () {--%>
<%--var supplementType = $("#supplementType").find("option:selected").text();--%>
<%--var supplementInformant = "${report.supplementInformant}";--%>
<%--if(supplementType == "请选择"){--%>
<%--supplementType = "${report.reportProject}";--%>
<%--}--%>
<%--var path = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作";--%>
<%--path += "&body=Dear,<br/>附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。<br/>谢谢！";--%>
<%--//path += "<br/><br/><br/>%0D%0A${userName}";--%>
<%--path += "</p>举报内容</br>";--%>
<%--path += "被举报项目:${report.reportProject}</br>";--%>
<%--path += "被举报人:${report.supplementInformant}</br>";--%>
<%--path += "举报时间:${report.reportTime}</br>";--%>
<%--path += "所在城市:${report.reportCity}</br>";--%>
<%--path += "内容:${report.reportContent}</br>";--%>
<%--path += "附件:</br>";--%>
<%--$("#attachment1").find("[class='attachmentClass']").each(function(){--%>
<%--var url = $(this).text();--%>
<%--path += url;--%>
<%--});--%>
<%--path += "</br>举报人信息</br>";--%>
<%--path += "姓名:${report.reportPersonName}</br>";--%>
<%--path += "手机号:${report.reportPersonTel}</br>";--%>
<%--path += "Email:${report.reportPersonEmail}</br>";--%>
<%--var reportSource = "${report.reportSource}";--%>
<%--if (reportSource == "web"){--%>
<%--reportSource = "官网";--%>
<%--}else if (reportSource == "oa"){--%>
<%--reportSource = "融创OA系统";--%>
<%--}else if (reportSource == "supplier"){--%>
<%--reportSource = "供应商系统";--%>
<%--}else if (reportSource == "wechat"){--%>
<%--reportSource = "微信公众号";--%>
<%--}else if (reportSource == "sunacE"){--%>
<%--reportSource = "融E";--%>
<%--}else if (reportSource == "offline"){--%>
<%--reportSource = "线下扫码";--%>
<%--}else if (reportSource == "tel"){--%>
<%--reportSource = "电话";--%>
<%--}else if (reportSource == "email"){--%>
<%--reportSource = "邮件";--%>
<%--}else if (reportSource == "visit"){--%>
<%--reportSource = "来访";--%>
<%--}--%>
<%--path += "举报途径:"+reportSource+"</br>";--%>
<%--var reportStatus = "${report.reportStatus}";--%>
<%--if (reportStatus != "0"){--%>
<%--path += "举报信息补充</br>";--%>
<%--path += "标题:${report.supplementTitle}</br>";--%>
<%--path += "被举报公司:${report.supplementCompany}</br>";--%>
<%--path += "被举报部门:${report.supplementDepartment}</br>";--%>
<%--var supplementTypeStr = "${supplementTypeStr}";--%>
<%--path += "业务类型:"+supplementTypeStr+"</br>";--%>
<%--var supplementArea = "${report.supplementArea}";--%>
<%--if (supplementArea == "North China"){--%>
<%--supplementArea = "华北区域公司";--%>
<%--}else if (supplementArea == "BeiJing"){--%>
<%--supplementArea = "北京区域公司";--%>
<%--}else if (supplementArea == "ShangHai"){--%>
<%--supplementArea = "上海区域公司";--%>
<%--}else if (supplementArea == "SouthWest"){--%>
<%--supplementArea = "西南区域公司";--%>
<%--}else if (supplementArea == "SouthEast"){--%>
<%--supplementArea = "东南区域公司";--%>
<%--}else if (supplementArea == "Central China"){--%>
<%--supplementArea = "华中区域公司";--%>
<%--}else if (supplementArea == "GuangShen"){--%>
<%--supplementArea = "广深区域公司";--%>
<%--}else if (supplementArea == "Hainan"){--%>
<%--supplementArea = "海南区域公司";--%>
<%--}else if (supplementArea == "Group"){--%>
<%--supplementArea = "集团本部";--%>
<%--}--%>
<%--path += "被举报区域:"+ supplementArea +"</br>";--%>
<%--//path += "被举报项目:${report.supplementProject}</br>";--%>
<%--path += "内容:${report.supplementContent}</br>";--%>
<%--path += "附件:</br>";--%>
<%--$("#attachment2").find("[class='attachmentClass']").each(function(){--%>
<%--var url = $(this).text();--%>
<%--path += url;--%>
<%--});--%>
<%--}--%>
<%--window.location.href = path;--%>
<%--});--%>
$("#reportDetail input[type='text']").each(function(){
// alert($(this).val());
$(this).attr("disabled",true);
});
});
//发邮件
function ceshi(){
var supplementType = $("#supplementType").find("option:selected").text();
var supplementInformant = "${report.supplementInformant}";
......@@ -162,6 +80,7 @@
//path += "<br/><br/><br/>%0D%0A${userName}";
path += "</p>举报内容</br>";
path += "被举报项目:${report.reportProject}</br>";
path += "标题:${report.supplementTitle}</br>";
path += "被举报人:${report.supplementInformant}</br>";
path += "举报时间:${report.reportTime}</br>";
path += "所在城市:${report.reportCity}</br>";
......@@ -199,9 +118,6 @@
var reportStatus = "${report.reportStatus}";
if (reportStatus != "0"){
path += "举报信息补充</br>";
path += "标题:${report.supplementTitle}</br>";
path += "被举报公司:${report.supplementCompany}</br>";
path += "被举报部门:${report.supplementDepartment}</br>";
var supplementTypeStr = "${supplementTypeStr}";
path += "业务类型:"+supplementTypeStr+"</br>";
var supplementArea = "${report.supplementArea}";
......@@ -290,53 +206,121 @@
<li class="active"><a href="${ctx}/report/track">跟踪举报信息</a></li>
</ul>
<br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<div id="attachment1" style="display: none">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" class="attachmentClass" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
</div>
<span class="title">举报信息补充</span>
<div class="control-group">
<label class="control-label">被举报公司:</label>
<div class="controls">
<form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报部门:</label>
<div id="reportDetail">
<span class="title">举报内容</span>
<div class="control-group">
<label class="control-label">被举报项目:</label>
<div class="controls">
<form:input path="supplementDepartment" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
<form:input path="reportProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
</div>
<div class="control-group">
<div class="control-group">
<label class="control-label">标题:</label>
<div class="controls">
<form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">被举报人:</label>
<div class="controls">
<form:input path="supplementInformant" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报时间:</label>
<div class="controls">
<form:input path="reportTime" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">所在城市:</label>
<div class="controls">
<form:input path="reportCity" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="500" class="input-xxlarge" disabled="true"/>
</div>
</div>
<div class="control-group">
<label class="control-label">附件:</label>
<div class="controls">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
${vs.count}.<a href="${reportAttachment.attachmentPath}" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</div>
</div>
<span class="title">举报人信息</span>
<div class="control-group">
<label class="control-label">姓名:</label>
<div class="controls">
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">手机号:</label>
<div class="controls">
<form:input path="reportPersonTel" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">Email:</label>
<div class="controls">
<form:input path="reportPersonEmail" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
htmlEscape="false" disabled="true"/>
</div>
</div>
</div>
<span class="title">举报信息补充</span>
<%--<div class="control-group">--%>
<%--<label class="control-label">被举报公司:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">被举报部门:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementDepartment" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">标题:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<div class="control-group">
<label class="control-label">业务类型:</label>
<div class="controls">
<span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value" class="required"/>
</span>
<%--<form:select id="supplementType" path="supplementType" class="input-small required">--%>
<%--<form:option value=" ">请选择</form:option>--%>
<%--<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"--%>
<%--htmlEscape="false"/></form:select>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">被举报区域:</label>
<div class="controls">
<form:select id="supplementArea" path="supplementArea" class="input-small required">
......@@ -345,22 +329,15 @@
htmlEscape="false"/></form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<%--<div class="control-group">--%>
<%--<label class="control-label">被举报项目:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4"
maxlength="500" class="input-xxlarge" placeholder="最多输入3000个字符"/>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">附件:</label>
<div id="attachment2" class="controls">
<c:if test="${supplementAttachmentList ne null}">
......@@ -373,7 +350,7 @@
<sys:ckfinder input="nameFile" type="files" uploadPath="/file"
selectMultiple="true" maxWidth="100" maxHeight="100"/>
</div>
</div>
</div>
<%--<span class="title">信息分类</span>--%>
<%--<div class="control-group">--%>
<%--<c:if test="${report.dealResult ne '3'}">--%>
......@@ -428,15 +405,15 @@
<%--</div>--%>
<%--</div>--%>
<%--</div>--%>
<span class="title">处理结果</span>
<div class="control-group">
<span class="title">处理结果</span>
<div class="control-group">
<label class="control-label">处理人:</label>
<div class="controls">
<form:input path="dealPersonName" value="${currentUser}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
</div>
<div class="control-group">
<label class="control-label">处理成果文件:</label>
<div id="attachment3" class="controls">
<c:if test="${dealAttachmentList ne null}">
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -310,9 +310,9 @@
<th>ID</th>
<th>标题</th>
<th>业务类型</th>
<th>被举报公司</th>
<th>举报人</th>
<th>举报人电话</th>
<th>被举报项目/部门</th>
<th>所在城市</th>
<th>被举报人</th>
<th>操作</th>
</tr>
</thead>
......@@ -331,9 +331,9 @@
<c:if test="${report.supplementType eq '6'}">物业</c:if>
<c:if test="${report.supplementType eq '7'}">投诉</c:if>
</td>
<td>${report.supplementCompany}</td>
<td>${report.reportPersonName}</td>
<td>${report.reportPersonTel}</td>
<td>${report.reportProject}</td>
<td>${report.reportCity}</td>
<td>${report.supplementInformant}</td>
<td>
<a href="${ctx}/report/view?id=${report.id}">查看</a>
</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