Skip to content

S
sunac_report
Commit ca6b6000 by Java-李昕颖
Options

工作台、转文档等修改

parent 55cb247d
Showing with 178 additions and 56 deletions
src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java
...@@ -228,7 +228,31 @@ public class ReportToPdfController extends BaseController { ...@@ -228,7 +228,31 @@ public class ReportToPdfController extends BaseController {
PdfPCell supplementArea = new PdfPCell(new Paragraph("被举报区域：",textfont)); PdfPCell supplementArea = new PdfPCell(new Paragraph("被举报区域：",textfont));
supplementArea.setBorderWidth(0); supplementArea.setBorderWidth(0);
table3.addCell(supplementArea); table3.addCell(supplementArea);
PdfPCell supplementArea1 = new PdfPCell(new Paragraph(reportEntity.getSupplementArea()==null?"":reportEntity.getSupplementArea(),textfont)); String supplement_area = reportEntity.getSupplementArea();
if (StringUtils.isNotBlank(supplement_area)){
if (supplement_area.equals("North China")){
supplement_area = "华北区域公司";
}else if (supplement_area.equals("BeiJing")){
supplement_area = "北京区域公司";
}else if (supplement_area.equals("ShangHai")){
supplement_area = "上海区域公司";
}else if (supplement_area.equals("SouthWest")){
supplement_area = "西南区域公司";
}else if (supplement_area.equals("SouthEast")){
supplement_area = "东南区域公司";
}else if (supplement_area.equals("Central China")){
supplement_area = "华中区域公司";
}else if (supplement_area.equals("GuangShen")){
supplement_area = "广深区域公司";
}else if (supplement_area.equals("Hainan")){
supplement_area = "海南区域公司";
}else if (supplement_area.equals("Group")){
supplement_area = "集团本部";
}
}else {
supplement_area = "";
}
PdfPCell supplementArea1 = new PdfPCell(new Paragraph(supplement_area,textfont));
supplementArea1.setBorderWidth(0); supplementArea1.setBorderWidth(0);
table3.addCell(supplementArea1); table3.addCell(supplementArea1);
PdfPCell supplementProject = new PdfPCell(new Paragraph("被举报项目：",textfont)); PdfPCell supplementProject = new PdfPCell(new Paragraph("被举报项目：",textfont));
...@@ -254,8 +278,8 @@ public class ReportToPdfController extends BaseController { ...@@ -254,8 +278,8 @@ public class ReportToPdfController extends BaseController {
List<ReportAttachmentEntity> list1 = reportService.getAttachmentInfo(reportAttachmentBean); List<ReportAttachmentEntity> list1 = reportService.getAttachmentInfo(reportAttachmentBean);
Paragraph paragraphPath2 = new Paragraph(); Paragraph paragraphPath2 = new Paragraph();
if (list != null && list.size() != 0) { if (list1 != null && list1.size() != 0) {
for (ReportAttachmentEntity reportAttachmentEntity : list) { for (ReportAttachmentEntity reportAttachmentEntity : list1) {
Chunk chunk = new Chunk(reportAttachmentEntity.getAttachmentPath(),urlfont); Chunk chunk = new Chunk(reportAttachmentEntity.getAttachmentPath(),urlfont);
paragraphPath2.add(chunk); paragraphPath2.add(chunk);
paragraphPath2.add(Chunk.NEWLINE); paragraphPath2.add(Chunk.NEWLINE);
......
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
...@@ -42,16 +42,16 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> { ...@@ -42,16 +42,16 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
List<HashMap> results = reportDao.getReportResult(workbench); List<HashMap> results = reportDao.getReportResult(workbench);
//举报结果 //举报结果
for (HashMap res:results) { for (HashMap res:results) {
if(StringUtils.isNotBlank((String) res.get("deal_result"))){ if(StringUtils.isNotBlank((String) res.get("DEAL_RESULT"))){
if("1".equals((String) res.get("deal_result"))){ if("1".equals((String) res.get("DEAL_RESULT"))){
//投诉 //投诉
workbench.setComplainNum(Integer.valueOf(String.valueOf(res.get("COUNT(deal_result)")))); workbench.setComplainNum(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("2".equals((String) res.get("deal_result"))){ }else if("2".equals((String) res.get("DEAL_RESULT"))){
//无效 //无效
workbench.setInvalid(Integer.valueOf(String.valueOf(res.get("COUNT(deal_result)")))); workbench.setInvalid(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("3".equals((String) res.get("deal_result"))){ }else if("3".equals((String) res.get("DEAL_RESULT"))){
//属实 //属实
workbench.setVerified(Integer.valueOf(String.valueOf(res.get("COUNT(deal_result)")))); workbench.setVerified(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
} }
} }
...@@ -61,74 +61,74 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> { ...@@ -61,74 +61,74 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
List<HashMap> statusList = reportDao.getReportStatus(workbench); List<HashMap> statusList = reportDao.getReportStatus(workbench);
//举报状态 //举报状态
for(HashMap status:statusList){ for(HashMap status:statusList){
if(StringUtils.isNotBlank((String) status.get("report_status"))){ if(StringUtils.isNotBlank((String) status.get("REPORT_STATUS"))){
if("1".equals(String.valueOf(status.get("report_status")))){ if("1".equals(String.valueOf(status.get("REPORT_STATUS")))){
//处理中 //处理中
workbench.setProcessing(Integer.valueOf(String.valueOf(status.get("COUNT(report_status)")))); workbench.setProcessing(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("2".equals(String.valueOf(status.get("report_status")))){ }else if("2".equals(String.valueOf(status.get("REPORT_STATUS")))){
//已处理 //已处理
workbench.setProcessed(Integer.valueOf(String.valueOf(status.get("COUNT(report_status)")))); workbench.setProcessed(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("0".equals(String.valueOf(status.get("report_status")))){ }else if("0".equals(String.valueOf(status.get("REPORT_STATUS")))){
//未处理 //未处理
workbench.setUnProcess(Integer.valueOf(String.valueOf(status.get("COUNT(report_status)")))); workbench.setUnProcess(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
} }
} }
} }
workbench.setRepStatusTotal(workbench.getUnProcess()+workbench.getProcessing()+workbench.getProcessed()); workbench.setRepStatusTotal(workbench.getUnProcess()+workbench.getProcessing()+workbench.getProcessed());
List<HashMap> types = reportDao.getReportType(workbench); List<HashMap> types = reportDao.getReportType(workbench);
for (HashMap type:types){ for (HashMap type:types){
if(StringUtils.isNotBlank((String) type.get("supplement_type"))){ if(StringUtils.isNotBlank((String) type.get("SUPPLEMENT_TYPE"))){
if("1".equals((String) type.get("supplement_type"))){ if("1".equals((String) type.get("SUPPLEMENT_TYPE"))){
//营销 //营销
workbench.setSale(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setSale(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("2".equals((String) type.get("supplement_type"))){ }else if("2".equals((String) type.get("SUPPLEMENT_TYPE"))){
//工程 //工程
workbench.setProject(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setProject(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("3".equals(String.valueOf(type.get("supplement_type")))){ }else if("3".equals(String.valueOf(type.get("SUPPLEMENT_TYPE")))){
//成本 //成本
workbench.setCost(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setCost(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("4".equals(String.valueOf(type.get("supplement_type")))){ }else if("4".equals(String.valueOf(type.get("SUPPLEMENT_TYPE")))){
//招采 //招采
workbench.setForMining(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setForMining(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("5".equals(String.valueOf(type.get("supplement_type")))){ }else if("5".equals(String.valueOf(type.get("SUPPLEMENT_TYPE")))){
//人力 //人力
workbench.setManpower(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setManpower(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("6".equals(String.valueOf(type.get("supplement_type")))){ }else if("6".equals(String.valueOf(type.get("SUPPLEMENT_TYPE")))){
//物业 //物业
workbench.setTenement(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setTenement(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
}else if("7".equals(String.valueOf(type.get("supplement_type")))){ }else if("7".equals(String.valueOf(type.get("SUPPLEMENT_TYPE")))){
//投诉 //投诉
workbench.setComplain(Integer.valueOf(String.valueOf(type.get("COUNT(supplement_type)")))); workbench.setComplain(Integer.valueOf(String.valueOf(type.get("COUNT(SUPPLEMENT_TYPE)"))));
} }
} }
} }
List<HashMap> totals = reportDao.getTotal(workbench); List<HashMap> totals = reportDao.getTotal(workbench);
for (HashMap total:totals){ for (HashMap total:totals){
if(StringUtils.isNotBlank((String) total.get("report_source"))){ if(StringUtils.isNotBlank((String) total.get("REPORT_SOURCE"))){
if("web".equals((String) total.get("report_source"))){ if("web".equals((String) total.get("REPORT_SOURCE"))){
//官网 //官网
workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setWeb(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("oa".equals((String) total.get("report_source"))){ }else if("oa".equals((String) total.get("REPORT_SOURCE"))){
//融创oa //融创oa
workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setOa(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("supplier".equals(String.valueOf(total.get("report_source")))){ }else if("supplier".equals(String.valueOf(total.get("REPORT_SOURCE")))){
//供应商 //供应商
workbench.setSupplier(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setSupplier(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("wechat".equals(String.valueOf(total.get("report_source")))){ }else if("wechat".equals(String.valueOf(total.get("REPORT_SOURCE")))){
//微信公众号 //微信公众号
workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("sunacE:".equals(String.valueOf(total.get("report_source")))){ }else if("sunacE:".equals(String.valueOf(total.get("REPORT_SOURCE")))){
//融E //融E
workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("offline".equals(String.valueOf(total.get("report_source")))){ }else if("offline".equals(String.valueOf(total.get("REPORT_SOURCE")))){
//线下扫码 //线下扫码
workbench.setOffline(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setOffline(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("tel".equals(String.valueOf(total.get("report_source")))){ }else if("tel".equals(String.valueOf(total.get("REPORT_SOURCE")))){
//电话 //电话
workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
}else if("email:".equals((String) total.get("report_source"))){ }else if("email:".equals((String) total.get("REPORT_SOURCE"))){
//邮件 //邮件
workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(report_source)")))); workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
} }
} }
} }
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -60,13 +60,14 @@ ...@@ -60,13 +60,14 @@
var path = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作"; var path = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作";
path += "&body=Dear,<br/>附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。<br/>谢谢！"; path += "&body=Dear,<br/>附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。<br/>谢谢！";
//path += "<br/><br/><br/>%0D%0A${userName}"; //path += "<br/><br/><br/>%0D%0A${userName}";
path += "</p>举报内容</<br>"; path += "</p>举报内容</br>";
path += "被举报项目:${report.reportProject}</br>"; path += "被举报项目:${report.reportProject}</br>";
path += "举报时间:${report.reportTime}</br>"; path += "举报时间:${report.reportTime}</br>";
path += "所在城市:${report.reportCity}</br>"; path += "所在城市:${report.reportCity}</br>";
path += "内容:${report.reportContent}</br>"; path += "内容:${report.reportContent}</br>";
path += "附件:"; path += "附件:";
<%--var reportAttachmentList = "${reportAttachmentList}";--%> <%--var reportAttachmentList = ${supplementAttachmentList};--%>
<%--console.log(reportAttachmentList);--%>
<%--for (var i = 0;i < reportAttachmentList.length;i++){--%> <%--for (var i = 0;i < reportAttachmentList.length;i++){--%>
<%--path += "&nbsp;&nbsp;&nbsp;&nbsp;"+reportAttachmentList[i].attachmentPath+"</br>";--%> <%--path += "&nbsp;&nbsp;&nbsp;&nbsp;"+reportAttachmentList[i].attachmentPath+"</br>";--%>
<%--}--%> <%--}--%>
...@@ -75,9 +76,89 @@ ...@@ -75,9 +76,89 @@
path += "举报人信息</br>"; path += "举报人信息</br>";
path += "姓名:${report.reportPersonName}</br>"; path += "姓名:${report.reportPersonName}</br>";
path += "Email:${report.reportPersonTel}</br>"; path += "Email:${report.reportPersonTel}</br>";
path += "举报途径:${report.reportSource}</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>";
path += "被举报人:${report.supplementInformant}</br>";
var supplementType = "${report.supplementType}";
if (supplementType == "1"){
supplementType = "营销";
}else if (supplementType == "2"){
supplementType = "工程";
}else if (supplementType == "3"){
supplementType = "成本";
}else if (supplementType == "4"){
supplementType = "招采";
}else if (supplementType == "5"){
supplementType = "人力";
}else if (supplementType == "6"){
supplementType = "物业";
}else if (supplementType == "7"){
supplementType = "投诉";
}
path += "业务类型:"+supplementType+"</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.reportContent}</br>";
}
if (reportStatus == "2"){
path += "处理结果</br>";
path += "处理人:${report.dealPersonName}</br>";
path += "处理成果文件:${report.supplementCompany}</br>";
var dealResult = "${report.dealResult}";
if (dealResult == "North China"){
dealResult = "华北区域公司";
}else if (dealResult == "BeiJing"){
dealResult = "北京区域公司";
}else if (dealResult == "ShangHai"){
dealResult = "上海区域公司";
}
path += "处理结论:"+ dealResult +"</br>";
}
window.location.href = path; window.location.href = path;
}); });
}); });
...@@ -126,6 +207,13 @@ ...@@ -126,6 +207,13 @@
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div id="reportAttachment" style="display: none">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${reportAttachment.attachmentPath}" target="_blank">${reportAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
</div>
<span class="title">举报信息补充</span> <span class="title">举报信息补充</span>
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报公司:</label> <label class="control-label">被举报公司:</label>
...@@ -190,7 +278,12 @@ ...@@ -190,7 +278,12 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">附件:</label> <label class="control-label">附件:</label>
<div class="controls"> <div id="fujian2" class="controls">
<c:if test="${supplementAttachmentList ne null}">
<c:forEach items="${supplementAttachmentList}" var="supplementAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${supplementAttachment.attachmentPath}" target="_blank">${supplementAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
<form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false" <form:hidden id="nameFile" path="supplementAttachment" htmlEscape="false"
maxlength="255" class="input-xlarge"/> maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameFile" type="files" uploadPath="/file" <sys:ckfinder input="nameFile" type="files" uploadPath="/file"
...@@ -207,7 +300,12 @@ ...@@ -207,7 +300,12 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">处理成果文件:</label> <label class="control-label">处理成果文件:</label>
<div class="controls"> <div id="dealAttachment" class="controls">
<c:if test="${dealAttachmentList ne null}">
<c:forEach items="${dealAttachmentList}" var="dealAttachment" varStatus="vs">
&nbsp;&nbsp;<a href="${dealAttachment.attachmentPath}" target="_blank">${dealAttachment.attachmentName}</a><br>
</c:forEach>
</c:if>
<form:hidden id="dealFile" path="dealAttachment" htmlEscape="false" <form:hidden id="dealFile" path="dealAttachment" htmlEscape="false"
maxlength="255" class="input-xlarge"/> maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="dealFile" type="files" uploadPath="/file" <sys:ckfinder input="dealFile" type="files" uploadPath="/file"
......
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