Skip to content

S
sunac_report
Commit 10e32c90 by yjh
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 4521bcb1 a9318f93
Showing with 68 additions and 92 deletions
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -327,52 +327,45 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -327,52 +327,45 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
List<ReportEntity> reportList = dao.findList(reportEntity); List<ReportEntity> reportList = dao.findList(reportEntity);
for (ReportEntity report : reportList) { for (ReportEntity report : reportList) {
String typeStr=""; String typeStr="";
String[] types = report.getSupplementType().split(","); if (StringUtils.isNoneBlank(report.getSupplementType())) {
for (String value : types) { String[] types = report.getSupplementType().split(",");
if (value.equals("1")) { for (String value : types) {
value = "营销"; if (value.equals("1")) {
} else if (value.equals("2")) { value = "营销";
value = "工程"; } else if (value.equals("2")) {
} else if (value.equals("3")) { value = "工程";
value = "成本"; } else if (value.equals("3")) {
} else if (value.equals("4")) { value = "成本";
value = "招采"; } else if (value.equals("4")) {
} else if (value.equals("5")) { value = "招采";
value = "人力"; } else if (value.equals("5")) {
} else if (value.equals("6")) { value = "人力";
value = "物业"; } else if (value.equals("6")) {
} else if (value.equals("7")) { value = "物业";
value = "投诉"; } else if (value.equals("7")) {
value = "投诉";
} else if (value.equals("8")) {
value = "行政";
} else if (value.equals("9")) {
value = "财务";
} else if (value.equals("10")) {
value = "商业管理";
} else if (value.equals("11")) {
value = "研发";
} else if (value.equals("12")) {
value = "投资开发";
}
typeStr = typeStr + value + ",";
} }
typeStr =typeStr+value+","; typeStr = typeStr.substring(0, typeStr.length() - 1);
} }
report.setSupplementType(typeStr.substring(0,typeStr.length()-1)); report.setSupplementType(typeStr);
// if (StringUtils.isNotBlank(supplementType)) {
// if (supplementType.equals("1")) {
// supplementType = "营销";
// } else if (supplementType.equals("2")) {
// supplementType = "工程";
// } else if (supplementType.equals("3")) {
// supplementType = "成本";
// } else if (supplementType.equals("4")) {
// supplementType = "招采";
// } else if (supplementType.equals("5")) {
// supplementType = "人力";
// } else if (supplementType.equals("6")) {
// supplementType = "物业";
// } else if (supplementType.equals("7")) {
// supplementType = "投诉";
// }
// }else{
// supplementType = "";
// }
// report.setSupplementType(supplementType);
String reportStatus = report.getReportStatus(); String reportStatus = report.getReportStatus();
if (StringUtils.isNotBlank(reportStatus)) { if (StringUtils.isNotBlank(reportStatus)) {
if (reportStatus.equals("0")) { if (reportStatus.equals("0")) {
reportStatus = "未处理"; reportStatus = "未处理";
} else if (reportStatus.equals("1")) { } else if (reportStatus.equals("1")) {
reportStatus = "核查中"; reportStatus = "跟踪中";
} else if (reportStatus.equals("2")) { } else if (reportStatus.equals("2")) {
reportStatus = "已处理"; reportStatus = "已处理";
} }
...@@ -383,11 +376,11 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -383,11 +376,11 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
String dealResult = report.getDealResult(); String dealResult = report.getDealResult();
if (StringUtils.isNotBlank(dealResult)) { if (StringUtils.isNotBlank(dealResult)) {
if (dealResult.equals("1")) { if (dealResult.equals("1")) {
dealResult = "投诉"; dealResult = "移交客诉";
} else if (dealResult.equals("2")) { } else if (dealResult.equals("2")) {
dealResult = "举报无效"; dealResult = "举报无效";
} else if (dealResult.equals("3")) { } else if (dealResult.equals("3")) {
dealResult = "举报属实"; dealResult = "举报受理";
} }
}else{ }else{
dealResult = "--"; dealResult = "--";
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -229,6 +229,15 @@ public class ReportController extends BaseController { ...@@ -229,6 +229,15 @@ public class ReportController extends BaseController {
dealAttachment.setReportId(reportEntity.getId()); dealAttachment.setReportId(reportEntity.getId());
dealAttachment.setAttachmentType("2"); dealAttachment.setAttachmentType("2");
List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment); List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment);
//业务类型
String supplementTypeStr="";
String[] supplementTypes = {"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
String typeNumber[] = reportEntity.getSupplementType().split(",");
for(int i = 0;i < typeNumber.length;i++)
{
supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
}
supplementTypeStr = supplementTypeStr.substring(0,supplementTypeStr.length()-1);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("user", userEntity); model.addAttribute("user", userEntity);
model.addAttribute("userName", user.getName()); model.addAttribute("userName", user.getName());
...@@ -241,6 +250,7 @@ public class ReportController extends BaseController { ...@@ -241,6 +250,7 @@ public class ReportController extends BaseController {
model.addAttribute("reportAttachmentList", reportAttachmentList); model.addAttribute("reportAttachmentList", reportAttachmentList);
model.addAttribute("supplementAttachmentList", supplementAttachmentList); model.addAttribute("supplementAttachmentList", supplementAttachmentList);
model.addAttribute("dealAttachmentList", dealAttachmentList); model.addAttribute("dealAttachmentList", dealAttachmentList);
model.addAttribute("supplementTypeStr", supplementTypeStr);
return "modules/report/reportTrack"; return "modules/report/reportTrack";
} }
......
src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
...@@ -263,28 +263,20 @@ public class ReportToWordController { ...@@ -263,28 +263,20 @@ public class ReportToWordController {
value = "物业"; value = "物业";
} else if (value.equals("7")) { } else if (value.equals("7")) {
value = "投诉"; value = "投诉";
} else if (value.equals("8")) {
value = "行政";
} else if (value.equals("9")) {
value = "财务";
} else if (value.equals("10")) {
value = "商业管理";
} else if (value.equals("11")) {
value = "研发";
} else if(value.equals("12")) {
value ="投资开发";
} }
typeStr =typeStr+value+","; typeStr =typeStr+value+",";
supplement_type=typeStr.substring(0,typeStr.length()-1); supplement_type=typeStr.substring(0,typeStr.length()-1);
} }
// if (supplement_type.equals("1")) {
// supplement_type = "营销";
// } else if (supplement_type.equals("2")) {
// supplement_type = "工程";
// } else if (supplement_type.equals("3")) {
// supplement_type = "成本";
// } else if (supplement_type.equals("4")) {
// supplement_type = "招采";
// } else if (supplement_type.equals("5")) {
// supplement_type = "人力";
// } else if (supplement_type.equals("6")) {
// supplement_type = "物业";
// } else if (supplement_type.equals("7")) {
// supplement_type = "投诉";
// }
// } else {
// supplement_type = "";
} }
supplementType.getCell(1).setText(supplement_type); supplementType.getCell(1).setText(supplement_type);
...@@ -398,11 +390,11 @@ public class ReportToWordController { ...@@ -398,11 +390,11 @@ public class ReportToWordController {
String deal_result = reportEntity.getDealResult(); String deal_result = reportEntity.getDealResult();
if (StringUtils.isNotBlank(deal_result)) { if (StringUtils.isNotBlank(deal_result)) {
if (deal_result.equals("1")) { if (deal_result.equals("1")) {
deal_result = "投诉"; deal_result = "移交客诉";
} else if (deal_result.equals("2")) { } else if (deal_result.equals("2")) {
deal_result = "举报无效"; deal_result = "举报无效";
} else if (deal_result.equals("3")) { } else if (deal_result.equals("3")) {
deal_result = "举报属实"; deal_result = "举报受理";
} }
} else { } else {
deal_result = ""; deal_result = "";
......
src/main/resources/jdbc.properties
#MySQL Database Config(The All Config Is Must) #MySQL Database Config(The All Config Is Must)
db.table.prefix=sunac_ db.table.prefix=sunac_
jdbc.type=mysql #jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver #jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8 #jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8
jdbc.username=reportuser #jdbc.username=reportuser
jdbc.password=$R@20$7 #jdbc.password=$R@20$7
#jdbc.type=oracle jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
#jdbc.username=eas7531 jdbc.username=eas7531
#jdbc.password=sunac jdbc.password=sunac
#初始化连接 #初始化连接
jdbc.initialSize=0 jdbc.initialSize=0
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
...@@ -192,11 +192,9 @@ ...@@ -192,11 +192,9 @@
<div class="controls"> <div class="controls">
<%--<form:input id="supplementType" items="split(${report.supplementType},',')" path="supplementType"--%> <%--<form:input id="supplementType" items="split(${report.supplementType},',')" path="supplementType"--%>
<%--htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%> <%--htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<c:forEach items="${report.supplementType}" var="Type" >
<form:input id="supplementType" <form:input id="supplementType"
path="supplementType" path="supplementType"
htmlEscape="false" maxlength="200" class="input-xlarge required"/> htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</c:forEach>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -114,24 +114,8 @@ ...@@ -114,24 +114,8 @@
path += "标题:${report.supplementTitle}</br>"; path += "标题:${report.supplementTitle}</br>";
path += "被举报公司:${report.supplementCompany}</br>"; path += "被举报公司:${report.supplementCompany}</br>";
path += "被举报部门:${report.supplementDepartment}</br>"; path += "被举报部门:${report.supplementDepartment}</br>";
//12:01注 var supplementTypeStr = "${supplementTypeStr}";
<%--var supplementType = "${report.supplementType}";--%> path += "业务类型:"+supplementTypeStr+"</br>";
<%--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}"; var supplementArea = "${report.supplementArea}";
if (supplementArea == "North China"){ if (supplementArea == "North China"){
supplementArea = "华北区域公司"; supplementArea = "华北区域公司";
...@@ -161,7 +145,6 @@ ...@@ -161,7 +145,6 @@
path += url; path += url;
}); });
} }
console.log(path);
window.location.href = path; window.location.href = path;
}); });
}); });
......
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