问题1：移交后的信息在哪记录转交过，及转交人；？修改为加一列移交给在举报管理列表页。移交和转交用同一个字段，会同时显示。点击查看进去也可以看到移交人

问题2：发邮件的功能目前无法使用？修改邮件插件
问题3、一样的这几条数据，举报途径没有圈？数据问题，已修复
问题4、转交之后，写的处理人，但是列表没有显示处理人，点进去处理人还是原处理人？已修复

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

@@ -160,4 +160,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
      * @return
      */
     public int updateExchangeUser(ReportEntity reportEntity);
+
+    /**
+     * 查询移交后人员
+     * @return
+     */
+    public String findExchangeUser(String id);
 }

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

@@ -42,7 +42,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String supplementAttachment;    //补充提交文件
     private String dealAttachment;    //处理成果文件
     private String oaname;//当前用户名
-
+    private String transferName;    //移交给
 
 
     public String getOaname() {
@@ -308,4 +308,12 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setTypes(String[] types) {
         this.types = types;
     }
+
+    public String getTransferName() {
+        return transferName;
+    }
+
+    public void setTransferName(String transferName) {
+        this.transferName = transferName;
+    }
 }

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -468,4 +468,9 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
         }
         return isAdmin;
     }
+
+    public String findExchangeUser(String id){
+        return reportDao.findExchangeUser(id);
+    }
+
 }

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

@@ -117,9 +117,11 @@ public class ReportController extends BaseController {
             }
         }
         page.setList(reportlist);
+        boolean isAdmin = reportService.checkRole(user);
         model.addAttribute("page", page);
         model.addAttribute("report", reportEntity);
         model.addAttribute("flag", flag);
+        model.addAttribute("isAdmin", isAdmin);
         return "modules/report/reportList";
     }
 
@@ -238,10 +240,12 @@ public class ReportController extends BaseController {
             }
             supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
         }
+        if (StringUtils.isBlank(reportEntity.getDealPersonName())){
+            reportEntity.setDealPersonName(user.getName());
+        }
         model.addAttribute("page", page);
         model.addAttribute("user", userEntity);
         model.addAttribute("userName", user.getName());
-        model.addAttribute("currentUser", user.getName());
         model.addAttribute("report", reportEntity);
         model.addAttribute("companyList", companyList);
         model.addAttribute("officeList", officeList);
@@ -278,6 +282,10 @@ public class ReportController extends BaseController {
         if ("ifDone".equals(ifDone)) {
             reportEntity.setReportStatus("2");
         }
+        if (StringUtils.isBlank(reportEntity.getExchangeAfterUser())){
+            String exchangeAfterUser = reportService.findExchangeUser(reportEntity.getId());
+            reportEntity.setExchangeAfterUser(exchangeAfterUser);
+        }
         reportService.saveTrack(reportEntity);
         String exchangeAfterUser = request.getParameter("exchangeAfterUser");
         if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){

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

@@ -41,14 +41,18 @@
     <select id="get" parameterType="ReportEntity" resultType="ReportEntity">
         SELECT
         <include refid="reportColumns"/>
+        ,su.name AS "transferName"
         FROM ct_bbtc_report r
+        LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
         WHERE r.id = #{id}
     </select>
 
     <select id="findList" parameterType="ReportEntity" resultType="ReportEntity">
         SELECT
         <include refid="reportColumns"/>
+        ,su.name AS "transferName"
         FROM ct_bbtc_report r
+        LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
         <where>
             1 = 1
             <if test="exchangeAfterUser != null and exchangeAfterUser != ''">
@@ -549,9 +553,10 @@
         r.supplement_informant AS "supplementInformant",
         r.deal_person_name AS "dealPersonName",
         r.deal_result AS "dealResult",
-        (CASE WHEN r.exchange_type='2' THEN (SELECT name FROM ct_bbtc_sys_user WHERE id=r.exchange_after_user) ELSE '--' END) AS "exchangeAfterUser",
-        r.exchange_type AS "exchangeType"
+        r.exchange_type AS "exchangeType",
+        su.name AS "transferName"
         FROM ct_bbtc_report r
+        LEFT JOIN ct_bbtc_sys_user su ON r.exchange_after_user = su.id
         <where>
             1 = 1
             <if test="exchangeAfterUser != null and exchangeAfterUser != ''">
@@ -573,6 +578,8 @@
         update_date = #{updateDate}
         WHERE id = #{id}
     </update>
-
+    <select id="findExchangeUser" resultType="String">
+        SELECT c.EXCHANGE_AFTER_USER FROM CT_BBTC_REPORT c WHERE c.ID = #{id}
+    </select>
 
 </mapper>
\ No newline at end of file

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

@@ -181,10 +181,10 @@
                     <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
                     <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
                 </td>
-                <td><c:if test="${report.dealResult eq null}">--</c:if>
-                    <c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if>
+                <td><c:if test="${report.dealPersonName eq null}">--</c:if>
+                    <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
                 </td>
-                <td>${report.exchangeAfterUser}</td>
+                <td>${report.transferName}</td>
                 <td>
                     <a href="${ctx}/report/view?id=${report.id}">查看</a>
                 </td>

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

@@ -152,7 +152,7 @@
         <label class="control-label">举报途径:</label>
         <div class="controls">
             <form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
-                          htmlEscape="false" disabled="true"/>
+                          htmlEscape="false" disabled="true" style="margin-right: -23px\9;"/>
         </div>
     </div>
     <c:if test="${report.reportStatus ne '0'}">

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

@@ -132,6 +132,9 @@
                 <th>状态</th>
                 <th>处理结论</th>
                 <th>处理人</th>
+                <c:if test="${isAdmin eq true}">
+                    <th>移交给</th>
+                </c:if>
                 <th>操作</th>
             </tr>
         </thead>
@@ -185,9 +188,15 @@
                         <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
                         <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
                     </td>
-                    <td><c:if test="${report.dealResult eq null}">--</c:if>
-                        <c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if>
+                    <td><c:if test="${report.dealPersonName eq null}">--</c:if>
+                        <c:if test="${report.dealPersonName ne null}">${report.dealPersonName}</c:if>
                     </td>
+                    <c:if test="${isAdmin eq true}">
+                        <td>
+                            <c:if test="${report.transferName eq null}">--</c:if>
+                            <c:if test="${report.transferName ne null}">${report.transferName}</c:if>
+                        </td>
+                    </c:if>
                     <td>
                         <a href="${ctx}/report/view?id=${report.id}">查看</a>
                         <c:if test="${report.reportStatus ne '2'}"><a href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>