Commit 94a33638 by Java-刘铮

新增关闭按钮管理员可以修改以处理状态的处理结论并把状态改为已关闭 刘铮

parent ddc2f410
......@@ -16,6 +16,7 @@ import java.util.List;
/**
* 举报DAO接口
*
* @author lixy
* @version 2017-09-06
*/
......@@ -23,6 +24,7 @@ import java.util.List;
public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询用户角色
*
* @param user
* @return
*/
......@@ -30,6 +32,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询附件
*
* @param reportAttachmentEntity
* @return
*/
......@@ -37,6 +40,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 新增举报
*
* @param reportEntity
* @return
*/
......@@ -44,6 +48,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 新增附件
*
* @param reportAttachmentEntity
* @return
*/
......@@ -51,6 +56,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 举报信息补充
*
* @param reportEntity
* @return
*/
......@@ -58,6 +64,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 更新举报状态
*
* @param reportEntity
* @return
*/
......@@ -65,6 +72,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询用户
*
* @param user
* @return
*/
......@@ -72,24 +80,28 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询公司列表
*
* @return
*/
public List<Office> getCompanyList();
/**
* 查询部门列表
*
* @return
*/
public List<Office> getOfficeList(Office office);
/**
* 查询职位列表
*
* @return
*/
public List<Position> getPositionList();
/**
* 根据reportId查询消息表中是否已存在该条记录
*
* @param reportEntity
* @return
*/
......@@ -97,6 +109,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 新增消息
*
* @param reportNotice
* @return
*/
......@@ -104,6 +117,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 更新消息表
*
* @param reportNotice
* @return
*/
......@@ -111,6 +125,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 新增消息
*
* @param reportExchangeHistory
* @return
*/
......@@ -118,6 +133,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询管理员ID
*
* @return
*/
public List<String> findAdmin(Office office);
......@@ -149,6 +165,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 工作转交 查询举报记录
*
* @param reportEntity
* @return
*/
......@@ -156,6 +173,7 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 工作转交 更改转交人
*
* @param reportEntity
* @return
*/
......@@ -163,13 +181,23 @@ public interface ReportDao extends CrudDao<ReportEntity> {
/**
* 查询移交后人员
*
* @return
*/
public String findExchangeUser(String id);
/**
* 记录发邮件
*
* @return
*/
public int updateIsSendEmail(String reportId);
/**
* 更新处理结论
*
* @param reportEntity
* @return
*/
public int updateConclusion(ReportEntity reportEntity);
}
......@@ -48,6 +48,19 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String transferName; //移交给
private String dealPerson;
private String lStatus; //关闭修改状态
public String getlStatus() {
return lStatus;
}
public void setlStatus(String lStatus) {
this.lStatus = lStatus;
}
public String getOaname() {
return oaname;
......
......@@ -594,4 +594,11 @@
is_send_email = '1'
WHERE id = #{reportId}
</update>
<update id="updateConclusion">
UPDATE ct_bbtc_report SET
report_status= '3',
deal_result = #{lStatus}
WHERE id = #{id}
</update>
</mapper>
\ No newline at end of file
......@@ -163,6 +163,7 @@
<c:if test="${report.reportStatus eq '0'}">未处理</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 '3'}">已关闭</c:if>
</td>
<td>
<c:if test="${report.dealResult eq null}">--</c:if>
......
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