Skip to content

S
sunac_report
Commit be7b7df1 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent 343f5597
Showing with 266 additions and 216 deletions
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -52,26 +52,25 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -52,26 +52,25 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String transferName; //移交给 private String transferName; //移交给
private String dealPerson; private String dealPerson;
private String lStatus; //关闭修改状态 private String lStatus; //关闭修改状态
//是否管理员 private String isAdmin; //是否管理员
private String isAdmin; private String oaarea; //账号区域
public String getOaarea() {
public String getIsAdmin() { return oaarea;
return isAdmin;
} }
public void setIsAdmin(String isAdmin) { public void setOaarea(String oaarea) {
this.isAdmin = isAdmin; this.oaarea = oaarea;
} }
public String getTransferDepartment() {
return transferDepartment;
}
public void setTransferDepartment(String transferDepartment) { public String getIsAdmin() {
this.transferDepartment = transferDepartment; return isAdmin;
} }
public void setIsAdmin(String isAdmin) {
this.isAdmin = isAdmin;
}
public String getlStatus() { public String getlStatus() {
return lStatus; return lStatus;
...@@ -82,13 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -82,13 +81,6 @@ public class ReportEntity extends DataEntity<ReportEntity> {
} }
public String getOaname() {
return oaname;
}
public void setOaname(String oaname) {
this.oaname = oaname;
}
// private String ifDone; //是否完成 // private String ifDone; //是否完成
// //
...@@ -108,6 +100,14 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -108,6 +100,14 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public String getReportProject() { public String getReportProject() {
return reportProject; return reportProject;
} }
@ExcelField(title = "OA账号", align = 2, sort = 26)
public String getOaname() {
return oaname;
}
public void setOaname(String oaname) {
this.oaname = oaname;
}
public void setReportProject(String reportProject) { public void setReportProject(String reportProject) {
this.reportProject = reportProject; this.reportProject = reportProject;
...@@ -121,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -121,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportCity = reportCity; this.reportCity = reportCity;
} }
@ExcelField(title = "举报时间", align = 2, sort = 34) @ExcelField(title = "举报时间", align = 2, sort = 38)
public String getReportTime() { public String getReportTime() {
return reportTime; return reportTime;
} }
...@@ -130,7 +130,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -130,7 +130,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportTime = reportTime; this.reportTime = reportTime;
} }
@ExcelField(title = "举报内容", align = 2, sort = 44) @ExcelField(title = "举报内容", align = 2, sort = 50)
public String getReportContent() { public String getReportContent() {
return reportContent; return reportContent;
} }
...@@ -139,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -139,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportContent = reportContent; this.reportContent = reportContent;
} }
@ExcelField(title = "举报人", align = 2, sort = 26) @ExcelField(title = "举报人", align = 2, sort = 28)
public String getReportPersonName() { public String getReportPersonName() {
return reportPersonName; return reportPersonName;
} }
...@@ -148,10 +148,19 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -148,10 +148,19 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonName = reportPersonName; this.reportPersonName = reportPersonName;
} }
@ExcelField(title = "举报人电话", align = 2, sort = 28) @ExcelField(title = "举报人电话", align = 2, sort = 30)
public String getReportPersonTel() { public String getReportPersonTel() {
return reportPersonTel; return reportPersonTel;
} }
@ExcelField(title = "举报途径", align = 2, sort = 36)
public String getReportSource() {
return reportSource;
}
public void setReportSource(String reportSource) {
this.reportSource = reportSource;
}
public void setReportPersonTel(String reportPersonTel) { public void setReportPersonTel(String reportPersonTel) {
this.reportPersonTel = reportPersonTel; this.reportPersonTel = reportPersonTel;
...@@ -165,15 +174,8 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -165,15 +174,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonEmail = reportPersonEmail; this.reportPersonEmail = reportPersonEmail;
} }
public String getReportSource() {
return reportSource;
}
public void setReportSource(String reportSource) {
this.reportSource = reportSource;
}
@ExcelField(title = "状态", align = 2, sort = 36) @ExcelField(title = "状态", align = 2, sort = 40)
public String getReportStatus() { public String getReportStatus() {
return reportStatus; return reportStatus;
} }
...@@ -198,7 +200,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -198,7 +200,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementDepartment = supplementDepartment; this.supplementDepartment = supplementDepartment;
} }
@ExcelField(title = "被举报人", align = 2, sort = 32) @ExcelField(title = "被举报人", align = 2, sort = 34)
public String getSupplementInformant() { public String getSupplementInformant() {
return supplementInformant; return supplementInformant;
} }
...@@ -225,7 +227,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -225,7 +227,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementType = supplementType; this.supplementType = supplementType;
} }
@ExcelField(title = "区域", align = 2, sort = 30) @ExcelField(title = "区域", align = 2, sort = 32)
public String getSupplementArea() { public String getSupplementArea() {
return supplementArea; return supplementArea;
} }
...@@ -242,7 +244,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -242,7 +244,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementProject = supplementProject; this.supplementProject = supplementProject;
} }
@ExcelField(title = "举报信息补充内容", align = 2, sort = 46) @ExcelField(title = "举报信息补充内容", align = 2, sort = 52)
public String getSupplementContent() { public String getSupplementContent() {
return supplementContent; return supplementContent;
} }
...@@ -251,16 +253,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -251,16 +253,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementContent = supplementContent; this.supplementContent = supplementContent;
} }
@ExcelField(title = "处理人", align = 2, sort = 40) @ExcelField(title = "处理结论", align = 2, sort = 42)
public String getDealPersonName() {
return dealPersonName;
}
public void setDealPersonName(String dealPersonName) {
this.dealPersonName = dealPersonName;
}
@ExcelField(title = "处理结论", align = 2, sort = 38)
public String getDealResult() { public String getDealResult() {
return dealResult; return dealResult;
} }
...@@ -269,14 +262,21 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -269,14 +262,21 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealResult = dealResult; this.dealResult = dealResult;
} }
public String getExchangeBeforeUser() { @ExcelField(title = "移交部门", align = 2, sort =44)
return exchangeBeforeUser; public String getTransferDepartment() {
return transferDepartment;
} }
public void setExchangeBeforeUser(String exchangeBeforeUser) { @ExcelField(title = "处理人", align = 2, sort = 46)
this.exchangeBeforeUser = exchangeBeforeUser; public String getDealPersonName() {
return dealPersonName;
}
public void setDealPersonName(String dealPersonName) {
this.dealPersonName = dealPersonName;
} }
@ExcelField(title = "移交给", align = 2, sort = 48)
public String getExchangeAfterUser() { public String getExchangeAfterUser() {
return exchangeAfterUser; return exchangeAfterUser;
} }
...@@ -285,6 +285,18 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -285,6 +285,18 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.exchangeAfterUser = exchangeAfterUser; this.exchangeAfterUser = exchangeAfterUser;
} }
public void setTransferDepartment(String transferDepartment) {
this.transferDepartment = transferDepartment;
}
public String getExchangeBeforeUser() {
return exchangeBeforeUser;
}
public void setExchangeBeforeUser(String exchangeBeforeUser) {
this.exchangeBeforeUser = exchangeBeforeUser;
}
public String getExchangeType() { public String getExchangeType() {
return exchangeType; return exchangeType;
} }
...@@ -349,7 +361,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -349,7 +361,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types; this.types = types;
} }
@ExcelField(title = "移交给", align = 2, sort = 42)
public String getTransferName() { public String getTransferName() {
return transferName; return transferName;
} }
...@@ -358,7 +370,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -358,7 +370,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName; this.transferName = transferName;
} }
@ExcelField(title = "IP来源", align = 2, sort = 48) @ExcelField(title = "IP来源", align = 2, sort =54)
public String getReportIp() { public String getReportIp() {
return reportIp; return reportIp;
} }
...@@ -367,7 +379,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -367,7 +379,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportIp = reportIp; this.reportIp = reportIp;
} }
@ExcelField(title = "IP所属城市", align = 2, sort = 50) @ExcelField(title = "IP所属城市", align = 2, sort = 56)
public String getIpCity() { public String getIpCity() {
return ipCity; return ipCity;
} }
...@@ -376,7 +388,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -376,7 +388,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity; this.ipCity = ipCity;
} }
@ExcelField(title = "邮件发送", align = 2, sort = 48) @ExcelField(title = "邮件发送", align = 2, sort =58)
public String getIsSendEmail() { public String getIsSendEmail() {
return isSendEmail; return isSendEmail;
} }
......
src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
...@@ -271,21 +271,27 @@ public class ReportToWordController { ...@@ -271,21 +271,27 @@ public class ReportToWordController {
} else if (value.equals("4")) { } else if (value.equals("4")) {
value = "招采"; value = "招采";
} else if (value.equals("5")) { } else if (value.equals("5")) {
value = "人力"; value = "财务";
} else if (value.equals("6")) { } else if (value.equals("6")) {
value = "物业"; value = "法务";
} else if (value.equals("7")) { } else if (value.equals("7")) {
value = "投诉";
} else if (value.equals("8")) {
value = "行政"; value = "行政";
} else if (value.equals("8")) {
value = "人力";
} else if (value.equals("9")) { } else if (value.equals("9")) {
value = "财务"; value = "开发";
} else if (value.equals("10")) { } else if (value.equals("10")) {
value = "商业管理";
} else if (value.equals("11")) {
value = "研发"; value = "研发";
} else if (value.equals("11")) {
value = "投资";
} else if (value.equals("12")) { } else if (value.equals("12")) {
value = "投资开发"; value = "其他";
} else if (value.equals("13")) {
value = "物业管理";
} else if (value.equals("14")) {
value = "酒店管理";
} else if (value.equals("15")) {
value = "商业管理";
} }
typeStr = typeStr + value + ","; typeStr = typeStr + value + ",";
supplement_type = typeStr.substring(0, typeStr.length() - 1); supplement_type = typeStr.substring(0, typeStr.length() - 1);
...@@ -411,6 +417,10 @@ public class ReportToWordController { ...@@ -411,6 +417,10 @@ public class ReportToWordController {
deal_result = "举报受理"; deal_result = "举报受理";
} else if (deal_result.equals("4")) { } else if (deal_result.equals("4")) {
deal_result = "举报属实"; deal_result = "举报属实";
} else if (deal_result.equals("5")) {
deal_result = "举报不实";
} else if (deal_result.equals("6")) {
deal_result = "移交其他部门";
} }
} else { } else {
deal_result = ""; deal_result = "";
......
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
...@@ -91,45 +91,42 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> { ...@@ -91,45 +91,42 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
workbench.setRepStatusTotal(workbench.getUnProcess() + workbench.getProcessing() + workbench.getProcessed() + workbench.getClosed()); workbench.setRepStatusTotal(workbench.getUnProcess() + workbench.getProcessing() + workbench.getProcessed() + workbench.getClosed());
List<HashMap> types = reportDao.getReportType(workbench); List<HashMap> types = reportDao.getReportType(workbench);
for (HashMap type : types) { for (HashMap type : types) {
// //营销 //营销
// Object sale = type.get("sale"); Object sale = type.get("sale");
// workbench.setSale(Integer.valueOf(sale.toString())); workbench.setSale(Integer.valueOf(sale.toString()));
// //工程 //工程
// Object project = type.get("project"); Object project = type.get("project");
// workbench.setProject(Integer.valueOf(project.toString())); workbench.setProject(Integer.valueOf(project.toString()));
// //成本 //成本
// Object cost = type.get("cost"); Object cost = type.get("cost");
// workbench.setCost(Integer.valueOf(cost.toString())); workbench.setCost(Integer.valueOf(cost.toString()));
// //招采 //招采
// Object forMining = type.get("forMining"); Object forMining = type.get("forMining");
// workbench.setForMining(Integer.valueOf(forMining.toString())); workbench.setForMining(Integer.valueOf(forMining.toString()));
// //财务 //财务
// Object finance = type.get("finance"); Object finance = type.get("finance");
// workbench.setFinance(Integer.valueOf(finance.toString())); workbench.setFinance(Integer.valueOf(finance.toString()));
// //法务 //法务
// Object forensic = type.get("forensic"); Object forensic = type.get("forensic");
// workbench.setFinance(Integer.valueOf(forensic.toString())); workbench.setFinance(Integer.valueOf(forensic.toString()));
// //行政 //行政
// Object administration = type.get("administration"); Object administration = type.get("administration");
// workbench.setAdministration(Integer.valueOf(administration.toString())); workbench.setAdministration(Integer.valueOf(administration.toString()));
// //人力 //人力
// Object manpower = type.get("manpower"); Object manpower = type.get("manpower");
// workbench.setManpower(Integer.valueOf(manpower.toString())); workbench.setManpower(Integer.valueOf(manpower.toString()));
// //开发 //开发
// Object businessManagement = type.get("development"); Object businessManagement = type.get("development");
// workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString())); workbench.setBusinessManagement(Integer.valueOf(businessManagement.toString()));
// //研发 //研发
// Object rAndD = type.get("rAndD"); Object rAndD = type.get("rAndD");
// workbench.setrAndD(Integer.valueOf(rAndD.toString())); workbench.setrAndD(Integer.valueOf(rAndD.toString()));
// //投资 //投资
// Object iAndD = type.get("iAndD"); Object iAndD = type.get("iAndD");
// workbench.setiAndD(Integer.valueOf(iAndD.toString())); workbench.setiAndD(Integer.valueOf(iAndD.toString()));
// //其他 //其他
// Object Other = type.get("Other"); Object Other = type.get("Other");
// workbench.setComplain(Integer.valueOf(Other.toString())); workbench.setComplain(Integer.valueOf(Other.toString()));
//地产总和
Object land = type.get("land");
workbench.setComplain(Integer.valueOf(land.toString()));
//物业管理 //物业管理
Object propertyManagement = type.get("propertyManagement"); Object propertyManagement = type.get("propertyManagement");
workbench.setiAndD(Integer.valueOf(propertyManagement.toString())); workbench.setiAndD(Integer.valueOf(propertyManagement.toString()));
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
...@@ -78,18 +78,18 @@ public class WorkbenchController extends BaseController { ...@@ -78,18 +78,18 @@ public class WorkbenchController extends BaseController {
res.put("startDate", bean.getStartDate()); res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate()); res.put("endDate", bean.getEndDate());
//举报类型 //举报类型
res.put("land", bean.getLand()); res.put("sale", bean.getLand());
// res.put("project", bean.getProject()); res.put("project", bean.getProject());
// res.put("cost", bean.getCost()); res.put("cost", bean.getCost());
// res.put("forMining", bean.getForMining()); res.put("forMining", bean.getForMining());
// res.put("finance", bean.getFinance()); res.put("finance", bean.getFinance());
// res.put("forensic", bean.getForensic()); res.put("forensic", bean.getForensic());
// res.put("administration", bean.getAdministration()); res.put("administration", bean.getAdministration());
// res.put("manpower", bean.getManpower()); res.put("manpower", bean.getManpower());
// res.put("development", bean.getDevelopment()); res.put("development", bean.getDevelopment());
// res.put("rAndD", bean.getrAndD()); res.put("rAndD", bean.getrAndD());
// res.put("iAndD", bean.getiAndD()); res.put("iAndD", bean.getiAndD());
// res.put("Other", bean.getOther()); res.put("Other", bean.getOther());
res.put("propertyManagement", bean.getPropertyManagement()); res.put("propertyManagement", bean.getPropertyManagement());
res.put("hotelManagement", bean.getHotelManagement()); res.put("hotelManagement", bean.getHotelManagement());
res.put("businessManagement", bean.getBusinessManagement()); res.put("businessManagement", bean.getBusinessManagement());
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
r.supplement_informant AS "supplementInformant", r.supplement_informant AS "supplementInformant",
r.supplement_title AS "supplementTitle", r.supplement_title AS "supplementTitle",
r.supplement_type AS "supplementType", r.supplement_type AS "supplementType",
r.transfer_department AS "transferDepartment",
r.supplement_area AS "supplementArea", r.supplement_area AS "supplementArea",
r.supplement_project AS "supplementProject", r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent", r.supplement_content AS "supplementContent",
...@@ -33,7 +34,8 @@ ...@@ -33,7 +34,8 @@
r.oa_name AS "oaname", r.oa_name AS "oaname",
r.report_ip AS "reportIp", r.report_ip AS "reportIp",
r.ip_city AS "ipCity", r.ip_city AS "ipCity",
r.is_send_email AS "isSendEmail" r.is_send_email AS "isSendEmail",
su.area AS "oaarea"
</sql> </sql>
...@@ -55,11 +57,21 @@ ...@@ -55,11 +57,21 @@
<include refid="reportColumns"/> <include refid="reportColumns"/>
,su.name AS "transferName" ,su.name AS "transferName"
FROM ct_bbtc_report r FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
<where> <where>
1 = 1 1 = 1
<if test="isAdmin == null"> <if test="isAdmin == null">
AND r.exchange_after_user = #{exchangeAfterUser} AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by != #{exchangeAfterUser}
</if>
<if test="isAdmin != null">
AND r.supplement_area ='Group' AND su.area NOT IN ('North China',
'BeiJing',
'ShangHai',
'SouthWest',
'SouthEast',
'Central China',
'GuangShen',
'Hainan') OR r.create_by = #{isAdmin}
</if> </if>
<if test="reportStatus != null and reportStatus != ''"> <if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus} AND r.report_status = #{reportStatus}
...@@ -126,14 +138,21 @@ ...@@ -126,14 +138,21 @@
<include refid="reportColumns"/> <include refid="reportColumns"/>
,su.name AS "transferName" ,su.name AS "transferName"
FROM ct_bbtc_report r FROM ct_bbtc_report r
LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id LEFT JOIN ct_bbtc_sys_user su ON r.create_by = su.id
<where> <where>
1 = 1 1 = 1
<if test="isAdmin == null"> <if test="isAdmin == null">
AND r.create_by = #{exchangeAfterUser} AND r.exchange_after_user = #{exchangeAfterUser} AND r.create_by = #{exchangeAfterUser}
</if> </if>
<if test="isAdmin != null"> <if test="isAdmin != null">
AND r.supplement_area !='Group' AND r.supplement_area IS NOT NULL AND su.area IN ('North China',
'BeiJing',
'ShangHai',
'SouthWest',
'SouthEast',
'Central China',
'GuangShen',
'Hainan')
</if> </if>
<if test="reportStatus != null and reportStatus != ''"> <if test="reportStatus != null and reportStatus != ''">
AND r.report_status = #{reportStatus} AND r.report_status = #{reportStatus}
...@@ -242,7 +261,7 @@ ...@@ -242,7 +261,7 @@
supplement_informant, supplement_informant,
supplement_title, supplement_title,
exchange_before_user, exchange_before_user,
exchange_after_user, exchange_after_user ,
exchange_type, exchange_type,
create_by, create_by,
create_date, create_date,
...@@ -555,29 +574,29 @@ ...@@ -555,29 +574,29 @@
<select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" <select id="getReportType" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean"
resultType="java.util.HashMap"> resultType="java.util.HashMap">
SELECT SELECT
SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS "land", SUM(CASE WHEN supplement_type||',' LIKE '1,%' OR supplement_type||',' LIKE '%,1,%' THEN 1 ELSE 0 END) AS "sale",
-- SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
-- "project", "project",
-- SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
-- "cost", "cost",
-- SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '4,%' OR supplement_type||',' LIKE '%,4,%' THEN 1 ELSE 0 END) AS
-- "forMining", "forMining",
-- SUM(CASE WHEN supplement_type||',' LIKE '5,%' OR supplement_type||',' LIKE '%,5,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '5,%' OR supplement_type||',' LIKE '%,5,%' THEN 1 ELSE 0 END) AS
-- "finance", "finance",
-- SUM(CASE WHEN supplement_type||',' LIKE '6,%' OR supplement_type||',' LIKE '%,6,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '6,%' OR supplement_type||',' LIKE '%,6,%' THEN 1 ELSE 0 END) AS
-- "forensic", "forensic",
-- SUM(CASE WHEN supplement_type||',' LIKE '7,%' OR supplement_type||',' LIKE '%,7,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '7,%' OR supplement_type||',' LIKE '%,7,%' THEN 1 ELSE 0 END) AS
-- "administration", "administration",
-- SUM(CASE WHEN supplement_type||',' LIKE '8,%' OR supplement_type||',' LIKE '%,8,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '8,%' OR supplement_type||',' LIKE '%,8,%' THEN 1 ELSE 0 END) AS
-- "manpower", "manpower",
-- SUM(CASE WHEN supplement_type||',' LIKE '9,%' OR supplement_type||',' LIKE '%,9,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '9,%' OR supplement_type||',' LIKE '%,9,%' THEN 1 ELSE 0 END) AS
-- "development", "development",
-- SUM(CASE WHEN supplement_type||',' LIKE '10,%' OR supplement_type||',' LIKE '%,10,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '10,%' OR supplement_type||',' LIKE '%,10,%' THEN 1 ELSE 0 END) AS
-- "rAndD", "rAndD",
-- SUM(CASE WHEN supplement_type||',' LIKE '11,%' OR supplement_type||',' LIKE '%,11,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '11,%' OR supplement_type||',' LIKE '%,11,%' THEN 1 ELSE 0 END) AS
-- "iAndD", "iAndD",
-- SUM(CASE WHEN supplement_type||',' LIKE '12,%' OR supplement_type||',' LIKE '%,12,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '12,%' OR supplement_type||',' LIKE '%,12,%' THEN 1 ELSE 0 END) AS
-- "Other", "Other",
SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '2,%' OR supplement_type||',' LIKE '%,2,%' THEN 1 ELSE 0 END) AS
"propertyManagement", "propertyManagement",
SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS SUM(CASE WHEN supplement_type||',' LIKE '3,%' OR supplement_type||',' LIKE '%,3,%' THEN 1 ELSE 0 END) AS
......
src/main/resources/mappings/modules/sys/UserDao.xml
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
a.login_name, a.login_name,
a.password, a.password,
a.no, a.no,
a.area,
a.name, a.name,
a.email, a.email,
a.phone, a.phone,
......
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
...@@ -171,6 +171,8 @@ ...@@ -171,6 +171,8 @@
<c:if test="${report.dealResult eq '2'}">举报无效</c:if> <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
<c:if test="${report.dealResult eq '3'}">举报受理</c:if> <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
<c:if test="${report.dealResult eq '4'}">举报属实</c:if> <c:if test="${report.dealResult eq '4'}">举报属实</c:if>
<c:if test="${report.dealResult eq '5'}">举报不实</c:if>
<c:if test="${report.dealResult eq '6'}">移交其他部门</c:if>
</td> </td>
<td><c:if test="${report.dealPersonName eq null}">--</c:if> <td><c:if test="${report.dealPersonName eq null}">--</c:if>
<c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if> <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
...@@ -43,8 +43,12 @@ ...@@ -43,8 +43,12 @@
dealResult = "举报无效"; dealResult = "举报无效";
} else if (dealResult == "3") { } else if (dealResult == "3") {
dealResult = "举报受理"; dealResult = "举报受理";
}else if (dealResult == "4"){ } else if (dealResult == "4") {
dealResult = "举报属实"; dealResult = "举报属实";
} else if (dealResult == "5") {
dealResult = "举报不是";
} else if (dealResult == "6") {
dealResult = "移交其他部门";
} }
$("#dealResult").val(dealResult); $("#dealResult").val(dealResult);
}); });
...@@ -87,9 +91,10 @@ ...@@ -87,9 +91,10 @@
<li class="active"><a href="${ctx}/report/form">举报详情</a></li> <li class="active"><a href="${ctx}/report/form">举报详情</a></li>
</ul> </ul>
<br/> <br/>
<form:form id="inputForm" modelAttribute="report" action="${ctx}/report/conclusion" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="report" action="${ctx}/report/conclusion" method="post"
class="form-horizontal">
<sys:message content="${message}"/> <sys:message content="${message}"/>
<form:hidden id="reportId" path="id"/> <form:hidden id="reportId" path="id"/>
<span class="title">举报内容</span> <span class="title">举报内容</span>
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报项目/部门:</label> <label class="control-label">被举报项目/部门:</label>
...@@ -239,14 +244,18 @@ ...@@ -239,14 +244,18 @@
<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 path="lStatus" class="input-small">
<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" htmlEscape="false" maxlength="200" class="input-xlarge required"/></c:if> <c:if test="${isAdmin eq false || report.reportStatus != '2'}"><form:input id="dealResult" path="dealResult"
htmlEscape="false" maxlength="200"
class="input-xlarge required"/></c:if>
</div> </div>
</div> </div>
</c:if> </c:if>
<li class="btns"> <li class="btns">
<label style="width:auto;"> <label style="width:auto;">
<c:if test="${report.reportStatus != '2' && report.reportStatus ne '3'}"><input id="btnTrack" class="btn btn-primary" type="button" <c:if test="${report.reportStatus != '2' && report.reportStatus ne '3'}"><input id="btnTrack"
value="跟踪"/>&nbsp;&nbsp;</c:if> class="btn btn-primary"
type="button"
value="跟踪"/>&nbsp;&nbsp;</c:if>
<input id="btnDocument" class="btn btn-primary" type="button" value="转为文档" <input id="btnDocument" class="btn btn-primary" type="button" value="转为文档"
onclick="openDownloadDialog('${report.id}')"/>&nbsp;&nbsp; onclick="openDownloadDialog('${report.id}')"/>&nbsp;&nbsp;
<input id="btnReturn" class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>&nbsp;&nbsp; <input id="btnReturn" class="btn btn-primary" type="button" value="返回" onclick="history.go(-1)"/>&nbsp;&nbsp;
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -6,6 +6,19 @@ ...@@ -6,6 +6,19 @@
<title>举报管理</title> <title>举报管理</title>
<meta name="decorator" content="default"/> <meta name="decorator" content="default"/>
<script type="text/javascript"> <script type="text/javascript">
window.onload = function () {
var dealResult = $("#dealResult").val();
if (dealResult != null && dealResult != ' ') {
if (dealResult == "6") {
$("#selectType").show();
} else {
$("#selectType").hide();
}
$("#selectDone").show();
} else {
$("#selectDone").hide();
}
}
var submitCount = 0; var submitCount = 0;
$(document).ready(function () { $(document).ready(function () {
$("#inputForm").validate({ $("#inputForm").validate({
...@@ -267,6 +280,7 @@ ...@@ -267,6 +280,7 @@
if (supplementType == "请选择") { if (supplementType == "请选择") {
supplementType = "${report.reportProject}"; supplementType = "${report.reportProject}";
} }
var supplementContent = "";
var path1 = "mailto:?subject=举报核查-" + supplementType + "-" + supplementInformant + "违规操作"; var path1 = "mailto:?subject=举报核查-" + supplementType + "-" + supplementInformant + "违规操作";
path1 += "&body=Dear,%0D%0A附件是举报核查-" + supplementType + "-" + supplementInformant + "违规操作，请核实是否属实。%0D%0A谢谢！"; path1 += "&body=Dear,%0D%0A附件是举报核查-" + supplementType + "-" + supplementInformant + "违规操作，请核实是否属实。%0D%0A谢谢！";
...@@ -343,14 +357,18 @@ ...@@ -343,14 +357,18 @@
supplementArea = "集团本部"; supplementArea = "集团本部";
} }
path2 += "被举报区域:" + supplementArea + "%0D%0A"; path2 += "被举报区域:" + supplementArea + "%0D%0A";
var supplementContent = $("#supplementContent").val(); supplementContent = $("#supplementContent").val();
path2 += "内容:"; path2 += "内容:";
var path3 = "%0D%0A附件:%0D%0A"; var path3 = "%0D%0A附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function () { $("#attachment2").find("[class='attachmentClass']").each(function () {
var url = $(this).text(); var url = $(this).text();
path3 += url; path3 += url;
}); });
} }
if (path3 == null) {
path3 = "";
}
var path = path1 + reportContent + path2 + supplementContent + path3; var path = path1 + reportContent + path2 + supplementContent + path3;
console.log(path); console.log(path);
var pathLength = ""; var pathLength = "";
...@@ -572,7 +590,7 @@ ...@@ -572,7 +590,7 @@
<label class="control-label">业务类型:</label> <label class="control-label">业务类型:</label>
<div class="controls"> <div class="controls">
<span class="supplementType"> <span class="supplementType">
<form:checkboxes path="supplementType" items="${fns:getDictList('business_type')}" <form:checkboxes path="supplementType" items="${fns:getDictList('supplement_type')}"
itemLabel="label" itemValue="value" class="required"/> itemLabel="label" itemValue="value" class="required"/>
</span> </span>
</div> </div>
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
...@@ -101,28 +101,22 @@ ...@@ -101,28 +101,22 @@
}, },
xAxis: [{ xAxis: [{
categories: [ categories: [
'地产', '营销',
'工程',
'成本',
'招采',
'财务',
'法务',
'行政',
'人力',
'开发',
'研发',
'投资',
'其他',
'物业管理', '物业管理',
'酒店管理', '酒店管理',
'商业管理' '商业管理'
], ],
// categories: [
// '营销',
// '工程',
// '成本',
// '招采',
// '财务',
// '法务',
// '行政',
// '人力',
// '开发',
// '研发',
// '投资',
// '其他',
// '物业管理',
// '酒店管理',
// '商业管理'
// ],
labels: { labels: {
enabled: false enabled: false
}, },
...@@ -157,8 +151,41 @@ ...@@ -157,8 +151,41 @@
} }
}, },
series: [{ series: [{
name: '地产', name: '营销',
data: [result.land] 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: '物业管理', name: '物业管理',
data: [result.propertyManagement] data: [result.propertyManagement]
...@@ -170,53 +197,6 @@ ...@@ -170,53 +197,6 @@
data: [result.businessManagement] data: [result.businessManagement]
} }
] ]
// 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]
// }
// ]
}); });
$('#repResult').highcharts({ $('#repResult').highcharts({
navigation: { navigation: {
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
a.login_name, a.login_name,
a.password, a.password,
a.no, a.no,
a.area,
a.name, a.name,
a.email, a.email,
a.phone, a.phone,
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
a.login_name, a.login_name,
a.password, a.password,
a.no, a.no,
a.area,
a.name, a.name,
a.email, a.email,
a.phone, a.phone,
......
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