Skip to content

S
sunac_report
Commit ae122b24 by Java-刘铮
Options

需求更新

parent 3ccfbeb8
Showing with 1237 additions and 268 deletions
.idea/workspace.xml
This source diff could not be displayed because it is too large. You can view the blob instead.
report_sunac.iml
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<descriptors>
......@@ -11,9 +14,6 @@
</webroots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/classes" />
......@@ -21,9 +21,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/.idea" />
<excludeFolder url="file://$MODULE_DIR$/doc" />
<excludeFolder url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
......
src/main/java/com/ejweb/core/utils/excel/ExportExcel.java
......@@ -90,7 +90,7 @@ public class ExportExcel {
* @param title 表格标题，传“空值”，表示无标题
* @param cls 实体对象，通过annotation.ExportField获取标题
*/
public ExportExcel(String title, Class<?> cls, boolean isAdmin){
public ExportExcel(String title, Class<?> cls, String isAdmin){
this(title, cls, isAdmin,1);
}
......@@ -180,7 +180,7 @@ public class ExportExcel {
* @param type 导出类型（1:导出数据；2：导出模板）
* @param groups 导入分组
*/
public ExportExcel(String title, Class<?> cls, boolean isAdmin, int type, int... groups){
public ExportExcel(String title, Class<?> cls, String isAdmin, int type, int... groups){
// Get annotation field
Field[] fs = cls.getDeclaredFields();
for (Field f : fs){
......@@ -225,7 +225,7 @@ public class ExportExcel {
}
}
}else{
if (isAdmin){
if (isAdmin.equals("1")){
annotationList.add(new Object[]{ef, m});
}else {
if (!m.getName().equals("getTransferName")){
......
src/main/java/com/ejweb/modules/front/report/bean/FrontReportBean.java
......@@ -40,9 +40,71 @@ public class FrontReportBean extends BaseBean{
private String updateBy; //更新人\
private Timestamp updateDate; //更新时间
private List<String> ids;
private String code;// 验证码返回的code
private String captcha;// 验证码
private String participants; //参与人
private String insider; //知情人
private String suggestion; //调查建议
private String reportDate; //事件时间
private String site; //发生地点
private String qq; //qq
private String weixin; //微信号
public String getParticipants() {
return participants;
}
public void setParticipants(String participants) {
this.participants = participants;
}
public String getInsider() {
return insider;
}
public void setInsider(String insider) {
this.insider = insider;
}
public String getSuggestion() {
return suggestion;
}
public void setSuggestion(String suggestion) {
this.suggestion = suggestion;
}
public String getReportDate() {
return reportDate;
}
public void setReportDate(String reportDate) {
this.reportDate = reportDate;
}
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public String getWeixin() {
return weixin;
}
public void setWeixin(String weixin) {
this.weixin = weixin;
}
private List<ReportAttachmentBean> reportAttachmentList; // 附件
......
src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java
......@@ -37,22 +37,23 @@ import java.util.List;
@Service
@Transactional(readOnly = true)
public class FrontReportService extends CrudService<FrontReportDao,FrontReportEntity>{
public class FrontReportService extends CrudService<FrontReportDao, FrontReportEntity> {
private static Logger log = LoggerFactory.getLogger(FrontReportService.class);
// 添加举报信息
@Transactional(readOnly = false)
public ResponseBean addReport(FrontReportBean bean,String token,HttpServletRequest request){
public ResponseBean addReport(FrontReportBean bean, String token, HttpServletRequest request) {
ResponseBean responseBean = new ResponseBean();
String reportId = IdWorker.getNextId("R");
bean.setId(reportId);
Date date = new Date();
bean.setReportTime(DateUtils.formatDate(date,"yyyy-MM-dd HH:mm:ss"));
bean.setReportTime(DateUtils.formatDate(date, "yyyy-MM-dd HH:mm:ss"));
bean.setReportStatus("0");
log.info("report_source为:"+bean.getReportSource());
log.info("token为:"+token);
if (bean.getReportSource().contains("oa")){
log.info("report_source为:" + bean.getReportSource());
log.info("token为:" + token);
if (bean.getReportSource().contains("oa")) {
try {
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
Resource resource = resourceLoader.getResource("LtpaToken.properties");
......@@ -69,6 +70,7 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
LtpaToken ltpaToken = new LtpaToken(token);
username = ltpaToken.getUsername();
bean.setOaName(username);
bean.setReportPersonName(bean.getReportPersonName() + "-融创OA帐号:" + username);
}
} catch (Exception e) {
e.printStackTrace();
......@@ -77,7 +79,7 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
// 查询管理员
User user = dao.getUser(new User());
if(user!= null){
if (user != null) {
bean.setExchangeBeforeUser(user.getId());
}
bean.setCreateBy(user.getId());
......@@ -86,7 +88,7 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
bean.setCreateDate(d);
bean.setUpdateDate(d);
int port =request.getRemotePort();//返回发出请求的客户机的端口号。
int port = request.getRemotePort();//返回发出请求的客户机的端口号。
// logger.info("port："+port);
// String ip = StringUtils.getRemoteAddr(Servlets.getRequest());
// /** 根据ip获得城市 */
......@@ -100,19 +102,19 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
// bean.setReportIp(ip);
//
// bean.setExchangeBeforeUser("");
// bean.setExchangeBeforeUser("");
// 添加举报信息表
int row = 0;
try {
row = dao.insertReport(bean);
}catch (Exception e){
} catch (Exception e) {
row = dao.insertReport(bean);
}
if(row == 1){ // 添加成功
if (row == 1) { // 添加成功
List<String> attachmentIds = bean.getIds();
if(attachmentIds != null && attachmentIds.size() > 0){ // 添加举报附件
for(String attachmentId:attachmentIds){
ReportAttachmentUtils.addReportId(attachmentId,reportId);
if (attachmentIds != null && attachmentIds.size() > 0) { // 添加举报附件
for (String attachmentId : attachmentIds) {
ReportAttachmentUtils.addReportId(attachmentId, reportId);
}
}
......
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
......@@ -210,6 +210,22 @@ public interface ReportDao extends CrudDao<ReportEntity> {
public int updateConclusion(ReportEntity reportEntity);
/**
* 重新跟踪
*
* @param reportEntity
* @return
*/
public int againUpdateConclusion(ReportEntity reportEntity);
/**
* 转为线索
*
* @param reportEntity
* @return
*/
public int cluesUpdateConclusion(ReportEntity reportEntity);
/**
* 总数
*/
public int getTotalNum(WorkbenchBean bean);
......@@ -230,5 +246,15 @@ public interface ReportDao extends CrudDao<ReportEntity> {
*/
public int deleteNotice(ReportEntity reportEntity);
/**
* 查询有效用户
* @return
*/
public List<User> findAllUserList();
/**
* 查询移交给那位用户
* @return
*/
public String selectExchangeAfterUser(String report);
}
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
......@@ -25,7 +25,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String reportPersonTel; //举报人电话
private String reportPersonEmail; //举报人邮箱
private String reportSource; //举报途径 web:官网 oa:融创OA系统 supplier:供应商系统 wechat:微信公众号 sunacE:融E offline:线下扫码 tel:电话 email:邮件 visit:来访
private String reportStatus; //举报状态 0 未处理 1 处理中 2 已处理
private String reportStatus; //举报状态 0 未处理 1 处理中 2 已处理 3已关闭 4 待处理
private String supplementCompany; //被举报公司
private String supplementDepartment; //被举报部门
private String supplementInformant; //被举报人
......@@ -53,7 +53,99 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String dealPerson;
private String lStatus; //关闭修改状态
private String isAdmin; //是否管理员
private String isFzAdmin; //是否輔助管理员
private String oaarea; //账号区域
private String participants; //参与人
private String insider; //知情人
private String suggestion; //调查建议
private String reportDate; //事件时间
private String site; //发生地点
private String qq; //qq
private String weixin; //微信号
private String ifClue; //联系人是否可见
public String getIfClue() {
return ifClue;
}
public void setIfClue(String ifClue) {
this.ifClue = ifClue;
}
public String getSelectExchangeAfterUser() {
return selectExchangeAfterUser;
}
public void setSelectExchangeAfterUser(String selectExchangeAfterUser) {
this.selectExchangeAfterUser = selectExchangeAfterUser;
}
private String selectExchangeAfterUser; //查询移交人
public String getIsFzAdmin() {
return isFzAdmin;
}
public void setIsFzAdmin(String isFzAdmin) {
this.isFzAdmin = isFzAdmin;
}
public String getParticipants() {
return participants;
}
public void setParticipants(String participants) {
this.participants = participants;
}
public String getInsider() {
return insider;
}
public void setInsider(String insider) {
this.insider = insider;
}
public String getSuggestion() {
return suggestion;
}
public void setSuggestion(String suggestion) {
this.suggestion = suggestion;
}
public String getReportDate() {
return reportDate;
}
public void setReportDate(String reportDate) {
this.reportDate = reportDate;
}
public String getSite() {
return site;
}
public void setSite(String site) {
this.site = site;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public String getWeixin() {
return weixin;
}
public void setWeixin(String weixin) {
this.weixin = weixin;
}
public String getOaarea() {
return oaarea;
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
package com.ejweb.modules.report.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ejweb.core.persistence.Page;
import com.ejweb.core.service.CrudService;
import com.ejweb.core.utils.IdGen;
......@@ -18,6 +19,7 @@ import com.ejweb.modules.sys.entity.Role;
import com.ejweb.modules.sys.entity.User;
import com.ejweb.modules.sys.utils.UserUtils;
import com.ejweb.modules.workbench.entity.ReportNotice;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -88,19 +90,23 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
reportEntity.setReportTime(reportTime);
reportEntity.setReportStatus("0");
reportEntity.setExchangeBeforeUser(reportEntity.getCreateBy().getId());
if (!this.checkRole(user)) {
if (!this.checkRole(user).equals("1")) {
reportEntity.setExchangeAfterUser(reportEntity.getCreateBy().getId());
}
String ip = user.getLoginIp();
int port = request.getRemotePort();//返回发出请求的客户机的端口号。
// logger.info("port："+port);
// ip = "183.129.142.154";
String url = "http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=js&ip=" + ip;
// ip = "183.129.142.154";&ip=" + ip
String url = "http://pv.sohu.com/cityjson?ie=utf-8";
String ipResult = IpUtils.getURLContent(url).replace(";", "");
if (ipResult != "-2") {
IP2Regions json = JSON.parseObject(ipResult.split("=")[1], IP2Regions.class);
String city = json.getCity();
if (StringUtils.isNotBlank(ipResult)) {
// String[] ipCity = ipResult.split("=");
JSONObject json = JSON.parseObject(ipResult.split("=")[1]);
String city = json.getString("cname");
reportEntity.setIpCity(city);
}
reportEntity.setReportIp(ip);
dao.addReport(reportEntity);
......@@ -300,6 +306,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}
}
reportDao.updateReportNotice(reportNotice);
// if (updateCheckRole(reportEntity.getExchangeBeforeUser()).equals("辅助管理员")){
// reportNotice.setSendToId(reportEntity.getExchangeBeforeUser());
// reportDao.updateReportNotice(reportNotice);
// }
return 1;
} else {
//消息表中不存在该条举报的信息，新增记录
......@@ -502,6 +512,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
dealResult = "举报不实";
} else if (dealResult.equals("6")) {
dealResult = "移交其他部门";
} else if (dealResult.equals("7")) {
dealResult = "转为线索";
}
} else {
......@@ -536,7 +548,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
report.setSupplementInformant(report.getSupplementInformant() == null ? "--" : report.getSupplementInformant());
report.setDealPersonName(report.getDealPersonName() == null ? "--" : report.getDealPersonName());
User user = UserUtils.getUser();
if (this.checkRole(user)) {
if (this.checkRole(user).equals("1")) {
if (StringUtils.isBlank(report.getTransferName()) || StringUtils.isBlank(report.getExchangeType())) {
report.setTransferName("--");
} else if (StringUtils.isNotBlank(report.getTransferName()) && StringUtils.isNotBlank(report.getExchangeType())) {
......@@ -569,8 +581,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
public List<ReportEntity> getReportQyList(ReportEntity reportEntity) {
List<ReportEntity> reportList = reportDao.findQyList(reportEntity);
String exchangeAfterUser = "";
for (ReportEntity report : reportList)
{
for (ReportEntity report : reportList) {
exchangeAfterUser = reportDao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
String typeStr = "";
......@@ -706,6 +717,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
dealResult = "举报不实";
} else if (dealResult.equals("6")) {
dealResult = "移交其他部门";
} else if (dealResult.equals("7")) {
dealResult = "转为线索";
}
} else {
......@@ -740,7 +753,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
report.setSupplementInformant(report.getSupplementInformant() == null ? "--" : report.getSupplementInformant());
report.setDealPersonName(report.getDealPersonName() == null ? "--" : report.getDealPersonName());
User user = UserUtils.getUser();
if (this.checkRole(user)) {
if (this.checkRole(user).equals("1")) {
if (StringUtils.isBlank(report.getTransferName()) || StringUtils.isBlank(report.getExchangeType())) {
report.setTransferName("--");
} else if (StringUtils.isNotBlank(report.getTransferName()) && StringUtils.isNotBlank(report.getExchangeType())) {
......@@ -801,25 +814,52 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
}
/**
* 判断当前用户是否为管理员
* 判断当前用户角色 1管理员 2辅助管理员
*
* @param user
* @return
*/
public boolean checkRole(User user) {
boolean isAdmin = false;
public String checkRole(User user) {
String roleNum = "";
Role roleEntity = new Role();
roleEntity.setUser(user);
List<Role> roleList = roleDao.findList(roleEntity);
if (roleList != null && roleList.size() != 0) {
for (Role role : roleList) {
if (role.getName().equals("系统管理员")) {
isAdmin = true;
roleNum = "1";
break;
} else if (role.getName().equals("辅助管理员")) {
roleNum = "2";
break;
}
}
}
return roleNum;
}
/**
* 判断当前用户角色 1管理员 2辅助管理员
*
* @param
* @return
*/
public String updateCheckRole(String transferUser) {
String roleName = "";
User user = UserUtils.get(transferUser);
Role roleEntity = new Role();
roleEntity.setUser(user);
List<Role> roleList = roleDao.findList(roleEntity);
if (roleList != null && roleList.size() != 0) {
for (Role role : roleList) {
if (role.getName().equals("辅助管理员")) {
roleName = "辅助管理员";
break;
}
}
}
return isAdmin;
return roleName;
}
public String findExchangeUser(String id) {
......@@ -858,9 +898,40 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
return reportDao.deleteConclusion(reportEntity);
}
/**
* 重新跟踪
*
* @param reportEntity
* @return
*/
@Transactional(readOnly = false)
public int againUpdateConclusion(ReportEntity reportEntity) {
return reportDao.againUpdateConclusion(reportEntity);
}
/**
* 转为线索
*
* @param reportEntity
* @return
*/
@Transactional(readOnly = false)
public int cluesUpdateConclusion(ReportEntity reportEntity) {
return reportDao.cluesUpdateConclusion(reportEntity);
}
/**
* 区域查询列表
*
* @param page
* @param reportEntity
* @return
*/
public Page<ReportEntity> findQyList(Page<ReportEntity> page, ReportEntity reportEntity) {
reportEntity.setPage(page);
page.setList(reportDao.findQyList(reportEntity));
return page;
}
}
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -3,7 +3,10 @@ package com.ejweb.modules.report.web;
import com.ejweb.core.base.BaseController;
import com.ejweb.core.persistence.Page;
import com.ejweb.core.utils.DateUtils;
import com.ejweb.core.utils.SpringContextHolder;
import com.ejweb.core.utils.StringUtils;
import com.ejweb.core.utils.excel.ExportExcel;
import com.ejweb.modules.report.dao.ReportDao;
import com.ejweb.modules.report.entity.ReportAttachmentEntity;
......@@ -23,11 +26,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Lists;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
/**
......@@ -48,6 +53,7 @@ public class ReportController extends BaseController {
@Autowired
private ReportDao reportdao;
@ModelAttribute
public ReportEntity get(@RequestParam(required = false) String id) {
if (StringUtils.isNotBlank(id)) {
......@@ -71,9 +77,6 @@ public class ReportController extends BaseController {
public String list(ReportEntity reportEntity, String flag, HttpServletRequest request, HttpServletResponse response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表, flag为2，跳转到已处理举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
......@@ -81,26 +84,34 @@ public class ReportController extends BaseController {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (flag.equals("4")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
reportEntity.setDealResult("7");
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
Page<ReportEntity> page = new Page<ReportEntity>(request, response);
page.setPageSize(10);
//判断登录人是区域管理员还是集团管理员
if (!reportService.checkRole(user)) {
if ((!reportService.checkRole(user).equals("1")) && (!reportService.checkRole(user).equals("2"))) {
reportEntity.setExchangeAfterUser(user.getId());
page = reportService.findPage(page, reportEntity);
} else if (reportService.checkRole(user).equals("2")) {
reportEntity.setIsFzAdmin("2");
reportEntity.setExchangeBeforeUser(user.getId());
page = reportService.findPage(page, reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportEntity.setIsAdmin("1");
page = reportService.findPage(page, reportEntity);
}
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist) {
String departmentStr = "";
......@@ -143,6 +154,7 @@ public class ReportController extends BaseController {
report.setSupplementType(departmentStr.substring(0, departmentStr.length() - 1));
}
}
String value = "";
for (ReportEntity report : reportlist) {
if (StringUtils.isNoneBlank(report.getOaarea())) {
......@@ -164,6 +176,8 @@ public class ReportController extends BaseController {
value = "海南区域公司";
} else if (report.getOaarea().equals("Group")) {
value = "集团本部";
} else if (report.getOaarea().equals("PropertyGroup")) {
value = "物业集团";
}
if (StringUtils.isNoneBlank(report.getOaname())) {
report.setOaname(value + "-" + report.getOaname());
......@@ -171,10 +185,10 @@ public class ReportController extends BaseController {
}
String exchangeAfterUser = reportdao.selectExchangeAfterUser(report.getExchangeAfterUser());
report.setTransferName(exchangeAfterUser);
}
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
String isAdmin = reportService.checkRole(user);
model.addAttribute("page", page);
model.addAttribute("report", reportEntity);
model.addAttribute("flag", flag);
......@@ -199,9 +213,6 @@ public class ReportController extends BaseController {
request, HttpServletResponse response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)) {
reportEntity.setExchangeAfterUser(user.getId());
}
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表 flag为2，跳转到已处理举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
......@@ -209,28 +220,44 @@ public class ReportController extends BaseController {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (flag.equals("4")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setDealResult("7");
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
reportEntity.setReportStatus("1");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
Page<ReportEntity> page = new Page<ReportEntity>(request, response);
page.setPageSize(10);
if (!reportService.checkRole(user)) {
// if (!reportService.checkRole(user).equals("1")) {
//
// page = reportService.findQyList(page, reportEntity);
// } else {
// reportEntity.setIsAdmin("1");
// page = reportService.findQyList(page, reportEntity);
// }
if ((!reportService.checkRole(user).equals("1")) && (!reportService.checkRole(user).equals("2"))) {
reportEntity.setExchangeAfterUser(user.getId());
page = reportService.findQyList(page, reportEntity);
} else if (reportService.checkRole(user).equals("2")) {
reportEntity.setIsFzAdmin("2");
reportEntity.setExchangeBeforeUser(user.getId());
page = reportService.findQyList(page, reportEntity);
} else {
reportEntity.setIsAdmin("1");
page = reportService.findQyList(page, reportEntity);
}
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist) {
String typeStr = "";
String departmentStr = "";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
......@@ -292,6 +319,8 @@ public class ReportController extends BaseController {
value = "海南区域公司";
} else if (report.getOaarea().equals("Group")) {
value = "集团本部";
} else if (report.getOaarea().equals("PropertyGroup")) {
value = "物业集团";
}
if (StringUtils.isNoneBlank(report.getOaname())) {
report.setOaname(value + "-" + report.getOaname());
......@@ -302,7 +331,7 @@ public class ReportController extends BaseController {
report.setTransferName(exchangeAfterUser);
}
page.setList(reportlist);
boolean isAdmin = reportService.checkRole(user);
String isAdmin = reportService.checkRole(user);
model.addAttribute("page", page);
model.addAttribute("report", reportEntity);
model.addAttribute("flag", flag);
......@@ -353,7 +382,7 @@ public class ReportController extends BaseController {
public String view(ReportEntity reportEntity, Model model, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User useradmin = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(useradmin);
String isAdmin = reportService.checkRole(useradmin);
//获取举报提交文件列表
ReportAttachmentEntity reportAttachment = new ReportAttachmentEntity();
reportAttachment.setReportId(reportEntity.getId());
......@@ -430,6 +459,13 @@ public class ReportController extends BaseController {
reportEntity.setTransferDepartment("商业管理");
}
}
if (isAdmin.equals("1") || isAdmin.equals("2")) {
model.addAttribute("ifClue", true);
} else {
if (reportEntity.getExchangeType() == null || !(reportEntity.getIfClue().equals("2"))) {
model.addAttribute("ifClue", true);
}
}
model.addAttribute("isAdmin", isAdmin);
model.addAttribute("report", reportEntity);
model.addAttribute("reportAttachmentList", reportAttachmentList);
......@@ -451,7 +487,7 @@ public class ReportController extends BaseController {
response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
String isAdmin = reportService.checkRole(user);
List<Office> companyList = reportService.getCompanyList();
List<Office> officeList = reportService.getOfficeList(new Office());
List<Position> positionList = reportService.getPositionList();
......@@ -496,6 +532,14 @@ public class ReportController extends BaseController {
isSendEmail = "否";
}
reportEntity.setIsSendEmail(isSendEmail);
if (isAdmin.equals("1") || isAdmin.equals("2")) {
model.addAttribute("ifClue", true);
} else {
if (reportEntity.getExchangeType() == null || !(reportEntity.getIfClue().equals("2"))) {
model.addAttribute("ifClue", true);
}
}
model.addAttribute("page", page);
model.addAttribute("user", userEntity);
model.addAttribute("userName", user.getName());
......@@ -523,30 +567,32 @@ public class ReportController extends BaseController {
model, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
String isAdmin = reportService.checkRole(user);
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 ifClue = request.getParameter("ifClue");
String transferUser = request.getParameter("exchangeAfterUser"); //选择移交人员
// }
if ("ifClue".equals(ifClue)) {
reportEntity.setIfClue("1");
} else {
reportEntity.setIfClue("2");
}
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");
}
//判断如果是辅助管理员
if (reportService.updateCheckRole(transferUser).equals("辅助管理员")) {
reportEntity.setExchangeBeforeUser(transferUser);
}
if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())) {
String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
reportEntity.setExchangeAfterUser(exchangeAfterUser);
......@@ -673,10 +719,7 @@ public class ReportController extends BaseController {
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
if (!isAdmin) {
reportEntity.setExchangeAfterUser(user.getId());
}
String isAdmin = reportService.checkRole(user);
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
......@@ -684,26 +727,33 @@ public class ReportController extends BaseController {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (flag.equals("4")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("4");
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
reportEntity.setReportStatus("1");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = null;
if (!reportService.checkRole(user)) {
if ((!reportService.checkRole(user).equals("1")) && (!reportService.checkRole(user).equals("2"))) {
reportEntity.setExchangeAfterUser(user.getId());
reportList = reportService.getReportList(reportEntity);
} else if (reportService.checkRole(user).equals("2")) {
reportEntity.setIsFzAdmin("2");
reportEntity.setExchangeBeforeUser(user.getId());
reportList = reportService.getReportList(reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportEntity.setIsAdmin("1");
reportList = reportService.getReportList(reportEntity);
}
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
......@@ -727,10 +777,7 @@ public class ReportController extends BaseController {
request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
//判断登录人的角色
User user = UserUtils.getUser();
boolean isAdmin = reportService.checkRole(user);
if (!isAdmin) {
reportEntity.setExchangeAfterUser(user.getId());
}
String isAdmin = reportService.checkRole(user);
//判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
if (StringUtils.isNotBlank(flag)) {
if (flag.equals("0")) {
......@@ -738,26 +785,39 @@ public class ReportController extends BaseController {
reportEntity.setReportStatus("0");
}
} else {
if (flag.equals("2")) {
if (flag.equals("4")) {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("4");
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("2");
reportEntity.setReportStatus("1");
}
}
}
} else {
if (StringUtils.isBlank(reportEntity.getReportStatus())) {
reportEntity.setReportStatus("1");
}
}
try {
String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
List<ReportEntity> reportList = null;
if (!reportService.checkRole(user)) {
// if (!(reportService.checkRole(user).equals("1"))) {
// reportEntity.setExchangeAfterUser(user.getId());
// reportList = reportService.getReportQyList(reportEntity);
// } else {
// reportEntity.setIsAdmin(user.getId());
// reportList = reportService.getReportQyList(reportEntity);
// }
if ((!reportService.checkRole(user).equals("1")) && (!reportService.checkRole(user).equals("2"))) {
reportEntity.setExchangeAfterUser(user.getId());
reportList = reportService.getReportQyList(reportEntity);
} else if (reportService.checkRole(user).equals("2")) {
reportEntity.setIsFzAdmin("2");
reportEntity.setExchangeBeforeUser(user.getId());
reportList = reportService.getReportQyList(reportEntity);
} else {
reportEntity.setIsAdmin(user.getId());
reportEntity.setIsAdmin("1");
reportList = reportService.getReportQyList(reportEntity);
}
new ExportExcel("举报列表", ReportEntity.class, isAdmin).setDataList(reportList).write(request, response, fileName).dispose();
return null;
} catch (Exception e) {
......@@ -781,7 +841,7 @@ public class ReportController extends BaseController {
response, Model model) {
//判断登录人的角色
User user = UserUtils.getUser();
if (!reportService.checkRole(user)) {
if (!reportService.checkRole(user).equals("1")) {
reportEntity.setExchangeAfterUser(user.getId());
}
......@@ -897,4 +957,41 @@ public class ReportController extends BaseController {
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
}
/**
* 管理员重新跟踪
*
* @return
*/
@RequestMapping(value = "again")
public String againConclusion(ReportEntity reportEntity) {
reportService.againUpdateConclusion(reportEntity);
return "redirect:" + adminPath + "/report/list/?repage&flag=1";
}
/**
* 转为线索
*
* @return
*/
@RequestMapping(value = "clues")
public String cluesConclusion(ReportEntity reportEntity) {
reportService.cluesUpdateConclusion(reportEntity);
return "redirect:" + adminPath + "/report/list/?repage&flag=4";
}
/**
* 获取系统有效用户
*
* @return //
*/
private static ReportDao userReportDao = SpringContextHolder.getBean(ReportDao.class);
public static List<User> getTransferName() {
List<User> userList = Lists.newArrayList();
userList = userReportDao.findAllUserList();
return userList;
}
}
src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
......@@ -421,6 +421,8 @@ public class ReportToWordController {
deal_result = "举报不实";
} else if (deal_result.equals("6")) {
deal_result = "移交其他部门";
}else if (dealResult.equals("7")) {
deal_result = "转为线索";
}
} else {
deal_result = "";
......
src/main/java/com/ejweb/modules/sys/entity/User.java
......@@ -57,6 +57,24 @@ public class User extends DataEntity<User> {
private Position position; //职位
private String devision; //组织
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
private String label;//
private String value;//
public String getArea() {
return area;
}
......
src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java
......@@ -26,7 +26,7 @@ public class WorkbenchBean {
private int processed = 0;
private int closed = 0;
//举报结果
//处理结论
private int repResultTotal = 0;
private int invalid = 0;
private int complainNum = 0;
......@@ -35,6 +35,7 @@ public class WorkbenchBean {
private int unsettled = 0;
private int unreaListic = 0;
private int transfer = 0;
private int clue = 0;
//总体
private int total = 0;
......@@ -67,6 +68,28 @@ public class WorkbenchBean {
private int Other = 0;
private int land = 0;
//区域
private String area;
//角色
private String userRoleName="";
public String getUserRoleName() {
return userRoleName;
}
public void setUserRoleName(String userRoleName) {
this.userRoleName = userRoleName;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public int getLand() {
return land;
}
......@@ -448,4 +471,13 @@ public class WorkbenchBean {
public void setOther(int other) {
Other = other;
}
public int getClue() {
return clue;
}
public void setClue(int clue) {
this.clue = clue;
}
}
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
......@@ -62,8 +62,10 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
} else if ("6".equals((String) res.get("DEAL_RESULT"))) {
//移交其他部门
workbench.setTransfer(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
} else if ("7".equals((String) res.get("DEAL_RESULT"))) {
//转为线索
workbench.setClue(Integer.valueOf(String.valueOf(res.get("COUNT(DEAL_RESULT)"))));
}
}
}
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
......@@ -33,10 +33,13 @@ public class WorkbenchController extends BaseController {
@Autowired
private ReportService reportService;
private String selAreaTemp;//所选择的区域
@RequiresPermissions("workbench:view")
@RequestMapping(value = {"list", ""})
public String getWorkbench(Model model, WorkbenchBean bean) {
WorkbenchBean workbench;
selAreaTemp=bean.getArea();
try {
User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean);
......@@ -62,6 +65,8 @@ public class WorkbenchController extends BaseController {
User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean);
res.put("bench", bean);
//区域
res.put("area",bean.getArea());
//举报状态
res.put("unProcess", bean.getUnProcess());
res.put("processing", bean.getProcessing());
......@@ -76,6 +81,7 @@ public class WorkbenchController extends BaseController {
res.put("unreaListic", bean.getUnreaListic());
res.put("reportWeichuli", bean.getTotalCount() - bean.getInvalid() - bean.getComplainNum() - bean.getVerified() - bean.getConfirmed() - bean.getUnreaListic() - bean.getTransfer());
res.put("transfer", bean.getTransfer());
res.put("clue", bean.getClue());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报类型
......@@ -96,6 +102,16 @@ public class WorkbenchController extends BaseController {
res.put("businessManagement", bean.getBusinessManagement());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报途径
res.put("weChat", bean.getWeChat());
res.put("web", bean.getWeb());
res.put("sunacE", bean.getSunacE());
res.put("oa", bean.getOa());
res.put("offline", bean.getOffline());
res.put("phone", bean.getPhone());
res.put("supplier", bean.getSupplier());
res.put("email", bean.getEmail());
res.put("visit", bean.getVisit());
String jsonStr = res.toJSONString();
PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8");
......@@ -112,10 +128,12 @@ public class WorkbenchController extends BaseController {
//判断登录人的角色
String roleName = reportService.findRole(user);
if (StringUtils.isNotBlank(roleName)) {
bean.setUserRoleName(roleName);
if (!roleName.equals("系统管理员")) {
bean.setIsAdmin(user.getId());
}
}
bean.setArea(selAreaTemp);
bean = workbenchService.getWorkbench(bean);
} catch (Exception e) {
e.printStackTrace();
......
src/main/resources/ejweb.properties
......@@ -41,9 +41,9 @@ oa.notify.remind.interval=60000
#============================#
#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
session.sessionTimeout=1800000
session.sessionTimeout=2800000
#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
session.sessionTimeoutClean=120000
session.sessionTimeoutClean=220000
#\u7f13\u5b58\u8bbe\u7f6e
ehcache.configFile=cache/ehcache-local.xml
......@@ -100,7 +100,7 @@ file.image.thumb.height=640
#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/
file.prefix.url=http://report.sunac.com.cn:8899/static/report/
# The Prefix separator
file.upload.path.separator = /
......
src/main/resources/jdbc.properties
......@@ -7,27 +7,22 @@ db.table.prefix=sunac_
#jdbc.username=reportuser
#jdbc.password=$R@20$7
#融创测试数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
##融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
#jdbc.username= easdba
#jdbc.password= oracle
#正式数据库
#融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas
#jdbc.username= easdba
#jdbc.password= Sunac_1918
#jdbc.url=jdbc:oracle:thin:@192.168.7.16:1521:EASUAT
#jdbc.username= eas7533
#jdbc.password= sunac
#正式数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
jdbc.username= easdba
jdbc.password= Sunac_1918
#
#初始化连接
jdbc.initialSize=0
......
src/main/resources/mappings/modules/front/report/FrontReportDao.xml
......@@ -51,7 +51,14 @@
update_date,
oa_name,
report_ip,
ip_city
ip_city,
report_participants,
report_insider,
report_suggestion,
report_Date,
report_site,
report_qq,
report_weixin
) VALUES(
#{id},
#{reportProject},
......@@ -73,7 +80,14 @@
#{updateDate},
#{oaName},
#{reportIp},
#{ipCity}
#{ipCity},
#{participants},
#{insider},
#{suggestion},
#{reportDate},
#{site},
#{qq},
#{weixin}
)
</insert>
......
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -35,7 +35,15 @@
r.report_ip AS "reportIp",
r.ip_city AS "ipCity",
r.is_send_email AS "isSendEmail",
su.area AS "oaarea"
su.area AS "oaarea",
r.report_participants AS "participants",
r.report_insider AS "insider",
r.report_suggestion AS "suggestion",
r.report_Date AS "reportDate",
r.report_site AS "site",
r.report_qq AS "qq",
r.report_weixin AS "weixin",
r.report_ifClue AS "ifClue"
</sql>
......@@ -61,11 +69,18 @@
ON r.create_by = SU.ID
<where>
1 = 1
<if test="isAdmin == null">
<if test="isAdmin == null and isFzAdmin == null">
AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by != #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
AND su.role_id='1'
AND (su.role_id='1'or su.role_id='2')
</if>
<if test="isFzAdmin != null">
AND (R.EXCHANGE_BEFORE_USER = #{exchangeBeforeUser} OR
R.EXCHANGE_AFTER_USER = #{exchangeBeforeUser}
OR R.CREATE_BY = #{exchangeBeforeUser}) AND
su.role_id='1'or su.role_id='2'
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
......@@ -123,6 +138,15 @@
<if test="supplementArea != null and supplementArea != ''">
AND r.supplement_area = #{supplementArea}
</if>
<if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource}
</if>
<if test="selectExchangeAfterUser != null and selectExchangeAfterUser != ''">
AND r.exchange_after_user = #{selectExchangeAfterUser}
</if>
<if test="oaname != null and oaname != ''">
AND r.oa_name = #{oaname}
</if>
</where>
ORDER BY r.update_date DESC
</select>
......@@ -133,9 +157,12 @@
,su.name AS "transferName"
FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
LEFT JOIN CT_BBTC_SYS_USER2ROLE UR ON UR.USER_ID = su.ID
LEFT JOIN CT_BBTC_SYS_ROLE R
ON R.ID = UR.ROLE_ID
<where>
1 = 1
<if test="isAdmin == null">
<if test="isAdmin == null and isFzAdmin == null">
AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by = #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
......@@ -150,6 +177,20 @@
'Group',
'PropertyGroup')
</if>
<if test="isFzAdmin != null">
AND r.exchange_before_user = #{exchangeBeforeUser}
AND r.create_by != #{exchangeBeforeUser}
AND su.area IN ('North China',
'BeiJing',
'ShangHai',
'SouthWest',
'SouthEast',
'Central China',
'GuangShen',
'Hainan',
'Group',
'PropertyGroup')
</if>
<if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus}
</if>
......@@ -206,6 +247,15 @@
<if test="supplementArea != null and supplementArea != ''">
AND r.supplement_area = #{supplementArea}
</if>
<if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource}
</if>
<if test="selectExchangeAfterUser != null and selectExchangeAfterUser != ''">
AND r.exchange_after_user = #{selectExchangeAfterUser}
</if>
<if test="oaname != null and oaname != ''">
AND r.oa_name = #{oaname}
</if>
</where>
ORDER BY r.update_date DESC
</select>
......@@ -265,7 +315,15 @@
update_date,
oa_name,
report_ip,
ip_city
ip_city,
report_participants,
report_insider,
report_suggestion,
report_Date,
report_site,
report_qq,
report_weixin
) VALUES (
#{id},
#{reportProject},
......@@ -288,7 +346,14 @@
#{updateDate},
#{oaname},
#{reportIp},
#{ipCity}
#{ipCity},
#{participants},
#{insider},
#{suggestion},
#{reportDate},
#{site},
#{qq},
#{weixin}
)
</insert>
......@@ -319,8 +384,10 @@
supplement_project = #{supplementProject},
supplement_content = #{supplementContent},
deal_person_name = #{dealPersonName},
exchange_before_user = #{exchangeBeforeUser},
exchange_after_user = #{exchangeAfterUser},
exchange_type = #{exchangeType},
report_ifClue = #{ifClue},
deal_result = #{dealResult},
update_by = #{updateBy.id},
update_date = #{updateDate}
......@@ -523,6 +590,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
GROUP BY report_status
</select>
......@@ -544,6 +614,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
GROUP BY deal_result
</select>
......@@ -564,6 +637,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
GROUP BY report_source
</select>
......@@ -615,6 +691,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
</select>
<select id="getRepList" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="ReportEntity">
......@@ -662,6 +741,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
order by r.create_date desc
)
WHERE
......@@ -734,6 +816,18 @@
WHERE id = #{id}
</update>
<update id="againUpdateConclusion">
UPDATE ct_bbtc_report SET
report_status= '1'
WHERE id = #{id}
</update>
<update id="cluesUpdateConclusion">
UPDATE ct_bbtc_report SET
report_status= '4'
WHERE id = #{id}
</update>
<select id="getTotalNum" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="Integer">
SELECT count(*) AS "totalCount"
FROM ct_bbtc_report
......@@ -751,6 +845,9 @@
</if>
<if test="dbName == 'mysql'">AND DATE(create_date) &lt;= #{endDate}</if>
</if>
<if test="area != null and area !=''">
and SUPPLEMENT_AREA=#{area}
</if>
</select>
<delete id="deleteConclusion">
......@@ -772,4 +869,15 @@
WHERE
su.id=#{report}
</select>
<select id="findAllUserList" resultType="User">
SELECT id AS ID,
id AS value,
name AS label
from ct_bbtc_sys_user
where del_flag = 0
</select>
</mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/tlds/fns.tld
......@@ -243,5 +243,11 @@
<function-signature>java.lang.String toJsonString(java.lang.Object)</function-signature>
<example>${fns:toJson(object)}</example>
</function>
<function>
<description>获取系统有效用户</description>
<name>getTransferName</name>
<function-class>com.ejweb.modules.report.web.ReportController</function-class>
<function-signature>java.util.List getTransferName()</function-signature>
<example>${fnc:getTransferName()}</example>
</function>
</taglib>
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
......@@ -6,6 +6,16 @@
<meta name="decorator" content="default"/>
<script type="text/javascript">
$(document).ready(function () {
var ifClue = "${report.ifClue}";
if (ifClue == '1') {
$("#ifClue").prop("checked", true);
$('#ifClue').attr("disabled","disabled");
} else {
$("#ifClue").prop("checked", false);
$('#ifClue').attr("disabled","disabled");
}
var count = "${result}";
parent.refreshPromt(count);
$("input[type='text']").attr("disabled", true);
......@@ -33,6 +43,8 @@
supplementArea = "海南区域公司";
} else if (supplementArea == "Group") {
supplementArea = "集团本部";
} else if (supplementArea == "PropertyGroup") {
supplementArea = "物业集团";
}
$("#supplementArea").val(supplementArea);
......@@ -49,6 +61,8 @@
dealResult = "举报不实";
} else if (dealResult == "6") {
dealResult = "移交其他部门";
} else if (dealResult == "7") {
dealResult = "转为线索";
}
$("#dealResult").val(dealResult);
});
......@@ -89,6 +103,40 @@
}
}
function again(id) {
var msg = "您真的确定要重新跟踪吗？\n\n请确认！";
if (confirm(msg) == true) {
$.ajax({
type: "post",
url: "${ctx}/report/again",
data: {"id": id},
dataType: "json",
});
location.reload();
alert("重新跟踪成功")
} else {
return false;
}
}
function clues(id) {
var msg = "您真的确定要转为线索吗？\n\n请确认！";
if (confirm(msg) == true) {
$.ajax({
type: "post",
url: "${ctx}/report/clues",
data: {"id": id},
dataType: "json",
});
location.reload();
alert("转为线索成功")
} else {
return false;
}
}
</script>
<style type="text/css">
.title {
......@@ -126,6 +174,30 @@
</div>
</div>
<div class="control-group">
<label class="control-label">参与人:</label>
<div class="controls">
<form:input path="participants" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">知情人:</label>
<div class="controls">
<form:input path="insider" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">发生时间:</label>
<div class="controls">
<form:input path="reportDate" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">地点:</label>
<div class="controls">
<form:input path="site" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报时间:</label>
<div class="controls">
<form:input path="reportTime" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
......@@ -163,6 +235,12 @@
</div>
</div>
<div class="control-group">
<label class="control-label">调查建议:</label>
<div class="controls">
<form:input path="suggestion" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">附件:</label>
<div class="controls">
<c:forEach items="${reportAttachmentList}" var="reportAttachment" varStatus="vs">
......@@ -171,7 +249,8 @@
</div>
</div>
<span class="title">举报人信息</span>
<div class="control-group">
<c:if test="${ifClue eq true}">
<div class=" control-group">
<label class="control-label">姓名:</label>
<div class="controls">
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
......@@ -190,6 +269,27 @@
</div>
</div>
<div class="control-group">
<label class="control-label">QQ号:</label>
<div class="controls">
<form:input path="qq" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
<div class="control-group">
<label class="control-label">微信号:</label>
<div class="controls">
<form:input path="weixin" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div>
</div>
</c:if>
<c:if test="${isAdmin eq '1'|| isAdmin eq '2'}">
<div class="control-group">
<label class="control-label">是否显示举报人信息:</label>
<div class="controls" >
<input type="checkbox" id="ifClue" name="ifClue" Value="" />
</div>
</div>
</c:if>
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label"
......@@ -248,31 +348,36 @@
${vs.count}.<a href="${dealAttachment.attachmentPath}" target="_blank">${dealAttachment.attachmentName}</a><br>
</c:forEach>
</div>
</div>
<div class="control-group">
<label class="control-label">处理结论:</label>
<div class="controls">
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><form:select path="dealResult"
class="input-small"
onchange="showDone();">
<c:if test="${(isAdmin eq '1' ||isAdmin eq '2')&& report.reportStatus eq '2'}"><form:select
path="dealResult"
class="input-small"
onchange="showDone();">
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></c:if>
<c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path=""
value="${report.dealResult}"
htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if>
<c:if test="${isAdmin != '1' || report.reportStatus != '2'}"><form:input id="dealResult" path=""
value="${report.dealResult}"
htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if>
</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">
<c:if test="${(isAdmin eq '1' ||isAdmin eq '2') && 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>
......@@ -295,8 +400,19 @@
<input id="btnDocument" class="btn btn-primary" type="button" value="转为文档"
onclick="openDownloadDialog('${report.id}')"/>&nbsp;&nbsp;
<input id="btnReturn" class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>&nbsp;&nbsp;
<c:if test="${isAdmin eq true && report.reportStatus eq '2'}"><input id="btnClose" class="btn btn-primary"
type="submit" value="关闭"/></c:if>
<c:if test="${(isAdmin eq '1'|| isAdmin eq '2')&& report.reportStatus eq '2'}"><input id="btnClose"
class="btn btn-primary"
type="submit"
value="关闭"/>&nbsp;&nbsp;</c:if>
<c:if test="${isAdmin eq '1'&&(report.reportStatus eq '3'||report.reportStatus eq '2') }"><input id="btnClose"
class="btn btn-primary"
type="button"
onclick="again('${report.id}')"
value="重新跟踪"/> &nbsp;&nbsp;</c:if>
<%--<c:if test="${report.reportStatus eq '0' || report.reportStatus eq '1'}"><input id="btnClose" class="btn btn-primary"--%>
<%--type="button"--%>
<%--onclick="clues('${report.id}')"--%>
<%--value="转为线索"/></c:if>--%>
</label>
</li>
</form:form>
......
src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp
......@@ -170,6 +170,30 @@
</div>
</div>
<div class="control-group">
<label class="control-label">参与人:</label>
<div class="controls">
<form:input path="participants" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">知情人:</label>
<div class="controls">
<form:input path="insider" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">发生时间:</label>
<div class="controls">
<form:input path="reportDate" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">地点:</label>
<div class="controls">
<form:input path="site" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">内容:</label>
<div class="controls">
<form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="6" maxlength="3000"
......@@ -179,6 +203,12 @@
</div>
</div>
<div class="control-group">
<label class="control-label">调查建议:</label>
<div class="controls">
<form:input path="suggestion" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">附件:</label>
<div class="controls">
<form:hidden id="nameFile" path="reportAttachment" htmlEscape="false"
......@@ -207,6 +237,18 @@
</div>
</div>
<div class="control-group">
<label class="control-label">QQ号:</label>
<div class="controls">
<form:input path="qq" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">微信号:</label>
<div class="controls">
<form:input path="weixin" htmlEscape="false" maxlength="200" class="input-xlarge"/>
</div>
</div>
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
<form:radiobutton path="reportSource" value="tel" checked="true"/>电话&emsp;
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -166,6 +166,9 @@
showDiv.style.display = 'none';
showDiv.innerHTML = '';
}
</script>
<style type="text/css">
......@@ -264,10 +267,10 @@
</head>
<body>
<ul class="nav nav-tabs">
<li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">跟踪中举报列表</a></li>
<li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">跟踪中举报列表</a></li>
<li <c:if test="${flag eq '0'}">class="active"</c:if>><a href="${ctx}/report/list?flag=0">未处理举报列表</a></li>
<li <c:if test="${flag eq '2'}">class="active"</c:if>><a href="${ctx}/report/list?flag=2">已处理举报列表</a></li>
<li <c:if test="${flag eq '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li>
<li <c:if test="${flag eq '4'}">class="active"</c:if>><a href="${ctx}/report/list?flag=4">线索列表</a></li>
<li <c:if test="${flag eq null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">举报列表</a></li>
<%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%>
</ul>
......@@ -316,9 +319,23 @@
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></li>
<li class="clearfix"></li>
<li class="btns">
<%--<label style="width:auto;">--%>&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary"
<li><label>举报途径：</label><form:select onchange="resetPageNo();" path="reportSource" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></li>
<c:if test="${isAdmin eq '1' || isAdmin eq '2'}">
<li><label>移交给：</label><form:select onchange="resetPageNo();" path="selectExchangeAfterUser" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getTransferName()}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></li></c:if>
<c:if test="${isAdmin eq '1' || isAdmin eq '2'}">
<li><label>录入人：</label><form:select onchange="resetPageNo();" path="oaname" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getTransferName()}" itemLabel="label" itemValue="label"
htmlEscape="false"/></form:select></li></c:if>
<li class="clearfix"></li>
<li class="btns">
<%-- <label style="width:auto;">--%>&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary"
type="submit" value="筛选"/>&nbsp;&nbsp;
<input id="btnReset" class="btn btn-primary" type="button" value="重置"/>&nbsp;&nbsp;
<input id="btnExport" class="btn btn-primary" type="button" value="导出"/></label>
......@@ -363,7 +380,7 @@
<tr>
<th style="width:10%">业务类型</th>
<th>被举报项目/部门</th>
<th>OA账号</th>
<th>录入人</th>
<th>举报人</th>
<th>举报人电话</th>
<th>举报途径</th>
......@@ -374,7 +391,7 @@
<th>处理结论</th>
<th>移交部门</th>
<th>处理人</th>
<c:if test="${isAdmin eq true}">
<c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
<th>移交给</th>
</c:if>
<th>内容</th>
......@@ -405,6 +422,7 @@
<c:if test="${report.reportSource eq 'visit'}">来访</c:if>
<c:if test="${report.reportSource eq null}">--</c:if></td>
<td align="center">
<c:if test="${report.supplementArea eq 'PropertyGroup'}">物业集团</c:if>
<c:if test="${report.supplementArea eq 'North China'}">华北区域公司</c:if>
<c:if test="${report.supplementArea eq 'BeiJing'}">北京区域公司</c:if>
<c:if test="${report.supplementArea eq 'ShangHai'}">上海区域公司</c:if>
......@@ -426,7 +444,7 @@
<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>--%>
<c:if test="${report.reportStatus eq '4'}">待处理</c:if>
</td>
<td align="center">
<c:if test="${report.dealResult eq null}">--</c:if>
......@@ -459,9 +477,9 @@
<c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
</td>
<c:if test="${isAdmin eq true}">
<c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
<td align="center">
<c:if test="${report.transferName eq null || report.exchangeType eq null}">--</c:if>
<c:if test="${report.transferName eq null && report.exchangeType eq null}">--</c:if>
<c:if test="${report.transferName ne null && report.exchangeType ne null}">${report.transferName}</c:if>
</td>
</c:if>
......@@ -480,7 +498,7 @@
<a href="${ctx}/report/view?id=${report.id}">查看</a>
<c:if test="${report.reportStatus ne '2' && report.reportStatus ne '3'}"><a
href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>
<c:if test="${isAdmin eq true }">
<c:if test="${isAdmin eq '1'}">
<a href="#" onclick="del('${report.id}')">删除</a></c:if>
<a href="#" onclick="openDownloadDialog('${report.id}')">转为文档</a>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -7,6 +7,17 @@
<meta name="decorator" content="default"/>
<script type="text/javascript">
window.onload = function () {
var ifClue = "${report.ifClue}";
if (ifClue == '1') {
$("#ifClue").prop("checked", true);
} else {
$("#ifClue").prop("checked", false);
}
var dealResult = $("#dealResult").val();
if (dealResult != null && dealResult != ' ') {
if (dealResult == "6") {
......@@ -355,6 +366,8 @@
supplementArea = "海南区域公司";
} else if (supplementArea == "Group") {
supplementArea = "集团本部";
} else if (supplementArea == "PropertyGroup") {
supplementArea = "物业集团";
}
path2 += "被举报区域:" + supplementArea + "%0D%0A";
supplementContent = $("#supplementContent").val();
......@@ -555,27 +568,46 @@
</div>
</div>
<span class="title">举报人信息</span>
<div class="control-group">
<label class="control-label">姓名:</label>
<div class="controls">
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
<c:if test="${ifClue eq true}">
<div class="control-group">
<label class="control-label">姓名:</label>
<div class="controls">
<form:input path="reportPersonName" htmlEscape="false" maxlength="200" class="input-xlarge "/>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">手机号:</label>
<div class="controls">
<form:input path="reportPersonTel" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
<div class="control-group">
<label class="control-label">手机号:</label>
<div class="controls">
<form:input path="reportPersonTel" htmlEscape="false" maxlength="200" class="input-xlarge "/>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">Email:</label>
<div class="controls">
<form:input path="reportPersonEmail" htmlEscape="false" maxlength="200" disabled="true"
class="input-xlarge required"/>
<div class="control-group">
<label class="control-label">Email:</label>
<div class="controls">
<form:input path="reportPersonEmail" htmlEscape="false" maxlength="200" class="input-xlarge "/>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label">QQ号:</label>
<div class="controls">
<form:input path="qq" htmlEscape="false" maxlength="200" class="input-xlarge "/>
</div>
</div>
<div class="control-group">
<label class="control-label">微信号:</label>
<div class="controls">
<form:input path="weixin" htmlEscape="false" maxlength="200" class="input-xlarge "/>
</div>
</div>
</c:if>
<c:if test="${isAdmin eq '1'|| isAdmin eq '2'}">
<div class="control-group">
<label class="control-label">是否显示信息:</label>
<div class="controls" >
<input type="checkbox" id="ifClue" name="ifClue" Value="ifClue" />
</div>
</div>
</c:if>
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
......@@ -595,6 +627,7 @@
</span>
</div>
</div>
<div class="control-group">
<label class="control-label">被举报区域:</label>
<div class="controls">
......@@ -683,7 +716,8 @@
<input id="chooseUser" type="text"
<c:if test="${report.exchangeType eq null}">value="选择移交人员" </c:if>
<c:if test="${report.exchangeAfterUser ne null && report.exchangeType ne null}">value="${report.transferName}" </c:if>
<c:if test="${isAdmin eq false}">disabled="true" style="color:#888"</c:if> htmlEscape="false"
<c:if test="${isAdmin ne '1' && isAdmin ne '2'}">disabled="true" style="color:#888"</c:if>
htmlEscape="false"
maxlength="200" class="input-xlarge"/>
</div>
</div>
......@@ -766,37 +800,37 @@
}
</script>
<span class="title">选择移交人员</span>
<form:form id="searchForm" modelAttribute="user" action="#" 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="position.name"
class="input-small">
<form:option value=" " selected="selected">请选择</form:option>
<form:options items="${positionList}" itemLabel="name" itemValue="id"
htmlEscape="false"/></form:select></li>
<li class="btns">
<label style="width:auto;"><input id="btnSearch" class="btn btn-primary" type="button"
value="筛选"/>&nbsp;&nbsp;</label>
</li>
<li class="clearfix"></li>
</ul>
</form:form>
<%-- <form:form id="searchForm" modelAttribute="user" action="#" 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="position.name"
class="input-small">
<form:option value=" " selected="selected">请选择</form:option>
<form:options items="${positionList}" itemLabel="name" itemValue="id"
htmlEscape="false"/></form:select></li>
<li class="btns">
<label style="width:auto;"><input id="btnSearch" class="btn btn-primary" type="button"
value="筛选"/>&nbsp;&nbsp;</label>
</li>
<li class="clearfix"></li>
</ul>
</form:form>--%>
<div id="userList">
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
......@@ -15,6 +15,10 @@
var endDate = $("#endDate").val();
var start = startDate.substring(5).replace("-", ".");
var end = endDate.substring(5).replace("-", ".");
var selectedArea=$("#area").val();
console.log("区域"+selectedArea);
console.log("开始"+start);
console.log("结束"+end);
$.ajax({
type: "POST",
dataType: "JSON",
......@@ -96,8 +100,9 @@
chart: {
type: 'column'
},
title: {
text: ''
title: {//主标题
style: {"color": "#333333", "fontSize": "15px"},
text: '各业务条线举报分析(' + start + '-' + end + ')'
},
xAxis: [{
categories: [
......@@ -126,7 +131,7 @@
min: 0,
allowDecimals: false,
title: {
text: '人数'
text: ''
}
},
tooltip: {
......@@ -215,11 +220,11 @@
},
title: {//主标题
style: {"color": "#333333", "fontSize": "15px"},
text: '信息分类(' + start + '-' + end + ')'
text: '举报质量分析(' + start + '-' + end + ')'
},
subtitle: {//副标题
align: 'right',
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>举报未处理&nbsp;:&nbsp;' + result.reportWeichuli + '<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
text: '总数&nbsp;:&nbsp;' + result.bench.totalCount + '<br/>举报无效&nbsp;:&nbsp;' + result.invalid + '<br/>移交客诉&nbsp;:&nbsp;' + result.complainNum + '<br/>举报受理&nbsp;:&nbsp;' + result.verified + '<br/>举报属实&nbsp;:&nbsp;' + result.confirmed + '<br/>举报不实&nbsp;:&nbsp;' + result.unreaListic + '<br/>转为线索&nbsp;:&nbsp;' + result.clue +'<br/>移交其它部门&nbsp;:&nbsp;' + result.transfer,
useHTML: true,
verticalAlign: 'top',
x: -5,
......@@ -248,20 +253,235 @@
['举报受理', result.verified],
['举报属实', result.confirmed],
['举报不实', result.unreaListic],
['举报未处理',result.reportWeichuli],
['转为线索', result.clue],
['移交其它部门', result.transfer]
]
}]
});
$('#repArea').highcharts({
navigation: {
buttonOptions: {
enabled: false
}
},
credits: {
text: '',
href: ''
},//去掉版权信息
chart: {
type: 'column'
},
title: {//主标题
style: {"color": "#333333", "fontSize": "15px"},
text: '区域举报状态分析图(' + start + '-' + end + ')'
},
xAxis: [{
categories: [
'营销',
'工程',
'成本',
'招采',
'财务',
'法务',
'行政',
'人力',
'开发',
'研发',
'投资',
'其他',
'物业管理',
'酒店管理',
'商业管理'
],
labels: {
enabled: false
},
crosshair: true
}],
yAxis: {
min: 0,
allowDecimals: false,
title: {
text: ''
}
},
tooltip: {
headerFormat: '<span style="font-size:10px"></span><table>',
pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
'<td style="padding:0"><b>{point.y:.0f} </b></td></tr>',
footerFormat: '</table>',
shared: true,
useHTML: true
},
plotOptions: {
column: {
pointPadding: 0.2,
borderWidth: 0
},
series: {
borderWidth: 0,
dataLabels: {
enabled: true,
format: '{point.y:.0f}'
}
}
},
//修改数据源
series: [{
name: '营销',
data: [result.sale]
}, {
name: '工程',
data: [result.project]
}, {
name: '成本',
data: [result.cost]
}, {
name: '招采',
data: [result.forMining]
}, {
name: '财务',
data: [result.finance]
}, {
name: '法务',
data: [result.forensic]
}, {
name: '行政',
data: [result.administration]
}, {
name: '人力',
data: [result.manpower]
}, {
name: '开发',
data: [result.development]
}, {
name: '研发',
data: [result.rAndD]
}, {
name: '投资',
data: [result.iAndD]
}, {
name: '其他',
data: [result.Other]
}, {
name: '物业管理',
data: [result.propertyManagement]
}, {
name: '酒店管理',
data: [result.hotelManagement]
}, {
name: '商业管理',
data: [result.businessManagement]
}
]
});
$('#repApproach').highcharts({
navigation: {
buttonOptions: {
enabled: false
}
},
credits: {
text: '',
href: ''
},//去掉版权信息
chart: {
type: 'column'
},
title: {//主标题
style: {"color": "#333333", "fontSize": "15px"},
text: '举报途径分析(' + start + '-' + end + ')'
},
xAxis: [{
categories: [
'微信公众号',
'官网',
'融E',
'融创OA系统',
'线下扫码',
'电话',
'供应商系统',
'邮件',
'来访'
],
labels: {
enabled: false
},
crosshair: true
}],
yAxis: {
min: 0,
allowDecimals: false,
title: {
text: ''
}
},
tooltip: {
headerFormat: '<span style="font-size:10px"></span><table>',
pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
'<td style="padding:0"><b>{point.y:.0f} </b></td></tr>',
footerFormat: '</table>',
shared: true,
useHTML: true
},
plotOptions: {
column: {
pointPadding: 0.2,
borderWidth: 0
},
series: {
borderWidth: 0,
dataLabels: {
enabled: true,
format: '{point.y:.0f}'
}
}
},
//修改数据源
series: [{
name: '微信公众号',
data: [result.weChat]
}, {
name: '官网',
data: [result.web]
}, {
name: '融E',
data: [result.sunacE]
}, {
name: '融创OA系统',
data: [result.oa]
}, {
name: '线下扫码',
data: [result.offline]
}, {
name: '电话',
data: [result.phone]
}, {
name: '供应商系统',
data: [result.supplier]
}, {
name: '邮件',
data: [result.email]
}, {
name: '来访',
data: [result.visit]
}
]
});
}
});
/* $('#total').highcharts({
});*/
});
//选择区域
// function selectArea(value){
// var selAreaTemp=$("#areaTemp").val();
// $("#area").val(selAreaTemp);
// }
</script>
</head>
<body>
<form:form id="searchForm" modelAttribute="" action="${ctx}/workbench/list" method="post"
<form:form id="searchForm" modelAttribute="workbench" action="${ctx}/workbench/list" 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}"/>--%>
......@@ -282,42 +502,31 @@
maxlength="200" class="Wdate" style="width: auto"
onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
value="${workbench.startDate}"/></li>
<c:if test="${workbench.userRoleName eq '系统管理员'}">
<li style="float: right">
<label>区域：</label>
<form:select path="area" htmlEscape="false" class="input-medium">
<form:option value="">全部区域</form:option>
<form:option value="North China">华北区域公司</form:option>
<form:option value="BeiJing">北京区域公司</form:option>
<form:option value="ShangHai">上海区域公司</form:option>
<form:option value="SouthWest">西南区域公司</form:option>
<form:option value="SouthEast">东南区域公司</form:option>
<form:option value="Central China">华中区域公司</form:option>
<form:option value="GuangShen">广深区域公司</form:option>
<form:option value="Hainan">海南区域公司</form:option>
<form:option value="Group">集团本部</form:option>
<form:option value="PropertyGroup">物业集团</form:option>
</form:select>
</li>
</c:if>
</ul>
</ul>
<ul class="ul-form">
<div>
<div id="repStatus" style="min-width:40%;height:280px;float:left;background-color:#FFFFFF "
class="breadcrumb form-search"></div>
<div id="total" style="max-width:54%;min-width:54%;height:280px;float:right;background-color: #FFFFFF"
class="breadcrumb form-search">
<li><h5>总体</h5></li>
<br/><br/>
<table>
<tr height="60">
<td style="width: 10% "></td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;微信公众号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.weChat}</td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;官网&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.web}</td>
<td style="width: 10%">
&nbsp;&nbsp;&nbsp;&nbsp;融E&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.sunacE}</td>
</tr>
<tr height="60">
<td style="width: 10%"><h4>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.totalCount}</h4>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;举报事件
</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;融创OA系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.oa}</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;线下扫码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.offline}</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;电话&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.phone}</td>
</tr>
<tr height="60">
<td style="width: 10% "></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;供应商系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.supplier}</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;邮件&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.email}</td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;来访&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.visit}</td>
</tr>
</table>
</div>
<div id="repApproach" style="min-width:54%;height:280px;float:right;background-color:#FFFFFF "
class="breadcrumb form-search"></div>
</div>
</ul>
<ul class="ul-form">
......@@ -328,6 +537,12 @@
class="breadcrumb form-search"></div>
</div>
</ul>
<%--<ul class="ul-form">--%>
<%--<div style="background-color: #FFFFFF">--%>
<%--<div id="repArea" style="min-width:100%;height:280px;float:left;background-color:#FFFFFF "--%>
<%--class="breadcrumb form-search"></div>--%>
<%--</div>--%>
<%--</ul>--%>
</form:form>
<ul class="nav nav-tabs">
<li <c:if test="${workbench.processStatus eq '0'}">class="active"</c:if>><a
......
target/report_sunac/WEB-INF/classes/ejweb.properties
......@@ -41,9 +41,9 @@ oa.notify.remind.interval=60000
#============================#
#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
session.sessionTimeout=1800000
session.sessionTimeout=2800000
#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
session.sessionTimeoutClean=120000
session.sessionTimeoutClean=220000
#\u7f13\u5b58\u8bbe\u7f6e
ehcache.configFile=cache/ehcache-local.xml
......@@ -100,7 +100,7 @@ file.image.thumb.height=640
#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/
file.prefix.url=http://report.sunac.com.cn:8899/static/report/
# The Prefix separator
file.upload.path.separator = /
......
target/report_sunac/WEB-INF/classes/jdbc.properties
......@@ -7,27 +7,22 @@ db.table.prefix=sunac_
#jdbc.username=reportuser
#jdbc.password=$R@20$7
#融创测试数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
##融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.7.207:1521:eas
#jdbc.username= easdba
#jdbc.password= oracle
#正式数据库
#融创测试数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas
#jdbc.username= easdba
#jdbc.password= Sunac_1918
#jdbc.url=jdbc:oracle:thin:@192.168.7.16:1521:EASUAT
#jdbc.username= eas7533
#jdbc.password= sunac
#正式数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas1
jdbc.username= easdba
jdbc.password= Sunac_1918
#
#初始化连接
jdbc.initialSize=0
......
target/report_sunac/WEB-INF/tlds/fns.tld
......@@ -243,5 +243,11 @@
<function-signature>java.lang.String toJsonString(java.lang.Object)</function-signature>
<example>${fns:toJson(object)}</example>
</function>
<function>
<description>获取系统有效用户</description>
<name>getTransferName</name>
<function-class>com.ejweb.modules.report.web.ReportController</function-class>
<function-signature>java.util.List getTransferName()</function-signature>
<example>${fnc:getTransferName()}</example>
</function>
</taglib>
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