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

# Conflicts:
#	src/main/java/com/ejweb/modules/report/web/ReportController.java

src/main/java/com/ejweb/modules/report/dao/ReportDao.java

@@ -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);
 }

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -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;

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -303,18 +303,12 @@ public class ReportController extends BaseController {
         }
         //更新举报状态
         reportEntity.setReportStatus("1");
-//        if (reportEntity.getDealResult().equals("1") && reportEntity.getDealResult().equals("2")){
-//            reportEntity.setReportStatus("2");
-//        }
-//        if (reportEntity.getDealResult().equals("2") && reportEntity.getDealResult().equals("2")){
-//            reportEntity.setReportStatus("2");
-//        }
-//        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 (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
+            reportEntity.setReportStatus("2");
+        }
+        if (reportEntity.getDealResult().equals("3")){
+            reportEntity.setReportStatus("1");
+        }
         if ("ifDone".equals(ifDone)) {
             reportEntity.setReportStatus("2");
         }
@@ -336,7 +330,7 @@ public class ReportController extends BaseController {
             reportService.addRecord(reportEntity,"1");
         }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);
             }
         }else if (StringUtils.isNotBlank(transferUser) && StringUtils.isNotBlank(reportEntity.getDealResult())){
@@ -550,4 +544,5 @@ public class ReportController extends BaseController {
         out.write(result);
         out.close();
     }
+
 }

src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java

@@ -22,6 +22,7 @@ public class WorkbenchBean {
     private int unProcess = 0;
     private int processing = 0;
     private int processed = 0;
+    private int closed = 0;
 
     //举报结果
     private int repResultTotal = 0;
@@ -346,4 +347,12 @@ public class WorkbenchBean {
     public void setiAndD(int 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> {
                 }else if("0".equals(String.valueOf(status.get("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 {
             res.put("unProcess",bean.getUnProcess());
             res.put("processing",bean.getProcessing());
             res.put("processed",bean.getProcessed());
+            res.put("closed",bean.getClosed());
             //举报结果
             res.put("invalid",bean.getInvalid());
             res.put("complainNum",bean.getComplainNum());

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -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

src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp

@@ -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>

src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp

@@ -43,7 +43,7 @@
                         },
                         subtitle: {//副标题
                             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,
                             verticalAlign: 'top' ,
                             x: -5 ,
@@ -73,6 +73,7 @@
                                 ['未处理', result.unProcess],
                                 ['跟踪中', result.processing],
                                 ['已处理', result.processed],
+                                ['已关闭', result.closed],
 //                                {
 //                                    name: 'Chrome',
 //                                    y: 12.8,