Skip to content

S
sunac_report
Commit 18cd3558 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent be7b7df1
Showing with 186 additions and 84 deletions
.idea/misc.xml
...@@ -13,74 +13,7 @@ ...@@ -13,74 +13,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Android</id>
</State>
<State>
<id>Android &gt; Lint &gt; Correctness</id>
</State>
<State>
<id>Android Lint for Kotlin</id>
</State>
<State>
<id>CSS</id>
</State>
<State>
<id>CorrectnessLintAndroid</id>
</State>
<State>
<id>Groovy</id>
</State>
<State>
<id>Invalid elementsCSS</id>
</State>
<State>
<id>JSP Inspections</id>
</State>
<State>
<id>Java</id>
</State>
<State>
<id>LintAndroid</id>
</State>
<State>
<id>OtherGroovy</id>
</State>
<State>
<id>Play</id>
</State>
<State>
<id>Security issuesJava</id>
</State>
<State>
<id>Spring</id>
</State>
<State>
<id>Spring CoreSpring</id>
</State>
<State>
<id>Threading issuesJava</id>
</State>
<State>
<id>XMLSpring CoreSpring</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Android</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
\ No newline at end of file
report_sunac.iml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="FacetManager"> <component name="FacetManager">
<facet type="web" name="Web"> <facet type="web" name="Web">
<configuration> <configuration>
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
...@@ -222,4 +222,13 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -222,4 +222,13 @@ public interface ReportDao extends CrudDao<ReportEntity> {
*/ */
public int deleteConclusion(ReportEntity reportEntity); public int deleteConclusion(ReportEntity reportEntity);
/**
* 删除举报信息
*
* @param reportEntity
* @return
*/
public int deleteNotice(ReportEntity reportEntity);
} }
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -54,6 +54,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -54,6 +54,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String lStatus; //关闭修改状态 private String lStatus; //关闭修改状态
private String isAdmin; //是否管理员 private String isAdmin; //是否管理员
private String oaarea; //账号区域 private String oaarea; //账号区域
public String getOaarea() { public String getOaarea() {
return oaarea; return oaarea;
} }
...@@ -63,7 +64,6 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -63,7 +64,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
} }
public String getIsAdmin() { public String getIsAdmin() {
return isAdmin; return isAdmin;
} }
...@@ -81,7 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -81,7 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
} }
// private String ifDone; //是否完成 // private String ifDone; //是否完成
// //
// //
...@@ -100,6 +99,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -100,6 +99,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportProject() { public String getReportProject() {
return reportProject; return reportProject;
} }
@ExcelField(title = "OA账号", align = 2, sort = 26) @ExcelField(title = "OA账号", align = 2, sort = 26)
public String getOaname() { public String getOaname() {
return oaname; return oaname;
...@@ -152,6 +152,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -152,6 +152,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportPersonTel() { public String getReportPersonTel() {
return reportPersonTel; return reportPersonTel;
} }
@ExcelField(title = "举报途径", align = 2, sort = 36) @ExcelField(title = "举报途径", align = 2, sort = 36)
public String getReportSource() { public String getReportSource() {
return reportSource; return reportSource;
...@@ -262,7 +263,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -262,7 +263,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealResult = dealResult; this.dealResult = dealResult;
} }
@ExcelField(title = "移交部门", align = 2, sort =44) @ExcelField(title = "移交部门", align = 2, sort = 44)
public String getTransferDepartment() { public String getTransferDepartment() {
return transferDepartment; return transferDepartment;
} }
...@@ -276,7 +277,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -276,7 +277,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealPersonName = dealPersonName; this.dealPersonName = dealPersonName;
} }
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getExchangeAfterUser() { public String getExchangeAfterUser() {
return exchangeAfterUser; return exchangeAfterUser;
} }
...@@ -361,7 +362,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -361,7 +362,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types; this.types = types;
} }
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getTransferName() { public String getTransferName() {
return transferName; return transferName;
} }
...@@ -370,7 +371,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -370,7 +371,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName; this.transferName = transferName;
} }
@ExcelField(title = "IP来源", align = 2, sort =54) @ExcelField(title = "IP来源", align = 2, sort = 54)
public String getReportIp() { public String getReportIp() {
return reportIp; return reportIp;
} }
...@@ -388,7 +389,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -388,7 +389,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity; this.ipCity = ipCity;
} }
@ExcelField(title = "邮件发送", align = 2, sort =58) @ExcelField(title = "邮件发送", align = 2, sort = 58)
public String getIsSendEmail() { public String getIsSendEmail() {
return isSendEmail; return isSendEmail;
} }
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -444,7 +444,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -444,7 +444,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} else { } else {
TransferDepartment = ""; TransferDepartment = "";
} }
report.setTransferName(TransferDepartment); report.setTransferDepartment(TransferDepartment);
//举报途径 //举报途径
String reportSource = report.getReportSource(); String reportSource = report.getReportSource();
if (StringUtils.isNotBlank(reportSource)) { if (StringUtils.isNotBlank(reportSource)) {
...@@ -468,7 +468,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -468,7 +468,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
} else { } else {
reportSource = ""; reportSource = "";
} }
report.setReportStatus(reportSource); report.setReportSource(reportSource);
//状态 //状态
String reportStatus = report.getReportStatus(); String reportStatus = report.getReportStatus();
if (StringUtils.isNotBlank(reportStatus)) { if (StringUtils.isNotBlank(reportStatus)) {
...@@ -781,7 +781,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -781,7 +781,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
*/ */
@Transactional(readOnly = false) @Transactional(readOnly = false)
public int deleteConclusion(ReportEntity reportEntity) { public int deleteConclusion(ReportEntity reportEntity) {
reportDao.deleteNotice(reportEntity);
return reportDao.deleteConclusion(reportEntity); return reportDao.deleteConclusion(reportEntity);
} }
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -387,6 +387,41 @@ public class ReportController extends BaseController { ...@@ -387,6 +387,41 @@ public class ReportController extends BaseController {
if (count != 0) { if (count != 0) {
result = count.toString(); result = count.toString();
} }
if (StringUtils.isNotBlank(reportEntity.getTransferDepartment())) {
if (reportEntity.getTransferDepartment().equals("1")) {
reportEntity.setTransferDepartment("营销");
} else if (reportEntity.getTransferDepartment().equals("2")) {
reportEntity.setTransferDepartment("工程");
} else if (reportEntity.getTransferDepartment().equals("3")) {
reportEntity.setTransferDepartment("成本");
} else if (reportEntity.getTransferDepartment().equals("4")) {
reportEntity.setTransferDepartment("招采");
} else if (reportEntity.getTransferDepartment().equals("5")) {
reportEntity.setTransferDepartment("财务");
} else if (reportEntity.getTransferDepartment().equals("6")) {
reportEntity.setTransferDepartment("法务");
} else if (reportEntity.getTransferDepartment().equals("7")) {
reportEntity.setTransferDepartment("行政");
} else if (reportEntity.getTransferDepartment().equals("8")) {
reportEntity.setTransferDepartment("人力");
} else if (reportEntity.getTransferDepartment().equals("9")) {
reportEntity.setTransferDepartment("开发");
} else if (reportEntity.getTransferDepartment().equals("10")) {
reportEntity.setTransferDepartment("研发");
} else if (reportEntity.getTransferDepartment().equals("11")) {
reportEntity.setTransferDepartment("投资");
} else if (reportEntity.getTransferDepartment().equals("12")) {
reportEntity.setTransferDepartment("其他");
} else if (reportEntity.getTransferDepartment().equals("13")) {
reportEntity.setTransferDepartment("物业管理");
} else if (reportEntity.getTransferDepartment().equals("14")) {
reportEntity.setTransferDepartment("酒店管理");
} else if (reportEntity.getTransferDepartment().equals("15")) {
reportEntity.setTransferDepartment("商业管理");
}
}
model.addAttribute("isAdmin", isAdmin); model.addAttribute("isAdmin", isAdmin);
model.addAttribute("report", reportEntity); model.addAttribute("report", reportEntity);
model.addAttribute("reportAttachmentList", reportAttachmentList); model.addAttribute("reportAttachmentList", reportAttachmentList);
...@@ -478,8 +513,18 @@ public class ReportController extends BaseController { ...@@ -478,8 +513,18 @@ public class ReportController extends BaseController {
@RequestMapping(value = "addTrack") @RequestMapping(value = "addTrack")
public String addTrack(ReportEntity reportEntity, HttpServletRequest request, Model public String addTrack(ReportEntity reportEntity, HttpServletRequest request, Model
model, RedirectAttributes redirectAttributes) { model, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
String ifDone = request.getParameter("ifDone"); // 是否完成 String ifDone = request.getParameter("ifDone"); // 是否完成
// String transferUser = "";
// if (StringUtils.isBlank(request.getParameter("exchangeAfterUser")) && reportEntity.getReportStatus().equals("0")) {
// transferUser = reportEntity.getExchangeBeforeUser();
// } else if (StringUtils.isNotBlank(request.getParameter("exchangeAfterUser"))) {
String transferUser = request.getParameter("exchangeAfterUser"); //选择移交人员 String transferUser = request.getParameter("exchangeAfterUser"); //选择移交人员
// }
if (!beanValidator(model, reportEntity)) { if (!beanValidator(model, reportEntity)) {
return form(reportEntity, model); return form(reportEntity, model);
} }
...@@ -605,6 +650,16 @@ public class ReportController extends BaseController { ...@@ -605,6 +650,16 @@ public class ReportController extends BaseController {
out.close(); out.close();
} }
/**
* 集团列表导出
*
* @param reportEntity
* @param flag
* @param request
* @param response
* @param redirectAttributes
* @return
*/
@RequestMapping(value = "export", method = RequestMethod.POST) @RequestMapping(value = "export", method = RequestMethod.POST)
public String export(ReportEntity reportEntity, String flag, HttpServletRequest public String export(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, RedirectAttributes redirectAttributes) { request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
...@@ -650,6 +705,61 @@ public class ReportController extends BaseController { ...@@ -650,6 +705,61 @@ public class ReportController extends BaseController {
} }
/** /**
* 区域列表导出
*
* @param reportEntity
* @param flag
* @param request
* @param response
* @param redirectAttributes
* @return
*/
@RequestMapping(value = "qyexport", method = RequestMethod.POST)
public String qyexport(ReportEntity reportEntity, String flag, HttpServletRequest
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
if (!isAdmin) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = null;
if (!reportService.checkRole(user)) {
reportList = reportService.getReportQyList(reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportList = reportService.getReportQyList(reportEntity);
}
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息：" + e.getMessage());
}
return "redirect:" + adminPath + "/report/list/?repage&flag=" + flag;
}
/**
* 转交列表 * 转交列表
* *
* @param reportEntity * @param reportEntity
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -727,7 +727,13 @@ ...@@ -727,7 +727,13 @@
<update id="updateConclusion"> <update id="updateConclusion">
UPDATE ct_bbtc_report SET UPDATE ct_bbtc_report SET
report_status= '3', report_status= '3',
deal_result = #{lStatus} deal_result = #{dealResult},
<if test="transferDepartment =='6'">
transfer_department = #{transferDepartment}
</if>
<if test="transferDepartment !='6'">
transfer_department = ''
</if>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
...@@ -754,4 +760,9 @@ ...@@ -754,4 +760,9 @@
delete from ct_bbtc_report delete from ct_bbtc_report
where id = #{id} where id = #{id}
</delete> </delete>
<delete id="deleteNotice">
delete from CT_BBTC_REPORT_NOTICE
where report_id = #{id}
</delete>
</mapper> </mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
} else if (dealResult == "4") { } else if (dealResult == "4") {
dealResult = "举报属实"; dealResult = "举报属实";
} else if (dealResult == "5") { } else if (dealResult == "5") {
dealResult = "举报不是"; dealResult = "举报不实";
} else if (dealResult == "6") { } else if (dealResult == "6") {
dealResult = "移交其他部门"; dealResult = "移交其他部门";
} }
...@@ -78,6 +78,17 @@ ...@@ -78,6 +78,17 @@
top.$.jBox.tip('正在加载，请稍等', 'warning'); top.$.jBox.tip('正在加载，请稍等', 'warning');
} }
} }
//显示是否完成选择框
function showDone() {
var dealResult = $("#dealResult").val();
if (dealResult == "6") {
$("#selectType").show();
} else {
$("#selectType").hide();
}
}
</script> </script>
<style type="text/css"> <style type="text/css">
.title { .title {
...@@ -241,13 +252,38 @@ ...@@ -241,13 +252,38 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">处理结论:</label> <label class="control-label">处理结论:</label>
<div class="controls"> <div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="lStatus" class="input-small"> <c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="dealResult" path="dealResult"
class="input-small"
onchange="showDone();">
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></c:if> htmlEscape="false"/></form:select></c:if>
<c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path="dealResult" <c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path=""
value="${report.dealResult}"
htmlEscape="false" maxlength="200" htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if> class="input-xlarge required"/></c:if>
</div> </div>
<div id="selectType" class="control-group" style="display:none">
<label class="control-label">移交部门:</label>
<div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select id="" path="transferDepartment"
class="input-small required">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></c:if>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<c:if test="${report.dealResult eq '6'}">
<div id="transferDepartmentid" class="control-group">
<label class="control-label">移交部门:</label>
<div class="controls">
<form:input id="transferDepartment" path=""
value="${report.transferDepartment}"
htmlEscape="false" maxlength="200"
class="input-xlarge"/>
</div>
</div>
</c:if>
</div> </div>
</c:if> </c:if>
<li class="btns"> <li class="btns">
......
target/report_sunac/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Built-By: dell1 Built-By: dell1
Created-By: IntelliJ IDEA Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_121 Build-Jdk: 1.8.0_171
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