Skip to content

S
sunac_report
Commit 9831dc18 by Java-李昕颖
Options

举报移交

parent ad8e3800
Showing with 72 additions and 149 deletions
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -214,13 +214,15 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -214,13 +214,15 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} }
/** /**
* 移交举报 * 移交后发送消息
* @param userId * @param reportId
* @param id * @param supplementTitle
* @return * @return
*/ */
@Transactional(readOnly = false) // @Transactional(readOnly = false)
public int modifyExchangeAfterUser(String userId,String id){ // public int addNotice(String reportId,String supplementTitle){
return reportDao.modifyExchangeAfterUser(userId,id); //
} // if ()
// return reportDao.modifyExchangeAfterUser(userId,id);
// }
} }
src/main/java/com/ejweb/modules/report/web/ReportController.java
package com.ejweb.modules.report.web; package com.ejweb.modules.report.web;
import com.alibaba.fastjson.JSONObject;
import com.ejweb.core.base.BaseController; import com.ejweb.core.base.BaseController;
import com.ejweb.core.persistence.Page; import com.ejweb.core.persistence.Page;
import com.ejweb.core.utils.StringUtils; import com.ejweb.core.utils.StringUtils;
...@@ -20,6 +21,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; ...@@ -20,6 +21,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List; import java.util.List;
/** /**
...@@ -144,16 +147,28 @@ public class ReportController extends BaseController { ...@@ -144,16 +147,28 @@ public class ReportController extends BaseController {
* @return * @return
*/ */
@RequestMapping(value = "track") @RequestMapping(value = "track")
public String track(ReportEntity reportEntity, Model model) { public String track(ReportEntity reportEntity,HttpServletRequest request, HttpServletResponse response, Model model) {
User user = UserUtils.getUser(); User user = UserUtils.getUser();
String roleName = reportService.findRole(user); String roleName = reportService.findRole(user);
String transferFlag = "0"; String transferFlag = "0";
if (roleName.equals("系统管理员")){ if (roleName.equals("系统管理员")){
transferFlag = "1"; transferFlag = "1";
} }
List<Office> companyList = reportService.getCompanyList();
List<Office> officeList = reportService.getOfficeList();
List<User> positionList = reportService.getPositionList();
Page<User> page = reportService.findUserPage(new Page<User>(request, response), user);
User userEntity = new User();
Page<User> userPage = reportService.findUserPage(new Page<User>(request, response), userEntity);
model.addAttribute("page", page);
model.addAttribute("user", userEntity);
model.addAttribute("currentUser", user.getName()); model.addAttribute("currentUser", user.getName());
model.addAttribute("transferFlag", transferFlag); model.addAttribute("transferFlag", transferFlag);
model.addAttribute("report", reportEntity); model.addAttribute("report", reportEntity);
model.addAttribute("companyList", companyList);
model.addAttribute("officeList", officeList);
model.addAttribute("positionList", positionList);
model.addAttribute("userPage", userPage);
return "modules/report/reportTrack"; return "modules/report/reportTrack";
} }
...@@ -178,37 +193,58 @@ public class ReportController extends BaseController { ...@@ -178,37 +193,58 @@ public class ReportController extends BaseController {
* 移交列表 * 移交列表
* *
* @param user * @param user
* @param model
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
@RequestMapping(value = "viewTransfer") @RequestMapping(value = "viewTransfer")
public String viewTransfer(ReportEntity reportEntity,User user,HttpServletRequest request, HttpServletResponse response, Model model) { public void viewTransfer(User user,HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
Page<User> page = reportService.findUserPage(new Page<User>(request, response), user); Page<User> page = reportService.findUserPage(new Page<User>(request, response), user);
List<Office> companyList = reportService.getCompanyList(); StringBuffer html = new StringBuffer();
List<Office> officeList = reportService.getOfficeList(); html.append("<table id='contentTable' class='table table-striped table-bordered table-condensed'>");
List<User> positionList = reportService.getPositionList(); html.append(" <thead>");
model.addAttribute("page", page); html.append(" <tr>");
model.addAttribute("companyList", companyList); html.append(" <th>选择</th>");
model.addAttribute("officeList", officeList); html.append(" <th>ID</th>");
model.addAttribute("positionList", positionList); html.append(" <th>员工号</th>");
model.addAttribute("User", user); html.append(" <th>姓名</th>");
model.addAttribute("report", reportEntity); html.append(" <th>手机号</th>");
return "modules/report/reportTransfer"; html.append(" <th>所属公司</th>");
} html.append(" <th>所属部门</th>");
html.append(" <th>职位</th>");
html.append(" </tr>");
html.append(" </thead>");
html.append(" <tbody>");
if (page.getList().size() > 0){
int i = 1;
for (User userEntity : page.getList()){
html.append(" <tr>");
html.append(" <td><input type='radio' value='"+userEntity.getId()+"' onclick='chooseRen(this);'></td>");
html.append(" <td>"+i+"</td>");
html.append(" <td>"+(userEntity.getNo()==null?"":userEntity.getNo())+"</td>");
html.append(" <td>"+(userEntity.getName()==null?"":userEntity.getName())+"</td>");
html.append(" <td>"+(userEntity.getMobile()==null?"":userEntity.getMobile())+"</td>");
html.append(" <td>"+(userEntity.getCompany()==null?"":userEntity.getCompany().getName())+ "</td>");
html.append(" <td>"+(userEntity.getOffice()==null?"":userEntity.getOffice().getName())+ "</td>");
html.append(" <td>"+(userEntity.getPositionName()==null?"":userEntity.getPositionName())+"</td>");
html.append(" </tr>");
i++;
}
}
html.append(" </tbody>");
html.append("</table>");
html.append("<span id='chooseItem'></span>");
if (page.getList().size() == 0){
html.append(" <span style='color: #999999;margin: 20px 0 70px 20px;display: block;'>未查询到相关内容</span>");
}
if (page.getList().size() > 0){
html.append(" <div class='pagination'>"+page+"</div>");
}
PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8");
out.write(html.toString());
out.close();
/**
* 移交操作
*
* @param userId
* @param model
* @return
*/
@RequestMapping(value = "transfer")
public String transfer(ReportEntity reportEntity,String userId, Model model, RedirectAttributes redirectAttributes) {
reportService.modifyExchangeAfterUser(userId,reportEntity.getId());
addMessage(redirectAttributes, "移交举报"+ reportEntity.getReportProject() + "'成功");
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
} }
} }
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -194,6 +194,7 @@ ...@@ -194,6 +194,7 @@
supplement_project = #{supplementProject}, supplement_project = #{supplementProject},
supplement_content = #{supplementContent}, supplement_content = #{supplementContent},
deal_person_name = #{dealPersonName}, deal_person_name = #{dealPersonName},
exchange_after_user = #{exchangeAfterUser},
deal_result = #{dealResult}, deal_result = #{dealResult},
update_by = #{updateBy.id}, update_by = #{updateBy.id},
update_date = #{updateDate} update_date = #{updateDate}
...@@ -276,12 +277,6 @@ ...@@ -276,12 +277,6 @@
FROM sys_position FROM sys_position
</select> </select>
<update id="modifyExchangeAfterUser" parameterType="HashMap">
UPDATE report SET
exchange_after_user = #{0}
WHERE id = #{1}
</update>
<select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap"> <select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
select report_status,COUNT(report_status) select report_status,COUNT(report_status)
FROM report FROM report
......
src/main/webapp/WEB-INF/views/modules/report/reportTransfer.jsp deleted 100644 → 0
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
<html>
<head>
<title>举报管理</title>
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function() {
$("#btnConfirm").click(function () {
var userId = $('input:radio:checked').val();
var id = "${report.id}";
window.location.href = "${ctx}/report/transfer?id="+id+"&userId="+userId;
});
$("input:radio").click(function () {
$("input:radio").attr("checked",false);
$("#chooseItem").empty();
$(this).attr("checked",true);
$("#chooseItem").html("已选择 " + $("input:radio:checked").parent().next().next().next().html()+"<span onclick='remove();'><font size='5'> ×</font></span>");
});
});
function remove(){
$("input:radio").attr("checked",false);
$("#chooseItem").empty();
}
function page(n,s){
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").attr("action", "${ctx}/report/viewTransfer");
$("#searchForm").submit();
return false;
}
function resetPageNo() {
$("#pageNo").val(0);
}
</script>
</head>
<body>
<ul class="nav nav-tabs">
<li class="active"><a href="${ctx}/report/viewTransfer">选择移交人员</a></li>
</ul>
<form:form id="searchForm" modelAttribute="user" action="${ctx}/report/viewTransfer?id=${report.id}" method="post" class="breadcrumb form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<ul class="ul-form">
<li><label>员工号：</label><form:input onchange="resetPageNo();" path="no" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>姓名：</label><form:input onchange="resetPageNo();" path="name" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>手机号：</label><form:input onchange="resetPageNo();" path="mobile" htmlEscape="false" maxlength="50" class="input-small"/></li>
<li><label>公司：</label><form:select onchange="resetPageNo();" path="company.id" class="input-small ">
<form:option value=" ">请选择</form:option>
<form:options items="${companyList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
</form:select></li>
<li class="clearfix"></li>
<li><label>部门：</label><form:select onchange="resetPageNo();" path="office.id" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${officeList}" itemLabel="name" itemValue="id" htmlEscape="false"/></form:select></li>
<li><label>职位：</label><form:select onchange="resetPageNo();" path="positionName" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${positionList}" itemLabel="positionName" itemValue="positionName" htmlEscape="false"/></form:select></li>
<li class="btns">
<label style="width:auto;"><input id="btnSubmit" class="btn btn-primary" type="submit" value="筛选"/>&nbsp;&nbsp;</label>
</li>
<li class="clearfix"></li>
</ul>
</form:form>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>选择</th>
<th>ID</th>
<th>员工号</th>
<th>姓名</th>
<th>手机号</th>
<th>所属公司</th>
<th>所属部门</th>
<th>职位</th>
</tr>
</thead>
<tbody>
<c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="user" varStatus="vs">
<tr>
<td><input type="radio" value="${user.id}"></td>
<td>${vs.count}</td>
<td>${user.no}</td>
<td>${user.name}</td>
<td>${user.mobile}</td>
<td>${user.company.name}</td>
<td>${user.office.name}</td>
<td>${user.positionName}</td>
</tr>
</c:forEach>
</c:if>
</tbody>
</table>
<span id="chooseItem"></span>
<c:if test="${page.list.size()=='0'}">
<span style="color: #999999;margin: 20px 0 70px 20px;display: block;">未查询到相关内容</span>
</c:if>
<c:if test="${page.list.size()>0}">
<div class="pagination">${page}</div>
</c:if>
<li class="btns">
<label style="width:auto;"><input id="btnConfirm" class="btn btn-primary" type="button" value="确定"/>&nbsp;&nbsp;
<input id="btnClose" class="btn btn-primary" type="button" value="关闭" onclick="javascript:window.close();"/></label>
</li>
</body>
</html>
\ No newline at end of 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