Skip to content

S
sunac_report
Commit 960a3693 by java-lixy
Options

小问题修改

parent 8c7c223d
Showing with 108 additions and 17 deletions
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -44,13 +44,13 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
for (HashMap res:results) {
if(StringUtils.isNotBlank((String) res.get("DEAL_RESULT"))){
if("1".equals((String) res.get("DEAL_RESULT"))){
//投诉
//移交客诉
workbench.setComplainNum(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("2".equals((String) res.get("DEAL_RESULT"))){
//无效
//举报无效
workbench.setInvalid(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}else if("3".equals((String) res.get("DEAL_RESULT"))){
//属实
//举报受理
workbench.setVerified(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}
......
src/main/resources/ejweb.properties
......@@ -73,7 +73,8 @@ userfiles.prefix=static
#projectPath=D\:\\workspace\\jeesite
# The Upload File DIR, Must End With File Separator
file.upload.dir=/mnt/sunac/
file.upload.dir=/home/static/report/
#file.upload.dir=/mnt/sunac/
## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\
#file.upload.dir=/D:/uploads/
# Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes)
......@@ -95,7 +96,11 @@ 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.7.210:8081/
#ڴ
#file.prefix.url=http://192.168.7.210:8081/
#ڴʽ
#file.prefix.url=http://192.168.2.62:8082/
file.prefix.url=http://221.239.118.251:8899/static/report/
# The Prefix separator
file.upload.path.separator = /
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -423,7 +423,7 @@
<select id="getReportResult" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select deal_result,COUNT(deal_result)
FROM ct_bbtc_report
WHERE report_status='2'
WHERE 1 = 1
<if test="isAdmin != null">
AND exchange_after_user = #{isAdmin}
</if>
......@@ -543,6 +543,7 @@
r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType",
r.supplement_area AS "supplementArea",
r.supplement_department AS "supplementDepartment",
r.supplement_informant AS "supplementInformant",
r.deal_person_name AS "dealPersonName",
r.deal_result AS "dealResult",
......
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
......@@ -172,7 +172,7 @@
<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>
</td>
<td>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -166,7 +166,7 @@
<c:if test="${report.reportStatus eq '0'}">未处理</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>
<%--<c:if test="${report.reportStatus eq '3'}">受理中</c:if>--%>
</td>
<td>
<c:if test="${report.dealResult eq null}">--</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -61,8 +61,96 @@
for (var i = 0; i < number.length; i++) {
ck[number[i]-1].checked=true;
}
//发邮件
$("#btnMail").click(function () {
<%--$("#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;--%>
<%--});--%>
});
function ceshi(){
var supplementType = $("#supplementType").find("option:selected").text();
var supplementInformant = "${report.supplementInformant}";
if(supplementType == "请选择"){
......@@ -146,10 +234,7 @@
});
}
window.location.href = path;
});
});
}
// 处理结果的隐藏和显示
// function doSome() {
// var dealResult = $("#dealResult option:selected").text();
......@@ -242,7 +327,7 @@
<label class="control-label">业务类型:</label>
<div class="controls">
<span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"/>
<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>--%>
......@@ -389,7 +474,7 @@
</div>
<div class="form-actions">
<input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
<input id="btnMail" class="btn btn-primary" type="button" value="发邮件"/>
<input id="btnMail" class="btn btn-primary" type="button" value="发邮件" onclick="ceshi()"/>
</div>
</form:form>
<div id="fade" class="black_overlay"></div>
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -206,7 +206,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 ,
......@@ -231,7 +231,7 @@
name: '举报',
data: [
['举报无效', result.invalid],
['举报投诉', result.complainNum],
['移交客诉', result.complainNum],
['举报受理', result.verified],
]
}]
......
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