Skip to content

S
sunac_report
Commit 2acf3db0 by yjh
Options

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

# Conflicts:
#	src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
parents dadf708f 5ee318d3
Showing with 102 additions and 64 deletions
src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java
......@@ -2,10 +2,13 @@ package com.ejweb.modules.front.report.api;
import com.ejweb.conf.ErrorCode;
import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.utils.StringUtils;
import com.ejweb.modules.front.report.bean.FrontReportBean;
import com.ejweb.modules.front.report.entity.Captcha;
import com.ejweb.modules.front.report.service.FrontReportService;
import com.ejweb.modules.front.report.utils.CaptchaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -21,6 +24,7 @@ public class FrontReportController {
@Autowired
private FrontReportService frontReportService;
/**
* 获取验证码的code值
* @return
......@@ -48,7 +52,13 @@ public class FrontReportController {
responseBean.setMessage("captcha is incorrect");
return responseBean;
}
return frontReportService.addReport(bean);
if (StringUtils.isNotBlank(bean.getReportSource())){
responseBean.setStatus(ErrorCode.STATUS_CODE_4002);
responseBean.setMessage("report_source为空");
return responseBean;
}else {
return frontReportService.addReport(bean);
}
}
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
responseBean.setMessage("接收参数失败");
......
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -38,12 +38,31 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String exchangeType; //举报改变类型 1移交 2转交
private String reportTimeFrom; //举报时间起
private String reportTimeTo; //举报时间止
private List<ReportAttachmentEntity> reportAttachmentEntityList;
private String reportAttachment; //举报提交文件
private String supplementAttachment; //补充提交文件
private String dealAttachment; //处理成果文件
private String oaname;//当前用户名
public String getOaname() {
return oaname;
}
public void setOaname(String oaname) {
this.oaname = oaname;
}
// private String ifDone; //是否完成
//
//
// public String getIfDone() {
// return ifDone;
// }
//
// public void setIfDone(String ifDone) {
// this.ifDone = ifDone;
// }
private List<ReportAttachmentEntity> reportAttachmentEntityList;
private String[] types;//新业务类型
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -71,6 +71,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
public void saveReport(ReportEntity reportEntity) {
//保存举报信息
reportEntity.preInsert();
//保存填写人信息
User user = UserUtils.getUser();
String oaname = user.getName();
reportEntity.setOaname(oaname);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String reportTime = sdf.format(reportEntity.getCreateDate());
reportEntity.setReportTime(reportTime);
......@@ -177,11 +181,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}
}
}
//更新举报状态
reportEntity.setReportStatus("1");
if (StringUtils.isNotBlank(reportEntity.getDealResult())){
reportEntity.setReportStatus("2");
}
reportDao.updateReportStatus(reportEntity);
}
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -253,9 +253,21 @@ public class ReportController extends BaseController {
*/
@RequestMapping(value = "addTrack")
public String addTrack(ReportEntity reportEntity,HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
String ifDone = request.getParameter("ifDone"); // 是否完成
if (!beanValidator(model, reportEntity)) {
return form(reportEntity, model);
}
//更新举报状态
reportEntity.setReportStatus("1");
if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
reportEntity.setReportStatus("2");
}
if (reportEntity.getDealResult().equals("3")){
reportEntity.setReportStatus("1");
}
if ("ifDone".equals(ifDone)) {
reportEntity.setReportStatus("2");
}
reportService.saveTrack(reportEntity);
String exchangeAfterUser = request.getParameter("exchangeAfterUser");
if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){
......
src/main/resources/ejweb.properties
......@@ -95,7 +95,7 @@ file.image.thumb.width=640
file.image.thumb.height=640
# The Prefix Url
#file.prefix.url=http://123.56.146.81:8808/
file.prefix.url=http://192.168.3.232:8081/
file.prefix.url=http://192.168.7.210:8081/
# The Prefix separator
file.upload.path.separator = /
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -29,7 +29,8 @@
r.create_by AS "createBy",
r.create_date AS "createDate",
r.update_by AS "updateBy",
r.update_date AS "updateDate"
r.update_date AS "updateDate",
r.OA_NAME AS "oaname"
</sql>
......@@ -158,7 +159,8 @@
create_by,
create_date,
update_by,
update_date
update_date,
OA_NAME
) VALUES (
#{id},
#{reportProject},
......@@ -176,7 +178,8 @@
#{createBy.id},
#{createDate},
#{updateBy.id},
#{updateDate}
#{updateDate},
#{oaname}
)
</insert>
......@@ -213,7 +216,8 @@
exchange_type = #{exchangeType},
deal_result = #{dealResult},
update_by = #{updateBy.id},
update_date = #{updateDate}
update_date = #{updateDate},
OA_NAME = #{oaname}
WHERE id = #{id}
</update>
......@@ -492,7 +496,8 @@
r.create_by AS "createBy",
r.create_date AS "createDate",
r.update_by AS "updateBy",
r.update_date AS "updateDate"
r.update_date AS "updateDate",
r.OA_NAME AS "oaname"
FROM ct_bbtc_report r
WHERE r.report_status = #{processStatus}
<if test="isAdmin != null">
......
src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp
......@@ -138,7 +138,7 @@
<sys:message content="${message}"/>
<span class="title">举报内容</span>
<div class="control-group">
<label class="control-label">被举报项目:</label>
<label class="control-label">被举报项目/被举报部门:</label>
<div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required"
placeholder="最多输入50个字符"/>
......@@ -165,8 +165,8 @@
<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" placeholder="最多输入500个字符"/>
<form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="3000"
class="input-xxlarge" placeholder="最多输入3000个字符"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -121,6 +121,7 @@
<th>标题</th>
<th>业务类型</th>
<th>被举报项目</th>
<th>OA账号</th>
<th>举报人</th>
<th>举报人电话</th>
<th>区域</th>
......@@ -140,6 +141,7 @@
<td>${report.supplementTitle}</td>
<td>${report.supplementType}</td>
<td>${report.reportProject}</td>
<td>${report.oaname}</td>
<td>${report.reportPersonName}</td>
<td>${report.reportPersonTel}</td>
<td>
......@@ -161,14 +163,15 @@
<td>${report.reportTime}</td>
<td>
<c:if test="${report.reportStatus eq '0'}">未处理</c:if>
<c:if test="${report.reportStatus eq '1'}">核查中</c:if>
<c:if test="${report.reportStatus eq '1'}">跟踪中</c:if>
<c:if test="${report.reportStatus eq '2'}">已处理</c:if>
<c:if test="${report.reportStatus eq '3'}">受理中</c:if>
</td>
<td>
<c:if test="${report.dealResult eq null}">--</c:if>
<c:if test="${report.dealResult eq '1'}">投诉</c:if>
<c:if test="${report.dealResult eq '2'}">无效</c:if>
<c:if test="${report.dealResult eq '3'}">属实</c:if>
<c:if test="${report.dealResult eq '1'}">移交客诉</c:if>
<c:if test="${report.dealResult eq '2'}">举报无效</c:if>
<c:if test="${report.dealResult eq '3'}">举报受理</c:if>
</td>
<td><c:if test="${report.dealResult eq null}">--</c:if>
<c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
<%@ taglib prefix="from" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
......@@ -10,6 +9,9 @@
$(document).ready(function () {
$("#inputForm").validate({
submitHandler: function (form) {
messages: {
supplementContent: {maxlength: "最多输入{0}个字符"}
}
if ($("#supplementType").val() == " "){
top.$.jBox.tip('请选择业务类型', 'warning');
}else if ($("#supplementArea").val() == " "){
......@@ -106,24 +108,23 @@
path += "标题:${report.supplementTitle}</br>";
path += "被举报公司:${report.supplementCompany}</br>";
path += "被举报部门:${report.supplementDepartment}</br>";
//12:01注
<%--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 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 = "华北区域公司";
......@@ -156,16 +157,8 @@
console.log(path);
window.location.href = path;
});
var checkedNumber = "${report.supplementType}";
var number=checkedNumber.split(",");
var ck=document.getElementsByName("supplementType");
for (var i = 0; i < number.length; i++) {
ck[number[i]-1].checked=true;
}
});
</script>
<style type="text/css">
.title{
......@@ -242,14 +235,11 @@
<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"/>
</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>--%>
<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">
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -43,7 +43,7 @@
},
subtitle: {//副标题
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,
verticalAlign: 'top' ,
x: -5 ,
......@@ -71,7 +71,7 @@
name: '举报',
data: [
['未处理', result.unProcess],
['核查中', result.processing],
['跟踪中', result.processing],
['已处理', result.processed],
// {
// name: 'Chrome',
......@@ -186,7 +186,7 @@
},
subtitle: {//副标题
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,
verticalAlign: 'top' ,
x: -5 ,
......@@ -210,9 +210,9 @@
type: 'pie',
name: '举报',
data: [
['无效', result.invalid],
['投诉', result.complainNum],
['举报', result.verified],
['举报无效', result.invalid],
['举报投诉', result.complainNum],
['举报受理', result.verified],
]
}]
});
......@@ -280,7 +280,7 @@
</form:form>
<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 '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>
</ul>
<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