Skip to content

S
sunac_report
Commit de120831 by java-lixy
Options

问题1：移交后的信息在哪记录转交过，及转交人；？修改为加一列移交给在举报管理列表页。移交和转交用同一个字段，会同时显示。点击查看进去也可以看到移交人 

问题2：发邮件的功能目前无法使用？修改邮件插件
问题3、一样的这几条数据，举报途径没有圈？数据问题，已修复
问题4、转交之后，写的处理人，但是列表没有显示处理人，点进去处理人还是原处理人？已修复
parent fa9d0c43
Showing with 164 additions and 31 deletions
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
...@@ -160,4 +160,10 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -160,4 +160,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
* @return * @return
*/ */
public int updateExchangeUser(ReportEntity reportEntity); public int updateExchangeUser(ReportEntity reportEntity);
/**
* 查询移交后人员
* @return
*/
public String findExchangeUser(String id);
} }
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -42,7 +42,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -42,7 +42,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementAttachment; //补充提交文件 private String supplementAttachment; //补充提交文件
private String dealAttachment; //处理成果文件 private String dealAttachment; //处理成果文件
private String oaname;//当前用户名 private String oaname;//当前用户名
private String transferName; //移交给
public String getOaname() { public String getOaname() {
...@@ -308,4 +308,12 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -308,4 +308,12 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setTypes(String[] types) { public void setTypes(String[] types) {
this.types = types; this.types = types;
} }
public String getTransferName() {
return transferName;
}
public void setTransferName(String transferName) {
this.transferName = transferName;
}
} }
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -468,4 +468,9 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -468,4 +468,9 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} }
return isAdmin; return isAdmin;
} }
public String findExchangeUser(String id){
return reportDao.findExchangeUser(id);
}
} }
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -117,9 +117,11 @@ public class ReportController extends BaseController { ...@@ -117,9 +117,11 @@ public class ReportController extends BaseController {
} }
} }
page.setList(reportlist); page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("report", reportEntity); model.addAttribute("report", reportEntity);
model.addAttribute("flag", flag); model.addAttribute("flag", flag);
model.addAttribute("isAdmin", isAdmin);
return "modules/report/reportList"; return "modules/report/reportList";
} }
...@@ -238,10 +240,12 @@ public class ReportController extends BaseController { ...@@ -238,10 +240,12 @@ public class ReportController extends BaseController {
} }
supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1); supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
} }
if (StringUtils.isBlank(reportEntity.getDealPersonName())){
reportEntity.setDealPersonName(user.getName());
}
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());
model.addAttribute("currentUser", user.getName());
model.addAttribute("report", reportEntity); model.addAttribute("report", reportEntity);
model.addAttribute("companyList", companyList); model.addAttribute("companyList", companyList);
model.addAttribute("officeList", officeList); model.addAttribute("officeList", officeList);
...@@ -278,6 +282,10 @@ public class ReportController extends BaseController { ...@@ -278,6 +282,10 @@ public class ReportController extends BaseController {
if ("ifDone".equals(ifDone)) { if ("ifDone".equals(ifDone)) {
reportEntity.setReportStatus("2"); reportEntity.setReportStatus("2");
} }
if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())){
String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
reportEntity.setExchangeAfterUser(exchangeAfterUser);
}
reportService.saveTrack(reportEntity); reportService.saveTrack(reportEntity);
String exchangeAfterUser = request.getParameter("exchangeAfterUser"); String exchangeAfterUser = request.getParameter("exchangeAfterUser");
if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){ if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -41,14 +41,18 @@ ...@@ -41,14 +41,18 @@
<select id="get" parameterType="ReportEntity" resultType="ReportEntity"> <select id="get" parameterType="ReportEntity" resultType="ReportEntity">
SELECT SELECT
<include refid="reportColumns"/> <include refid="reportColumns"/>
,su.name AS "transferName"
FROM ct_bbtc_report r FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
WHERE r.id = #{id} WHERE r.id = #{id}
</select> </select>
<select id="findList" parameterType="ReportEntity" resultType="ReportEntity"> <select id="findList" parameterType="ReportEntity" resultType="ReportEntity">
SELECT SELECT
<include refid="reportColumns"/> <include refid="reportColumns"/>
,su.name AS "transferName"
FROM ct_bbtc_report r FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
<where> <where>
1 = 1 1 = 1
<if test="exchangeAfterUser != null and exchangeAfterUser != ''"> <if test="exchangeAfterUser != null and exchangeAfterUser != ''">
...@@ -549,9 +553,10 @@ ...@@ -549,9 +553,10 @@
r.supplement_informant AS "supplementInformant", r.supplement_informant AS "supplementInformant",
r.deal_person_name AS "dealPersonName", r.deal_person_name AS "dealPersonName",
r.deal_result AS "dealResult", r.deal_result AS "dealResult",
(CASE WHEN r.exchange_type='2' THEN (SELECT name FROM ct_bbtc_sys_user WHERE id=r.exchange_after_user) ELSE '--' END) AS "exchangeAfterUser", r.exchange_type AS "exchangeType",
r.exchange_type AS "exchangeType" su.name AS "transferName"
FROM ct_bbtc_report r FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
<where> <where>
1 = 1 1 = 1
<if test="exchangeAfterUser != null and exchangeAfterUser != ''"> <if test="exchangeAfterUser != null and exchangeAfterUser != ''">
...@@ -573,6 +578,8 @@ ...@@ -573,6 +578,8 @@
update_date = #{updateDate} update_date = #{updateDate}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<select id="findExchangeUser" resultType="String">
SELECT c.EXCHANGE_AFTER_USER FROM CT_BBTC_REPORT c WHERE c.ID = #{id}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
...@@ -181,10 +181,10 @@ ...@@ -181,10 +181,10 @@
<c:if test="${report.dealResult eq '2'}">举报无效</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 '3'}">举报受理</c:if>
</td> </td>
<td><c:if test="${report.dealResult eq null}">--</c:if> <td><c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if> <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
</td> </td>
<td>${report.exchangeAfterUser}</td> <td>${report.transferName}</td>
<td> <td>
<a href="${ctx}/report/view?id=${report.id}">查看</a> <a href="${ctx}/report/view?id=${report.id}">查看</a>
</td> </td>
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<label class="control-label">举报途径:</label> <label class="control-label">举报途径:</label>
<div class="controls"> <div class="controls">
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value" <form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
htmlEscape="false" disabled="true"/> htmlEscape="false" disabled="true" style="margin-right: -23px\9;"/>
</div> </div>
</div> </div>
<c:if test="${report.reportStatus ne '0'}"> <c:if test="${report.reportStatus ne '0'}">
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
...@@ -132,6 +132,9 @@ ...@@ -132,6 +132,9 @@
<th>状态</th> <th>状态</th>
<th>处理结论</th> <th>处理结论</th>
<th>处理人</th> <th>处理人</th>
<c:if test="${isAdmin eq true}">
<th>移交给</th>
</c:if>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -185,9 +188,15 @@ ...@@ -185,9 +188,15 @@
<c:if test="${report.dealResult eq '2'}">举报无效</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 '3'}">举报受理</c:if>
</td> </td>
<td><c:if test="${report.dealResult eq null}">--</c:if> <td><c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if> <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
</td>
<c:if test="${isAdmin eq true}">
<td>
<c:if test="${report.transferName eq null}">--</c:if>
<c:if test="${report.transferName ne null}">${report.transferName}</c:if>
</td> </td>
</c:if>
<td> <td>
<a href="${ctx}/report/view?id=${report.id}">查看</a> <a href="${ctx}/report/view?id=${report.id}">查看</a>
<c:if test="${report.reportStatus ne '2'}"><a href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if> <c:if test="${report.reportStatus ne '2'}"><a href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -57,18 +57,103 @@ ...@@ -57,18 +57,103 @@
$("#fade").hide(); $("#fade").hide();
}); });
var checkedNumber = "${report.supplementType}"; var checkedNumber = "${report.supplementType}";
var number=checkedNumber.split(","); if (checkedNumber != null && checkedNumber.length != 0) {
var ck=document.getElementsByName("supplementType"); var number = checkedNumber.split(",");
console.log(number);
var ck = document.getElementsByName("supplementType");
console.log(ck);
for (var i = 0; i < number.length; i++) { for (var i = 0; i < number.length; i++) {
ck[number[i]-1].checked=true; ck[number[i] - 1].checked = true;
}
} }
$("#reportDetail input[type='text']").each(function(){ $("#reportDetail input[type='text']").each(function(){
// alert($(this).val()); // alert($(this).val());
$(this).attr("disabled",true); $(this).attr("disabled",true);
}); });
var source = "${report.reportSource}"; <%--var source = "${report.reportSource}";--%>
$(":radio[name='reportSource'][value='" + source + "']").prop("checked", "checked"); <%--$(":radio[name='reportSource'][value='" + source + "']").prop("checked", "checked");--%>
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,%0D%0A附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。%0D%0A谢谢！";
//path += "%0D%0A%0D%0A%0D%0A%0D%0A${userName}";
path += "%0D%0A%0D%0A举报内容%0D%0A";
path += "被举报项目:${report.reportProject}%0D%0A";
path += "标题:${report.supplementTitle}%0D%0A";
path += "被举报人:${report.supplementInformant}%0D%0A";
path += "举报时间:${report.reportTime}%0D%0A";
path += "所在城市:${report.reportCity}%0D%0A";
var reportContent = $("#reportContent").val();
path += "内容:"+reportContent+"%0D%0A";
path += "附件:%0D%0A";
$("#attachment1").find("[class='attachmentClass']").each(function(){
var url = $(this).text();
path += url;
});
path += "%0D%0A举报人信息%0D%0A";
path += "姓名:${report.reportPersonName}%0D%0A";
path += "手机号:${report.reportPersonTel}%0D%0A";
path += "Email:${report.reportPersonEmail}%0D%0A";
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+"%0D%0A";
var reportStatus = "${report.reportStatus}";
if (reportStatus != "0"){
path += "举报信息补充%0D%0A";
var supplementTypeStr = "${supplementTypeStr}";
path += "业务类型:"+supplementTypeStr+"%0D%0A";
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 +"%0D%0A";
var supplementContent = $("#supplementContent").val();
path += "内容:"+supplementContent+"%0D%0A";
path += "附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function(){
var url = $(this).text();
path += url;
});
}
$("#sendE").attr("href",path);
}); });
//发邮件 //发邮件
function ceshi(){ function ceshi(){
...@@ -153,6 +238,7 @@ ...@@ -153,6 +238,7 @@
path += url; path += url;
}); });
} }
console.log(path);
window.location.href = path; window.location.href = path;
} }
// 处理结果的隐藏和显示 // 处理结果的隐藏和显示
...@@ -289,17 +375,17 @@ ...@@ -289,17 +375,17 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">举报途径:</label> <label class="control-label">举报途径:</label>
<div class="controls"> <div class="controls">
<%--<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"--%> <form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
<%--style="width:14px;margin:0" htmlEscape="false" disabled="true"/>--%> htmlEscape="false" disabled="true" style="margin-right: -23px\9;"/>
<input type="radio" id="reportSource" name="reportSource" value="web" disabled="true" style="margin-right: -23px\9;">官网 <%--<input type="radio" id="reportSource" name="reportSource" value="web" disabled="true" style="margin-right: -23px\9;">官网--%>
<input type="radio" id="reportSource" name="reportSource" value="oa" disabled="true" style="margin-right: -23px\9;">融创OA系统 <%--<input type="radio" id="reportSource" name="reportSource" value="oa" disabled="true" style="margin-right: -23px\9;">融创OA系统--%>
<input type="radio" id="reportSource" name="reportSource" value="supplier" disabled="true" style="margin-right: -23px\9;">供应商系统 <%--<input type="radio" id="reportSource" name="reportSource" value="supplier" disabled="true" style="margin-right: -23px\9;">供应商系统--%>
<input type="radio" id="reportSource" name="reportSource" value="wechat" disabled="true" style="margin-right: -23px\9;">微信公众号 <%--<input type="radio" id="reportSource" name="reportSource" value="wechat" disabled="true" style="margin-right: -23px\9;">微信公众号--%>
<input type="radio" id="reportSource" name="reportSource" value="sunacE" disabled="true" style="margin-right: -23px\9;">融E <%--<input type="radio" id="reportSource" name="reportSource" value="sunacE" disabled="true" style="margin-right: -23px\9;">融E--%>
<input type="radio" id="reportSource" name="reportSource" value="offline" disabled="true" style="margin-right: -23px\9;">线下扫码 <%--<input type="radio" id="reportSource" name="reportSource" value="offline" disabled="true" style="margin-right: -23px\9;">线下扫码--%>
<input type="radio" id="reportSource" name="reportSource" value="tel" disabled="true" style="margin-right: -23px\9;">电话 <%--<input type="radio" id="reportSource" name="reportSource" value="tel" disabled="true" style="margin-right: -23px\9;">电话--%>
<input type="radio" id="reportSource" name="reportSource" value="email" disabled="true" style="margin-right: -23px\9;">邮件 <%--<input type="radio" id="reportSource" name="reportSource" value="email" disabled="true" style="margin-right: -23px\9;">邮件--%>
<input type="radio" id="reportSource" name="reportSource" value="visit" disabled="true" style="margin-right: -23px\9;">来访 <%--<input type="radio" id="reportSource" name="reportSource" value="visit" disabled="true" style="margin-right: -23px\9;">来访--%>
</div> </div>
</div> </div>
</div> </div>
...@@ -402,7 +488,7 @@ ...@@ -402,7 +488,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">处理人:</label> <label class="control-label">处理人:</label>
<div class="controls"> <div class="controls">
<form:input path="dealPersonName" value="${currentUser}" htmlEscape="false" maxlength="200" class="input-xlarge required"/> <form:input path="dealPersonName" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
...@@ -439,12 +525,15 @@ ...@@ -439,12 +525,15 @@
<label class="control-label">移交:</label> <label class="control-label">移交:</label>
<div class="controls"> <div class="controls">
<input type="text" id="userId" name="exchangeAfterUser" value="" style="display:none;"/> <input type="text" id="userId" name="exchangeAfterUser" value="" style="display:none;"/>
<input id="chooseUser" type="text" value="选择移交人员" <c:if test="${isAdmin eq false}">disabled="true"</c:if> htmlEscape="false" maxlength="200" class="input-xlarge"/> <input id="chooseUser" type="text" <c:if test="${report.exchangeAfterUser eq null}">value="选择移交人员" </c:if>
<c:if test="${report.exchangeAfterUser ne null}">value="${report.transferName}" </c:if>
<c:if test="${isAdmin eq false}">disabled="true"</c:if> htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp; <input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
<input id="btnMail" class="btn btn-primary" type="button" value="发邮件" onclick="ceshi()"/> <%--<input id="btnMail" class="btn btn-primary" type="button" value="发邮件" onclick="ceshi()"/>--%>
<a href="#" id="sendE" class="btn btn-primary">发邮件</a>
</div> </div>
</form:form> </form:form>
<div id="fade" class="black_overlay"></div> <div id="fade" class="black_overlay"></div>
......
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