Skip to content

S
sunac_report
Commit 8cd26a83 by caohongzhe
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	src/main/java/com/ejweb/modules/report/web/ReportController.java
parents a46b32fb 846f70c6
Showing with 73 additions and 14 deletions
src/main/java/com/ejweb/modules/report/dao/ReportDao.java
...@@ -16,6 +16,7 @@ import java.util.List; ...@@ -16,6 +16,7 @@ import java.util.List;
/** /**
* 举报DAO接口 * 举报DAO接口
*
* @author lixy * @author lixy
* @version 2017-09-06 * @version 2017-09-06
*/ */
...@@ -23,6 +24,7 @@ import java.util.List; ...@@ -23,6 +24,7 @@ import java.util.List;
public interface ReportDao extends CrudDao<ReportEntity> { public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询用户角色 * 查询用户角色
*
* @param user * @param user
* @return * @return
*/ */
...@@ -30,6 +32,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -30,6 +32,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询附件 * 查询附件
*
* @param reportAttachmentEntity * @param reportAttachmentEntity
* @return * @return
*/ */
...@@ -37,6 +40,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -37,6 +40,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 新增举报 * 新增举报
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -44,6 +48,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -44,6 +48,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 新增附件 * 新增附件
*
* @param reportAttachmentEntity * @param reportAttachmentEntity
* @return * @return
*/ */
...@@ -51,6 +56,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -51,6 +56,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 举报信息补充 * 举报信息补充
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -58,6 +64,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -58,6 +64,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 更新举报状态 * 更新举报状态
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -65,6 +72,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -65,6 +72,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询用户 * 查询用户
*
* @param user * @param user
* @return * @return
*/ */
...@@ -72,24 +80,28 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -72,24 +80,28 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询公司列表 * 查询公司列表
*
* @return * @return
*/ */
public List<Office> getCompanyList(); public List<Office> getCompanyList();
/** /**
* 查询部门列表 * 查询部门列表
*
* @return * @return
*/ */
public List<Office> getOfficeList(Office office); public List<Office> getOfficeList(Office office);
/** /**
* 查询职位列表 * 查询职位列表
*
* @return * @return
*/ */
public List<Position> getPositionList(); public List<Position> getPositionList();
/** /**
* 根据reportId查询消息表中是否已存在该条记录 * 根据reportId查询消息表中是否已存在该条记录
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -97,6 +109,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -97,6 +109,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 新增消息 * 新增消息
*
* @param reportNotice * @param reportNotice
* @return * @return
*/ */
...@@ -104,6 +117,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -104,6 +117,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 更新消息表 * 更新消息表
*
* @param reportNotice * @param reportNotice
* @return * @return
*/ */
...@@ -111,6 +125,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -111,6 +125,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 新增消息 * 新增消息
*
* @param reportExchangeHistory * @param reportExchangeHistory
* @return * @return
*/ */
...@@ -118,6 +133,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -118,6 +133,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询管理员ID * 查询管理员ID
*
* @return * @return
*/ */
public List<String> findAdmin(Office office); public List<String> findAdmin(Office office);
...@@ -149,6 +165,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -149,6 +165,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 工作转交 查询举报记录 * 工作转交 查询举报记录
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -156,6 +173,7 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -156,6 +173,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 工作转交 更改转交人 * 工作转交 更改转交人
*
* @param reportEntity * @param reportEntity
* @return * @return
*/ */
...@@ -163,13 +181,23 @@ public interface ReportDao extends CrudDao<ReportEntity> { ...@@ -163,13 +181,23 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/** /**
* 查询移交后人员 * 查询移交后人员
*
* @return * @return
*/ */
public String findExchangeUser(String id); public String findExchangeUser(String id);
/** /**
* 记录发邮件 * 记录发邮件
*
* @return * @return
*/ */
public int updateIsSendEmail(String reportId); public int updateIsSendEmail(String reportId);
/**
* 更新处理结论
*
* @param reportEntity
* @return
*/
public int updateConclusion(ReportEntity reportEntity);
} }
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -48,6 +48,19 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -48,6 +48,19 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String transferName; //移交给 private String transferName; //移交给
private String dealPerson; private String dealPerson;
private String lStatus; //关闭修改状态
public String getlStatus() {
return lStatus;
}
public void setlStatus(String lStatus) {
this.lStatus = lStatus;
}
public String getOaname() { public String getOaname() {
return oaname; return oaname;
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -303,18 +303,12 @@ public class ReportController extends BaseController { ...@@ -303,18 +303,12 @@ public class ReportController extends BaseController {
} }
//更新举报状态 //更新举报状态
reportEntity.setReportStatus("1"); reportEntity.setReportStatus("1");
// if (reportEntity.getDealResult().equals("1") && reportEntity.getDealResult().equals("2")){ if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
// reportEntity.setReportStatus("2"); reportEntity.setReportStatus("2");
// } }
// if (reportEntity.getDealResult().equals("2") && reportEntity.getDealResult().equals("2")){ if (reportEntity.getDealResult().equals("3")){
// reportEntity.setReportStatus("2"); reportEntity.setReportStatus("1");
// } }
// if (reportEntity.getDealResult().equals("3") && reportEntity.getDealResult().equals("2")){
// reportEntity.setReportStatus("2");
// }
// if (reportEntity.getDealResult().equals("4") && reportEntity.getDealResult().equals("2")){
// reportEntity.setReportStatus("2");
// }
if ("ifDone".equals(ifDone)) { if ("ifDone".equals(ifDone)) {
reportEntity.setReportStatus("2"); reportEntity.setReportStatus("2");
} }
...@@ -336,7 +330,7 @@ public class ReportController extends BaseController { ...@@ -336,7 +330,7 @@ public class ReportController extends BaseController {
reportService.addRecord(reportEntity,"1"); reportService.addRecord(reportEntity,"1");
}else if (StringUtils.isNotBlank(reportEntity.getDealResult()) && StringUtils.isBlank(transferUser)){ }else if (StringUtils.isNotBlank(reportEntity.getDealResult()) && StringUtils.isBlank(transferUser)){
//自行处理 //自行处理
if (!StringUtils.isBlank(ifDone)) { if (!(reportEntity.getDealResult().equals("3") && StringUtils.isBlank(ifDone))) {
reportService.addNotice(reportEntity, "answer", ifDone); reportService.addNotice(reportEntity, "answer", ifDone);
} }
}else if (StringUtils.isNotBlank(transferUser) && StringUtils.isNotBlank(reportEntity.getDealResult())){ }else if (StringUtils.isNotBlank(transferUser) && StringUtils.isNotBlank(reportEntity.getDealResult())){
...@@ -550,4 +544,5 @@ public class ReportController extends BaseController { ...@@ -550,4 +544,5 @@ public class ReportController extends BaseController {
out.write(result); out.write(result);
out.close(); out.close();
} }
} }
src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java
...@@ -22,6 +22,7 @@ public class WorkbenchBean { ...@@ -22,6 +22,7 @@ public class WorkbenchBean {
private int unProcess = 0; private int unProcess = 0;
private int processing = 0; private int processing = 0;
private int processed = 0; private int processed = 0;
private int closed = 0;
//举报结果 //举报结果
private int repResultTotal = 0; private int repResultTotal = 0;
...@@ -346,4 +347,12 @@ public class WorkbenchBean { ...@@ -346,4 +347,12 @@ public class WorkbenchBean {
public void setiAndD(int iAndD) { public void setiAndD(int iAndD) {
this.iAndD = iAndD; this.iAndD = iAndD;
} }
public int getClosed() {
return closed;
}
public void setClosed(int closed) {
this.closed = closed;
}
} }
src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java
...@@ -74,6 +74,9 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> { ...@@ -74,6 +74,9 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
}else if("0".equals(String.valueOf(status.get("REPORT_STATUS")))){ }else if("0".equals(String.valueOf(status.get("REPORT_STATUS")))){
//未处理 //未处理
workbench.setUnProcess(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)")))); workbench.setUnProcess(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
}else if("3".equals(String.valueOf(status.get("REPORT_STATUS")))){
//已关闭
workbench.setClosed(Integer.valueOf(String.valueOf(status.get("COUNT(REPORT_STATUS)"))));
} }
} }
} }
......
src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java
...@@ -66,6 +66,7 @@ public class WorkbenchController extends BaseController { ...@@ -66,6 +66,7 @@ public class WorkbenchController extends BaseController {
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("invalid",bean.getInvalid()); res.put("invalid",bean.getInvalid());
res.put("complainNum",bean.getComplainNum()); res.put("complainNum",bean.getComplainNum());
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -594,4 +594,11 @@ ...@@ -594,4 +594,11 @@
is_send_email = '1' is_send_email = '1'
WHERE id = #{reportId} WHERE id = #{reportId}
</update> </update>
<update id="updateConclusion">
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result = #{lStatus}
WHERE id = #{id}
</update>
</mapper> </mapper>
\ No newline at end of file
src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
<c:if test="${report.reportStatus eq '0'}">未处理</c:if> <c:if test="${report.reportStatus eq '0'}">未处理</c:if>
<c:if test="${report.reportStatus eq '1'}">跟踪中</c:if> <c:if test="${report.reportStatus eq '1'}">跟踪中</c:if>
<c:if test="${report.reportStatus eq '2'}">已处理</c:if> <c:if test="${report.reportStatus eq '2'}">已处理</c:if>
<c:if test="${report.reportStatus eq '3'}">已关闭</c:if>
</td> </td>
<td> <td>
<c:if test="${report.dealResult eq null}">--</c:if> <c:if test="${report.dealResult eq null}">--</c:if>
......
src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
}, },
subtitle: {//副标题 subtitle: {//副标题
align: 'right', align: 'right',
text: '总数&nbsp;:&nbsp;'+result.bench.repStatusTotal+'<br/><br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/><br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/><br/>已处理&nbsp;:&nbsp;'+result.processed, text: '总数&nbsp;:&nbsp;'+result.bench.repStatusTotal+'<br/>未处理&nbsp;:&nbsp;'+result.unProcess+'<br/>跟踪中&nbsp;:&nbsp;'+result.processing+'<br/>已处理&nbsp;:&nbsp;'+result.processed+'<br/>已关闭&nbsp;:&nbsp;'+result.closed,
useHTML: true, useHTML: true,
verticalAlign: 'top' , verticalAlign: 'top' ,
x: -5 , x: -5 ,
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
['未处理', result.unProcess], ['未处理', result.unProcess],
['跟踪中', result.processing], ['跟踪中', result.processing],
['已处理', result.processed], ['已处理', result.processed],
['已关闭', result.closed],
// { // {
// name: 'Chrome', // name: 'Chrome',
// y: 12.8, // y: 12.8,
......
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