Skip to content

S
sunac_report
Commit 343f5597 by Java-刘铮
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent fd891241
Showing with 355 additions and 182 deletions
.idea/modules.xml
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/report_sunac.iml" filepath="$PROJECT_DIR$/report_sunac.iml" /> <module fileurl="file://$PROJECT_DIR$/report_sunac.iml" filepath="$PROJECT_DIR$/report_sunac.iml" />
<module fileurl="file://E:/sunac_report/report_sunac (1).iml" filepath="E:/sunac_report/report_sunac (1).iml" />
</modules> </modules>
</component> </component>
</project> </project>
\ No newline at end of file
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
...@@ -172,6 +172,14 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -172,6 +172,14 @@ public interface ReportDao extends CrudDao<ReportEntity> {
public List<ReportEntity> getChooseReportList(ReportEntity reportEntity); public List<ReportEntity> getChooseReportList(ReportEntity reportEntity);
/** /**
* 区域列表查询
*
* @param reportEntity
* @return
*/
public List<ReportEntity> findQyList(ReportEntity reportEntity);
/**
* 工作转交 更改转交人 * 工作转交 更改转交人
* *
* @param reportEntity * @param reportEntity
...@@ -208,8 +216,10 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -208,8 +216,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 删除举报信息 * 删除举报信息
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
public int deleteConclusion(ReportEntity reportEntity); public int deleteConclusion(ReportEntity reportEntity);
} }
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -3,17 +3,20 @@ package com.ejweb.modules.report.entity; ...@@ -3,17 +3,20 @@ package com.ejweb.modules.report.entity;
import com.ejweb.core.persistence.DataEntity; import com.ejweb.core.persistence.DataEntity;
import com.ejweb.core.utils.excel.annotation.ExcelField; import com.ejweb.core.utils.excel.annotation.ExcelField;
import com.ejweb.modules.sys.entity.User;
import java.util.List; import java.util.List;
/** /**
* 举报Entity * 举报Entity
*
* @author lixy * @author lixy
* @version 2017-09-06 * @version 2017-09-06
*/ */
public class ReportEntity extends DataEntity<ReportEntity> { public class ReportEntity extends DataEntity<ReportEntity> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private User user;//用户
private String reportProject; //被举报项目 private String reportProject; //被举报项目
private String reportCity; //所在城市 private String reportCity; //所在城市
private String reportTime; //举报时间 private String reportTime; //举报时间
...@@ -27,7 +30,8 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -27,7 +30,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementDepartment; //被举报部门 private String supplementDepartment; //被举报部门
private String supplementInformant; //被举报人 private String supplementInformant; //被举报人
private String supplementTitle; //标题 private String supplementTitle; //标题
private String supplementType; //业务类型 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉 private String supplementType; //业务类型地产 物业 酒店 商业
private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
private String supplementArea; //被举报区域 private String supplementArea; //被举报区域
private String supplementProject; //被举报项目 private String supplementProject; //被举报项目
private String supplementContent; // private String supplementContent; //
...@@ -45,21 +49,37 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -45,21 +49,37 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String reportIp; //记录ip地址 private String reportIp; //记录ip地址
private String ipCity; //ip地址对应城市 private String ipCity; //ip地址对应城市
private String isSendEmail; //是否已经发送过邮件 0未发送 1已发送 private String isSendEmail; //是否已经发送过邮件 0未发送 1已发送
private String transferName; //移交给 private String transferName; //移交给
private String dealPerson; private String dealPerson;
private String lStatus; //关闭修改状态 private String lStatus; //关闭修改状态
public String getlStatus() { //是否管理员
return lStatus; private String isAdmin;
public String getIsAdmin() {
return isAdmin;
} }
public void setlStatus(String lStatus) { public void setIsAdmin(String isAdmin) {
this.lStatus = lStatus; this.isAdmin = isAdmin;
} }
public String getTransferDepartment() {
return transferDepartment;
}
public void setTransferDepartment(String transferDepartment) {
this.transferDepartment = transferDepartment;
}
public String getlStatus() {
return lStatus;
}
public void setlStatus(String lStatus) {
this.lStatus = lStatus;
}
public String getOaname() { public String getOaname() {
...@@ -69,7 +89,8 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -69,7 +89,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setOaname(String oaname) { public void setOaname(String oaname) {
this.oaname = oaname; this.oaname = oaname;
} }
// private String ifDone; //是否完成
// private String ifDone; //是否完成
// //
// //
// public String getIfDone() { // public String getIfDone() {
...@@ -83,7 +104,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -83,7 +104,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String[] types;//新业务类型 private String[] types;//新业务类型
@ExcelField(title="被举报项目/部门", align=2, sort=24) @ExcelField(title = "被举报项目/部门", align = 2, sort = 24)
public String getReportProject() { public String getReportProject() {
return reportProject; return reportProject;
} }
...@@ -100,7 +121,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -100,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 = 34)
public String getReportTime() { public String getReportTime() {
return reportTime; return reportTime;
} }
...@@ -108,7 +129,8 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -108,7 +129,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setReportTime(String reportTime) { public void setReportTime(String reportTime) {
this.reportTime = reportTime; this.reportTime = reportTime;
} }
@ExcelField(title = "举报内容",align = 2,sort = 44)
@ExcelField(title = "举报内容", align = 2, sort = 44)
public String getReportContent() { public String getReportContent() {
return reportContent; return reportContent;
} }
...@@ -117,7 +139,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -117,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 = 26)
public String getReportPersonName() { public String getReportPersonName() {
return reportPersonName; return reportPersonName;
} }
...@@ -126,7 +148,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -126,7 +148,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportPersonName = reportPersonName; this.reportPersonName = reportPersonName;
} }
@ExcelField(title="举报人电话", align=2, sort=28) @ExcelField(title = "举报人电话", align = 2, sort = 28)
public String getReportPersonTel() { public String getReportPersonTel() {
return reportPersonTel; return reportPersonTel;
} }
...@@ -151,7 +173,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -151,7 +173,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportSource = reportSource; this.reportSource = reportSource;
} }
@ExcelField(title="状态", align=2, sort=36) @ExcelField(title = "状态", align = 2, sort = 36)
public String getReportStatus() { public String getReportStatus() {
return reportStatus; return reportStatus;
} }
...@@ -176,7 +198,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -176,7 +198,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementDepartment = supplementDepartment; this.supplementDepartment = supplementDepartment;
} }
@ExcelField(title="被举报人", align=2, sort=32) @ExcelField(title = "被举报人", align = 2, sort = 32)
public String getSupplementInformant() { public String getSupplementInformant() {
return supplementInformant; return supplementInformant;
} }
...@@ -185,7 +207,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -185,7 +207,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementInformant = supplementInformant; this.supplementInformant = supplementInformant;
} }
@ExcelField(title="标题", align=2, sort=20) @ExcelField(title = "标题", align = 2, sort = 20)
public String getSupplementTitle() { public String getSupplementTitle() {
return supplementTitle; return supplementTitle;
} }
...@@ -194,7 +216,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -194,7 +216,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementTitle = supplementTitle; this.supplementTitle = supplementTitle;
} }
@ExcelField(title="业务类型", align=2, sort=22) @ExcelField(title = "业务类型", align = 2, sort = 22)
public String getSupplementType() { public String getSupplementType() {
return supplementType; return supplementType;
} }
...@@ -203,7 +225,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -203,7 +225,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementType = supplementType; this.supplementType = supplementType;
} }
@ExcelField(title="区域", align=2, sort=30) @ExcelField(title = "区域", align = 2, sort = 30)
public String getSupplementArea() { public String getSupplementArea() {
return supplementArea; return supplementArea;
} }
...@@ -219,7 +241,8 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -219,7 +241,8 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setSupplementProject(String supplementProject) { public void setSupplementProject(String supplementProject) {
this.supplementProject = supplementProject; this.supplementProject = supplementProject;
} }
@ExcelField(title = "举报信息补充内容",align = 2,sort = 46)
@ExcelField(title = "举报信息补充内容", align = 2, sort = 46)
public String getSupplementContent() { public String getSupplementContent() {
return supplementContent; return supplementContent;
} }
...@@ -228,7 +251,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -228,7 +251,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.supplementContent = supplementContent; this.supplementContent = supplementContent;
} }
@ExcelField(title="处理人", align=2, sort=40) @ExcelField(title = "处理人", align = 2, sort = 40)
public String getDealPersonName() { public String getDealPersonName() {
return dealPersonName; return dealPersonName;
} }
...@@ -237,7 +260,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -237,7 +260,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.dealPersonName = dealPersonName; this.dealPersonName = dealPersonName;
} }
@ExcelField(title="处理结论", align=2, sort=38) @ExcelField(title = "处理结论", align = 2, sort = 38)
public String getDealResult() { public String getDealResult() {
return dealResult; return dealResult;
} }
...@@ -326,7 +349,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -326,7 +349,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.types = types; this.types = types;
} }
@ExcelField(title="移交给", align=2, sort=42) @ExcelField(title = "移交给", align = 2, sort = 42)
public String getTransferName() { public String getTransferName() {
return transferName; return transferName;
} }
...@@ -335,7 +358,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -335,7 +358,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 = 48)
public String getReportIp() { public String getReportIp() {
return reportIp; return reportIp;
} }
...@@ -344,7 +367,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -344,7 +367,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 = 50)
public String getIpCity() { public String getIpCity() {
return ipCity; return ipCity;
} }
...@@ -353,7 +376,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -353,7 +376,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.ipCity = ipCity; this.ipCity = ipCity;
} }
@ExcelField(title="邮件发送", align=2, sort=48) @ExcelField(title = "邮件发送", align = 2, sort = 48)
public String getIsSendEmail() { public String getIsSendEmail() {
return isSendEmail; return isSendEmail;
} }
...@@ -369,4 +392,13 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -369,4 +392,13 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setDealPerson(String dealPerson) { public void setDealPerson(String dealPerson) {
this.dealPerson = dealPerson; this.dealPerson = dealPerson;
} }
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
} }
src/main/java/com/ejweb/modules/report/service/ReportService.java
...@@ -560,7 +560,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -560,7 +560,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
*/ */
@Transactional(readOnly = false) @Transactional(readOnly = false)
public int updateConclusion(ReportEntity reportEntity) { public int updateConclusion(ReportEntity reportEntity) {
return reportDao.updateConclusion(reportEntity); return reportDao.updateConclusion(reportEntity);
} }
/** /**
...@@ -573,4 +573,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> { ...@@ -573,4 +573,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
return reportDao.deleteConclusion(reportEntity); return reportDao.deleteConclusion(reportEntity);
} }
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/sys/entity/User.java
...@@ -21,6 +21,7 @@ import java.util.List; ...@@ -21,6 +21,7 @@ import java.util.List;
/** /**
* 用户Entity * 用户Entity
*
* @author ThinkGem * @author ThinkGem
* @version 2013-12-05 * @version 2013-12-05
*/ */
...@@ -44,37 +45,45 @@ public class User extends DataEntity<User> { ...@@ -44,37 +45,45 @@ public class User extends DataEntity<User> {
private String officeName; // 部门长名称 private String officeName; // 部门长名称
private String oldLoginName;// 原登录名 private String oldLoginName;// 原登录名
private String newPassword; // 新密码 private String newPassword; // 新密码
private String area;//所属区域
private String oldLoginIp; // 上次登陆IP private String oldLoginIp; // 上次登陆IP
private Date oldLoginDate; // 上次登陆日期 private Date oldLoginDate; // 上次登陆日期
private String roleId; private String roleId;
private Role role; // 根据角色查询用户条件 private Role role; // 根据角色查询用户条件
private List<Role> roleList = Lists.newArrayList(); // 拥有角色列表 private List<Role> roleList = Lists.newArrayList(); // 拥有角色列表
private Position position; //职位 private Position position; //职位
private String devision; //组织 private String devision; //组织
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public User() { public User() {
super(); super();
this.loginFlag = GConstants.YES; this.loginFlag = GConstants.YES;
} }
public User(String id){ public User(String id) {
super(id); super(id);
} }
public User(String id, String loginName){ public User(String id, String loginName) {
super(id); super(id);
this.loginName = loginName; this.loginName = loginName;
} }
public User(Role role){ public User(Role role) {
super(); super();
this.role = role; this.role = role;
} }
public String getPhoto() { public String getPhoto() {
return photo; return photo;
} }
...@@ -91,15 +100,15 @@ public class User extends DataEntity<User> { ...@@ -91,15 +100,15 @@ public class User extends DataEntity<User> {
this.loginFlag = loginFlag; this.loginFlag = loginFlag;
} }
@SupCol(isUnique="true", isHide="true") @SupCol(isUnique = "true", isHide = "true")
@ExcelField(title="ID", type=1, align=2, sort=1) @ExcelField(title = "ID", type = 1, align = 2, sort = 1)
public String getId() { public String getId() {
return id; return id;
} }
@JsonIgnore @JsonIgnore
@NotNull(message="归属公司不能为空") @NotNull(message = "归属公司不能为空")
@ExcelField(title="归属公司", align=2, sort=20) @ExcelField(title = "归属公司", align = 2, sort = 20)
public Office getCompany() { public Office getCompany() {
return company; return company;
} }
...@@ -107,10 +116,10 @@ public class User extends DataEntity<User> { ...@@ -107,10 +116,10 @@ public class User extends DataEntity<User> {
public void setCompany(Office company) { public void setCompany(Office company) {
this.company = company; this.company = company;
} }
@JsonIgnore @JsonIgnore
@NotNull(message="归属部门不能为空") @NotNull(message = "归属部门不能为空")
@ExcelField(title="归属部门", align=2, sort=25) @ExcelField(title = "归属部门", align = 2, sort = 25)
public Office getOffice() { public Office getOffice() {
return office; return office;
} }
...@@ -119,8 +128,8 @@ public class User extends DataEntity<User> { ...@@ -119,8 +128,8 @@ public class User extends DataEntity<User> {
this.office = office; this.office = office;
} }
@Length(min=1, max=100, message="登录名长度必须介于 1 和 100 之间") @Length(min = 1, max = 100, message = "登录名长度必须介于 1 和 100 之间")
@ExcelField(title="登录名", align=2, sort=30) @ExcelField(title = "登录名", align = 2, sort = 30)
public String getLoginName() { public String getLoginName() {
return loginName; return loginName;
} }
...@@ -130,7 +139,7 @@ public class User extends DataEntity<User> { ...@@ -130,7 +139,7 @@ public class User extends DataEntity<User> {
} }
@JsonIgnore @JsonIgnore
@Length(min=1, max=100, message="密码长度必须介于 1 和 100 之间") @Length(min = 1, max = 100, message = "密码长度必须介于 1 和 100 之间")
public String getPassword() { public String getPassword() {
return password; return password;
} }
...@@ -139,14 +148,14 @@ public class User extends DataEntity<User> { ...@@ -139,14 +148,14 @@ public class User extends DataEntity<User> {
this.password = password; this.password = password;
} }
@Length(min=1, max=100, message="姓名长度必须介于 1 和 100 之间") @Length(min = 1, max = 100, message = "姓名长度必须介于 1 和 100 之间")
@ExcelField(title="姓名", align=2, sort=40) @ExcelField(title = "姓名", align = 2, sort = 40)
public String getName() { public String getName() {
return name; return name;
} }
@Length(min=1, max=100, message="工号长度必须介于 1 和 100 之间") @Length(min = 1, max = 100, message = "工号长度必须介于 1 和 100 之间")
@ExcelField(title="工号", align=2, sort=45) @ExcelField(title = "工号", align = 2, sort = 45)
public String getNo() { public String getNo() {
return no; return no;
} }
...@@ -159,9 +168,9 @@ public class User extends DataEntity<User> { ...@@ -159,9 +168,9 @@ public class User extends DataEntity<User> {
this.name = name; this.name = name;
} }
@Email(message="邮箱格式不正确") @Email(message = "邮箱格式不正确")
@Length(min=0, max=200, message="邮箱长度必须介于 1 和 200 之间") @Length(min = 0, max = 200, message = "邮箱长度必须介于 1 和 200 之间")
@ExcelField(title="邮箱", align=1, sort=50) @ExcelField(title = "邮箱", align = 1, sort = 50)
public String getEmail() { public String getEmail() {
return email; return email;
} }
...@@ -169,9 +178,9 @@ public class User extends DataEntity<User> { ...@@ -169,9 +178,9 @@ public class User extends DataEntity<User> {
public void setEmail(String email) { public void setEmail(String email) {
this.email = email; this.email = email;
} }
@Length(min=0, max=200, message="电话长度必须介于 1 和 200 之间") @Length(min = 0, max = 200, message = "电话长度必须介于 1 和 200 之间")
@ExcelField(title="电话", align=2, sort=60) @ExcelField(title = "电话", align = 2, sort = 60)
public String getPhone() { public String getPhone() {
return phone; return phone;
} }
...@@ -180,8 +189,8 @@ public class User extends DataEntity<User> { ...@@ -180,8 +189,8 @@ public class User extends DataEntity<User> {
this.phone = phone; this.phone = phone;
} }
@Length(min=0, max=200, message="手机长度必须介于 1 和 200 之间") @Length(min = 0, max = 200, message = "手机长度必须介于 1 和 200 之间")
@ExcelField(title="手机", align=2, sort=70) @ExcelField(title = "手机", align = 2, sort = 70)
public String getMobile() { public String getMobile() {
return mobile; return mobile;
} }
...@@ -190,13 +199,13 @@ public class User extends DataEntity<User> { ...@@ -190,13 +199,13 @@ public class User extends DataEntity<User> {
this.mobile = mobile; this.mobile = mobile;
} }
@ExcelField(title="备注", align=1, sort=900) @ExcelField(title = "备注", align = 1, sort = 900)
public String getRemarks() { public String getRemarks() {
return remarks; return remarks;
} }
@Length(min=0, max=100, message="用户类型长度必须介于 1 和 100 之间") @Length(min = 0, max = 100, message = "用户类型长度必须介于 1 和 100 之间")
@ExcelField(title="用户类型", align=2, sort=80, dictType="sys_user_type") @ExcelField(title = "用户类型", align = 2, sort = 80, dictType = "sys_user_type")
public String getUserType() { public String getUserType() {
return userType; return userType;
} }
...@@ -205,12 +214,12 @@ public class User extends DataEntity<User> { ...@@ -205,12 +214,12 @@ public class User extends DataEntity<User> {
this.userType = userType; this.userType = userType;
} }
@ExcelField(title="创建时间", type=0, align=1, sort=90) @ExcelField(title = "创建时间", type = 0, align = 1, sort = 90)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
@ExcelField(title="最后登录IP", type=1, align=1, sort=100) @ExcelField(title = "最后登录IP", type = 1, align = 1, sort = 100)
public String getLoginIp() { public String getLoginIp() {
return loginIp; return loginIp;
} }
...@@ -220,7 +229,7 @@ public class User extends DataEntity<User> { ...@@ -220,7 +229,7 @@ public class User extends DataEntity<User> {
} }
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelField(title="最后登录日期", type=1, align=1, sort=110) @ExcelField(title = "最后登录日期", type = 1, align = 1, sort = 110)
public Date getLoginDate() { public Date getLoginDate() {
return loginDate; return loginDate;
} }
...@@ -246,7 +255,7 @@ public class User extends DataEntity<User> { ...@@ -246,7 +255,7 @@ public class User extends DataEntity<User> {
} }
public String getOldLoginIp() { public String getOldLoginIp() {
if (oldLoginIp == null){ if (oldLoginIp == null) {
return loginIp; return loginIp;
} }
return oldLoginIp; return oldLoginIp;
...@@ -258,7 +267,7 @@ public class User extends DataEntity<User> { ...@@ -258,7 +267,7 @@ public class User extends DataEntity<User> {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getOldLoginDate() { public Date getOldLoginDate() {
if (oldLoginDate == null){ if (oldLoginDate == null) {
return loginDate; return loginDate;
} }
return oldLoginDate; return oldLoginDate;
...@@ -285,11 +294,11 @@ public class User extends DataEntity<User> { ...@@ -285,11 +294,11 @@ public class User extends DataEntity<User> {
} }
@JsonIgnore @JsonIgnore
@ExcelField(title="拥有角色", align=1, sort=800, fieldType=RoleListType.class) @ExcelField(title = "拥有角色", align = 1, sort = 800, fieldType = RoleListType.class)
public List<Role> getRoleList() { public List<Role> getRoleList() {
return roleList; return roleList;
} }
public void setRoleList(List<Role> roleList) { public void setRoleList(List<Role> roleList) {
this.roleList = roleList; this.roleList = roleList;
} }
...@@ -311,6 +320,7 @@ public class User extends DataEntity<User> { ...@@ -311,6 +320,7 @@ public class User extends DataEntity<User> {
roleList.add(role); roleList.add(role);
} }
} }
/** /**
* 获取数据库名称 * 获取数据库名称
*/ */
...@@ -318,6 +328,7 @@ public class User extends DataEntity<User> { ...@@ -318,6 +328,7 @@ public class User extends DataEntity<User> {
public String getDbName() { public String getDbName() {
return GConstants.getValue("jdbc.type", "mysql"); return GConstants.getValue("jdbc.type", "mysql");
} }
public Position getPosition() { public Position getPosition() {
return position; return position;
} }
...@@ -340,15 +351,15 @@ public class User extends DataEntity<User> { ...@@ -340,15 +351,15 @@ public class User extends DataEntity<User> {
public String getRoleNames() { public String getRoleNames() {
return Collections3.extractToString(roleList, "name", ","); return Collections3.extractToString(roleList, "name", ",");
} }
public boolean isAdmin(){ public boolean isAdmin() {
return isAdmin(this.id); return isAdmin(this.id);
} }
public static boolean isAdmin(String id){ public static boolean isAdmin(String id) {
return id != null && "1".equals(id); return id != null && "1".equals(id);
} }
@Override @Override
public String toString() { public String toString() {
return id; return id;
......
src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java
...@@ -11,7 +11,7 @@ public class WorkbenchBean { ...@@ -11,7 +11,7 @@ public class WorkbenchBean {
//总数 //总数
private int totalCount; private int totalCount;
//是否管理员 //是否管理员
private String isAdmin; private String isAdmin;
//处理状态 //处理状态
private String processStatus; private String processStatus;
...@@ -33,6 +33,8 @@ public class WorkbenchBean { ...@@ -33,6 +33,8 @@ public class WorkbenchBean {
private int confirmed = 0; private int confirmed = 0;
private int verified = 0; private int verified = 0;
private int unsettled = 0; private int unsettled = 0;
private int unreaListic = 0;
private int transfer = 0;
//总体 //总体
private int total = 0; private int total = 0;
...@@ -59,6 +61,29 @@ public class WorkbenchBean { ...@@ -59,6 +61,29 @@ public class WorkbenchBean {
private int businessManagement = 0; private int businessManagement = 0;
private int rAndD = 0; private int rAndD = 0;
private int iAndD = 0; private int iAndD = 0;
private int propertyManagement = 0;
private int hotelManagement = 0;
private int development = 0;
private int Other = 0;
private int land = 0;
public int getLand() {
return land;
}
public void setLand(int land) {
this.land = land;
}
public int getForensic() {
return forensic;
}
public void setForensic(int forensic) {
this.forensic = forensic;
}
private int forensic = 0;
public WorkbenchBean() { public WorkbenchBean() {
} }
...@@ -374,4 +399,53 @@ public class WorkbenchBean { ...@@ -374,4 +399,53 @@ public class WorkbenchBean {
public void setUnsettled(int unsettled) { public void setUnsettled(int unsettled) {
this.unsettled = unsettled; this.unsettled = unsettled;
} }
public int getUnreaListic() {
return unreaListic;
}
public void setUnreaListic(int unreaListic) {
this.unreaListic = unreaListic;
}
public int getTransfer() {
return transfer;
}
public void setTransfer(int transfer) {
this.transfer = transfer;
}
public int getPropertyManagement() {
return propertyManagement;
}
public void setPropertyManagement(int propertyManagement) {
this.propertyManagement = propertyManagement;
}
public int getHotelManagement() {
return hotelManagement;
}
public void setHotelManagement(int hotelManagement) {
this.hotelManagement = hotelManagement;
}
public int getDevelopment() {
return development;
}
public void setDevelopment(int development) {
this.development = development;
}
public int getOther() {
return Other;
}
public void setOther(int other) {
Other = other;
}
} }
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
...@@ -34,20 +34,20 @@ public class WorkbenchController extends BaseController { ...@@ -34,20 +34,20 @@ public class WorkbenchController extends BaseController {
private ReportService reportService; private ReportService reportService;
@RequiresPermissions("workbench:view") @RequiresPermissions("workbench:view")
@RequestMapping(value={"list",""}) @RequestMapping(value = {"list", ""})
public String getWorkbench(Model model,WorkbenchBean bean){ public String getWorkbench(Model model, WorkbenchBean bean) {
WorkbenchBean workbench; WorkbenchBean workbench;
try { try {
User user = UserUtils.getUser(); User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean); bean = getWorkbenchByUser(user, bean);
if(StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())){ if (StringUtils.isBlank(bean.getProcessStatus()) || "0".equals(bean.getProcessStatus())) {
bean.setProcessStatus("0"); bean.setProcessStatus("0");
}else if("1".equals(bean.getProcessStatus())){ } else if ("1".equals(bean.getProcessStatus())) {
bean.setProcessStatus("1"); bean.setProcessStatus("1");
} }
List<ReportEntity> repList = workbenchService.getRepList(bean); List<ReportEntity> repList = workbenchService.getRepList(bean);
model.addAttribute("workbench",bean); model.addAttribute("workbench", bean);
model.addAttribute("repList",repList); model.addAttribute("repList", repList);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -56,41 +56,45 @@ public class WorkbenchController extends BaseController { ...@@ -56,41 +56,45 @@ public class WorkbenchController extends BaseController {
@RequestMapping("/getHighcharts") @RequestMapping("/getHighcharts")
@ResponseBody @ResponseBody
public void getHighcharts(WorkbenchBean bean,HttpServletResponse response){ public void getHighcharts(WorkbenchBean bean, HttpServletResponse response) {
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
try { try {
User user = UserUtils.getUser(); User user = UserUtils.getUser();
bean = getWorkbenchByUser(user, bean); bean = getWorkbenchByUser(user, bean);
res.put("bench",bean); res.put("bench", bean);
//举报状态 //举报状态
res.put("unProcess",bean.getUnProcess()); res.put("unProcess", bean.getUnProcess());
res.put("processing",bean.getProcessing()); res.put("processing", bean.getProcessing());
res.put("processed",bean.getProcessed()); res.put("processed", bean.getProcessed());
res.put("closed",bean.getClosed()); res.put("closed", bean.getClosed());
//举报结果 //举报结果
res.put("unsettled",bean.getUnsettled()); res.put("unsettled", bean.getUnsettled());
res.put("invalid",bean.getInvalid()); res.put("invalid", bean.getInvalid());
res.put("complainNum",bean.getComplainNum()); res.put("complainNum", bean.getComplainNum());
res.put("verified",bean.getVerified()); res.put("verified", bean.getVerified());
res.put("confirmed",bean.getConfirmed()); res.put("confirmed", bean.getConfirmed());
res.put("startDate",bean.getStartDate()); res.put("unreaListic", bean.getConfirmed());
res.put("endDate",bean.getEndDate()); res.put("transfer", bean.getConfirmed());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
//举报类型 //举报类型
res.put("sale",bean.getSale()); res.put("land", 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("manpower",bean.getManpower()); // res.put("finance", bean.getFinance());
res.put("tenement",bean.getTenement()); // res.put("forensic", bean.getForensic());
res.put("complain",bean.getComplain()); // res.put("administration", bean.getAdministration());
res.put("administration",bean.getAdministration()); // res.put("manpower", bean.getManpower());
res.put("finance",bean.getFinance()); // res.put("development", bean.getDevelopment());
res.put("businessManagement",bean.getBusinessManagement()); // 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("propertyManagement", bean.getPropertyManagement());
res.put("startDate",bean.getStartDate()); res.put("hotelManagement", bean.getHotelManagement());
res.put("endDate",bean.getEndDate()); res.put("businessManagement", bean.getBusinessManagement());
res.put("startDate", bean.getStartDate());
res.put("endDate", bean.getEndDate());
String jsonStr = res.toJSONString(); String jsonStr = res.toJSONString();
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
response.setContentType("application/json;charset=utf-8"); response.setContentType("application/json;charset=utf-8");
...@@ -101,8 +105,8 @@ public class WorkbenchController extends BaseController { ...@@ -101,8 +105,8 @@ public class WorkbenchController extends BaseController {
} }
} }
public WorkbenchBean getWorkbenchByUser(User user,WorkbenchBean bean){ public WorkbenchBean getWorkbenchByUser(User user, WorkbenchBean bean) {
if(user != null) { if (user != null) {
try { try {
//判断登录人的角色 //判断登录人的角色
String roleName = reportService.findRole(user); String roleName = reportService.findRole(user);
......
src/main/resources/jdbc.properties
...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas ...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531 jdbc.username=eas7531
jdbc.password=sunac 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.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver #jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
src/main/resources/mappings/modules/sys/UserDao.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ejweb.modules.sys.dao.SysUserDao"> <mapper namespace="com.ejweb.modules.sys.dao.SysUserDao">
<!-- <resultMap id="userResult" type="User"> <!-- <resultMap id="userResult" type="User">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="company.id" column="company.id" /> <result property="company.id" column="company.id" />
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</collection> </collection>
</collection> </collection>
</resultMap> --> </resultMap> -->
<sql id="userColumns"> <sql id="userColumns">
a.id, a.id,
a.company_id AS "company.id", a.company_id AS "company.id",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
r.role_type AS "roleList.roleType", r.role_type AS "roleList.roleType",
r.data_scope AS "roleList.dataScope" --> r.data_scope AS "roleList.dataScope" -->
</sql> </sql>
<sql id="userJoins"> <sql id="userJoins">
LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id
LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
<select id="get" resultType="User"> <select id="get" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<!-- 根据登录名查询用户 --> <!-- 根据登录名查询用户 -->
<select id="getByLoginName" resultType="User" parameterType="User"> <select id="getByLoginName" resultType="User" parameterType="User">
SELECT SELECT
<include refid="userColumns"/><!-- , <include refid="userColumns"/><!-- ,
ro.office_id AS "roleList.officeList.id" --> ro.office_id AS "roleList.officeList.id" -->
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/><!-- <include refid="userJoins"/><!--
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
<!-- 分页查询用户信息 --> <!-- 分页查询用户信息 -->
<select id="findList" resultType="User"> <select id="findList" resultType="User">
SELECT SELECT
role.id AS roleId, role.id AS roleId,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
...@@ -158,15 +158,15 @@ ...@@ -158,15 +158,15 @@
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="company != null and company.id != null and company.id != ''"> <if test="company != null and company.id != null and company.id != ''">
AND (c.id = #{company.id} OR c.parent_ids LIKE AND (c.id = #{company.id} OR c.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if>
</if> </if>
<if test="office != null and office.id != null and office.id != ''"> <if test="office != null and office.id != null and office.id != ''">
AND (o.id = #{office.id} OR o.parent_ids LIKE AND (o.id = #{office.id} OR o.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
</if> </if>
<!-- 如果不是超级管理员，则不显示超级管理员用户 --> <!-- 如果不是超级管理员，则不显示超级管理员用户 -->
<if test="!currentUser.admin"> <if test="!currentUser.admin">
...@@ -174,15 +174,15 @@ ...@@ -174,15 +174,15 @@
</if> </if>
<if test="loginName != null and loginName != ''"> <if test="loginName != null and loginName != ''">
AND a.login_name like AND a.login_name like
<if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if> <if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if> <if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if>
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
AND a.name like AND a.name like
<if test="dbName == 'oracle'">'%'||#{name}||'%'</if> <if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{name}+'%'</if> <if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if>
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${sqlMap.dsf} ${sqlMap.dsf}
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<!-- 查询全部用户 --> <!-- 查询全部用户 -->
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
password, password,
no, no,
name, name,
area,
email, email,
phone, phone,
mobile, mobile,
...@@ -254,6 +255,7 @@ ...@@ -254,6 +255,7 @@
#{password}, #{password},
#{no}, #{no},
#{name}, #{name},
#{area},
#{email}, #{email},
#{phone}, #{phone},
#{mobile}, #{mobile},
...@@ -288,6 +290,7 @@ ...@@ -288,6 +290,7 @@
password = #{password}, password = #{password},
no = #{no}, no = #{no},
name = #{name}, name = #{name},
area=#{area},
email = #{email}, email = #{email},
phone = #{phone}, phone = #{phone},
mobile = #{mobile}, mobile = #{mobile},
...@@ -311,7 +314,7 @@ ...@@ -311,7 +314,7 @@
<foreach collection="roleList" item="role" separator=" union all "> <foreach collection="roleList" item="role" separator=" union all ">
SELECT #{id}, #{role.id} SELECT #{id}, #{role.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
FROM dual FROM dual
</if> </if>
</foreach> </foreach>
</insert> </insert>
...@@ -350,5 +353,5 @@ ...@@ -350,5 +353,5 @@
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
<form:input id="supplementType" <form:input id="supplementType"
path="supplementType" path="supplementType"
htmlEscape="false" maxlength="200" class="input-xlarge required"/> htmlEscape="false" maxlength="200" class="input-xlarge required"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
...@@ -219,13 +219,13 @@ ...@@ -219,13 +219,13 @@
/*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/ /*t_r_content和cl_freeze高度相差20px， 高度为外观显示高度，可根据情况调整*/
.t_r_content { .t_r_content {
width: 100%; width: 100%;
height: 358px; height: 410px;
background: #fff; background: #fff;
overflow: auto; overflow: auto;
} }
.cl_freeze { .cl_freeze {
height: 341px; height: 410px;
overflow: hidden; overflow: hidden;
width: 101%; width: 101%;
} }
...@@ -268,7 +268,9 @@ ...@@ -268,7 +268,9 @@
<ul class="nav nav-tabs"> <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 null or flag eq ''}">class="active"</c:if>><a href="${ctx}/report/list">跟踪中举报列表</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 '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 '1'}">class="active"</c:if>><a href="${ctx}/report/list?flag=1">举报列表</a></li>
<%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%> <%--<li style="float: right;"><input id="btnAdd" class="btn btn-primary" type="button" value="举报录入"/></li>--%>
</ul> </ul>
<form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post" <form:form id="searchForm" modelAttribute="report" action="${ctx}/report/list" method="post"
...@@ -300,7 +302,7 @@ ...@@ -300,7 +302,7 @@
maxlength="50" class="input-small"/></li> maxlength="50" class="input-small"/></li>
<li><label>业务类型：</label><form:select onchange="resetPageNo();" path="supplementType" class="input-small"> <li><label>业务类型：</label><form:select onchange="resetPageNo();" path="supplementType" class="input-small">
<form:option value=" ">请选择</form:option> <form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value" <form:options items="${fns:getDictList('business_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/></form:select></li> htmlEscape="false"/></form:select></li>
<li><label>状态：</label><form:select onchange="resetPageNo();" path="reportStatus" class="input-small"> <li><label>状态：</label><form:select onchange="resetPageNo();" path="reportStatus" class="input-small">
<form:option value=" ">请选择</form:option> <form:option value=" ">请选择</form:option>
...@@ -334,7 +336,7 @@ ...@@ -334,7 +336,7 @@
<thead> <thead>
<tr> <tr>
<th style="width:5%">ID</th> <th style="width:5%">ID</th>
<th style="width:15%">标题</th> <th style="width:15%" align="center">标题</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -342,7 +344,7 @@ ...@@ -342,7 +344,7 @@
<c:forEach items="${page.list}" var="report" varStatus="vs"> <c:forEach items="${page.list}" var="report" varStatus="vs">
<tr class="reportList"> <tr class="reportList">
<td style="width:5%"></td> <td style="width:5%"></td>
<td style="width:15%">${report.supplementTitle}</td> <td style="width:15%" align="left">${report.supplementTitle}</td>
</c:forEach> </c:forEach>
</c:if> </c:if>
</tr> </tr>
...@@ -369,6 +371,7 @@ ...@@ -369,6 +371,7 @@
<th>举报时间</th> <th>举报时间</th>
<th>状态</th> <th>状态</th>
<th>处理结论</th> <th>处理结论</th>
<th>移交部门</th>
<th>处理人</th> <th>处理人</th>
<c:if test="${isAdmin eq true}"> <c:if test="${isAdmin eq true}">
<th>移交给</th> <th>移交给</th>
...@@ -430,7 +433,10 @@ ...@@ -430,7 +433,10 @@
<c:if test="${report.dealResult eq '2'}">举报无效</c:if> <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
<c:if test="${report.dealResult eq '3'}">举报受理</c:if> <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
<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>${report.transferDepartment}</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>
</td> </td>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties
...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas ...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531 jdbc.username=eas7531
jdbc.password=sunac 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.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver #jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ejweb.modules.sys.dao.SysUserDao"> <mapper namespace="com.ejweb.modules.sys.dao.SysUserDao">
<!-- <resultMap id="userResult" type="User"> <!-- <resultMap id="userResult" type="User">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="company.id" column="company.id" /> <result property="company.id" column="company.id" />
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</collection> </collection>
</collection> </collection>
</resultMap> --> </resultMap> -->
<sql id="userColumns"> <sql id="userColumns">
a.id, a.id,
a.company_id AS "company.id", a.company_id AS "company.id",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
r.role_type AS "roleList.roleType", r.role_type AS "roleList.roleType",
r.data_scope AS "roleList.dataScope" --> r.data_scope AS "roleList.dataScope" -->
</sql> </sql>
<sql id="userJoins"> <sql id="userJoins">
LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id
LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
<select id="get" resultType="User"> <select id="get" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<!-- 根据登录名查询用户 --> <!-- 根据登录名查询用户 -->
<select id="getByLoginName" resultType="User" parameterType="User"> <select id="getByLoginName" resultType="User" parameterType="User">
SELECT SELECT
<include refid="userColumns"/><!-- , <include refid="userColumns"/><!-- ,
ro.office_id AS "roleList.officeList.id" --> ro.office_id AS "roleList.officeList.id" -->
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/><!-- <include refid="userJoins"/><!--
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
<!-- 分页查询用户信息 --> <!-- 分页查询用户信息 -->
<select id="findList" resultType="User"> <select id="findList" resultType="User">
SELECT SELECT
role.id AS roleId, role.id AS roleId,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
...@@ -158,15 +158,15 @@ ...@@ -158,15 +158,15 @@
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="company != null and company.id != null and company.id != ''"> <if test="company != null and company.id != null and company.id != ''">
AND (c.id = #{company.id} OR c.parent_ids LIKE AND (c.id = #{company.id} OR c.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if>
</if> </if>
<if test="office != null and office.id != null and office.id != ''"> <if test="office != null and office.id != null and office.id != ''">
AND (o.id = #{office.id} OR o.parent_ids LIKE AND (o.id = #{office.id} OR o.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
</if> </if>
<!-- 如果不是超级管理员，则不显示超级管理员用户 --> <!-- 如果不是超级管理员，则不显示超级管理员用户 -->
<if test="!currentUser.admin"> <if test="!currentUser.admin">
...@@ -174,15 +174,15 @@ ...@@ -174,15 +174,15 @@
</if> </if>
<if test="loginName != null and loginName != ''"> <if test="loginName != null and loginName != ''">
AND a.login_name like AND a.login_name like
<if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if> <if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if> <if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if>
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
AND a.name like AND a.name like
<if test="dbName == 'oracle'">'%'||#{name}||'%'</if> <if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{name}+'%'</if> <if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if>
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${sqlMap.dsf} ${sqlMap.dsf}
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<!-- 查询全部用户 --> <!-- 查询全部用户 -->
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
password, password,
no, no,
name, name,
area,
email, email,
phone, phone,
mobile, mobile,
...@@ -254,6 +255,7 @@ ...@@ -254,6 +255,7 @@
#{password}, #{password},
#{no}, #{no},
#{name}, #{name},
#{area},
#{email}, #{email},
#{phone}, #{phone},
#{mobile}, #{mobile},
...@@ -288,6 +290,7 @@ ...@@ -288,6 +290,7 @@
password = #{password}, password = #{password},
no = #{no}, no = #{no},
name = #{name}, name = #{name},
area=#{area},
email = #{email}, email = #{email},
phone = #{phone}, phone = #{phone},
mobile = #{mobile}, mobile = #{mobile},
...@@ -311,7 +314,7 @@ ...@@ -311,7 +314,7 @@
<foreach collection="roleList" item="role" separator=" union all "> <foreach collection="roleList" item="role" separator=" union all ">
SELECT #{id}, #{role.id} SELECT #{id}, #{role.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
FROM dual FROM dual
</if> </if>
</foreach> </foreach>
</insert> </insert>
...@@ -350,5 +353,5 @@ ...@@ -350,5 +353,5 @@
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/jdbc.properties
...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas ...@@ -14,6 +14,13 @@ jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531 jdbc.username=eas7531
jdbc.password=sunac 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.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver #jdbc.driver.class=oracle.jdbc.driver.OracleDriver
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ejweb.modules.sys.dao.SysUserDao"> <mapper namespace="com.ejweb.modules.sys.dao.SysUserDao">
<!-- <resultMap id="userResult" type="User"> <!-- <resultMap id="userResult" type="User">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="company.id" column="company.id" /> <result property="company.id" column="company.id" />
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</collection> </collection>
</collection> </collection>
</resultMap> --> </resultMap> -->
<sql id="userColumns"> <sql id="userColumns">
a.id, a.id,
a.company_id AS "company.id", a.company_id AS "company.id",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
r.role_type AS "roleList.roleType", r.role_type AS "roleList.roleType",
r.data_scope AS "roleList.dataScope" --> r.data_scope AS "roleList.dataScope" -->
</sql> </sql>
<sql id="userJoins"> <sql id="userJoins">
LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id
LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
<select id="get" resultType="User"> <select id="get" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<!-- 根据登录名查询用户 --> <!-- 根据登录名查询用户 -->
<select id="getByLoginName" resultType="User" parameterType="User"> <select id="getByLoginName" resultType="User" parameterType="User">
SELECT SELECT
<include refid="userColumns"/><!-- , <include refid="userColumns"/><!-- ,
ro.office_id AS "roleList.officeList.id" --> ro.office_id AS "roleList.officeList.id" -->
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/><!-- <include refid="userJoins"/><!--
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
<!-- 分页查询用户信息 --> <!-- 分页查询用户信息 -->
<select id="findList" resultType="User"> <select id="findList" resultType="User">
SELECT SELECT
role.id AS roleId, role.id AS roleId,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
...@@ -158,15 +158,15 @@ ...@@ -158,15 +158,15 @@
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="company != null and company.id != null and company.id != ''"> <if test="company != null and company.id != null and company.id != ''">
AND (c.id = #{company.id} OR c.parent_ids LIKE AND (c.id = #{company.id} OR c.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{company.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{company.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{company.id}, ',%'))</if>
</if> </if>
<if test="office != null and office.id != null and office.id != ''"> <if test="office != null and office.id != null and office.id != ''">
AND (o.id = #{office.id} OR o.parent_ids LIKE AND (o.id = #{office.id} OR o.parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if> <if test="dbName == 'oracle'">'%,'||#{office.id}||',%')</if>
<if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if> <if test="dbName == 'mssql'">'%,'+#{office.id}+',%')</if>
<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if> <if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%'))</if>
</if> </if>
<!-- 如果不是超级管理员，则不显示超级管理员用户 --> <!-- 如果不是超级管理员，则不显示超级管理员用户 -->
<if test="!currentUser.admin"> <if test="!currentUser.admin">
...@@ -174,15 +174,15 @@ ...@@ -174,15 +174,15 @@
</if> </if>
<if test="loginName != null and loginName != ''"> <if test="loginName != null and loginName != ''">
AND a.login_name like AND a.login_name like
<if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if> <if test="dbName == 'oracle'">'%'||#{loginName}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if> <if test="dbName == 'mssql'">'%'+#{loginName}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{loginName}, '%')</if>
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
AND a.name like AND a.name like
<if test="dbName == 'oracle'">'%'||#{name}||'%'</if> <if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{name}+'%'</if> <if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if> <if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if>
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${sqlMap.dsf} ${sqlMap.dsf}
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<!-- 查询全部用户 --> <!-- 查询全部用户 -->
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM ct_bbtc_sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
password, password,
no, no,
name, name,
area,
email, email,
phone, phone,
mobile, mobile,
...@@ -254,6 +255,7 @@ ...@@ -254,6 +255,7 @@
#{password}, #{password},
#{no}, #{no},
#{name}, #{name},
#{area},
#{email}, #{email},
#{phone}, #{phone},
#{mobile}, #{mobile},
...@@ -288,6 +290,7 @@ ...@@ -288,6 +290,7 @@
password = #{password}, password = #{password},
no = #{no}, no = #{no},
name = #{name}, name = #{name},
area=#{area},
email = #{email}, email = #{email},
phone = #{phone}, phone = #{phone},
mobile = #{mobile}, mobile = #{mobile},
...@@ -311,7 +314,7 @@ ...@@ -311,7 +314,7 @@
<foreach collection="roleList" item="role" separator=" union all "> <foreach collection="roleList" item="role" separator=" union all ">
SELECT #{id}, #{role.id} SELECT #{id}, #{role.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
FROM dual FROM dual
</if> </if>
</foreach> </foreach>
</insert> </insert>
...@@ -350,5 +353,5 @@ ...@@ -350,5 +353,5 @@
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment