针对修改方案的修改

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

@@ -120,7 +120,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
         //保存举报补充信息
         reportEntity.preUpdate();
         User user = UserUtils.getUser();
-        reportEntity.setDealPersonName(user.getName());
         if (StringUtils.isNotBlank(reportEntity.getExchangeAfterUser())){
             reportEntity.setExchangeType("1");
         }else {

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

@@ -98,7 +98,7 @@ public class ReportToWordController {
 
         XWPFTableRow supplementTitle = basicInfoTable.createRow();
         supplementTitle.getCell(0).setText("标题：");
-        supplementTitle.addNewTableCell().setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
+        supplementTitle.getCell(1).setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
 
         //表格第二行
         XWPFTableRow supplementInformant = basicInfoTable.createRow();
@@ -271,9 +271,10 @@ public class ReportToWordController {
                     typeStr =typeStr+value+",";
                     supplement_type=typeStr.substring(0,typeStr.length()-1);
                 }
+            }else{
+                supplement_type = "";
             }
-
-            supplementType.getCell(1).setText(supplement_type);
+            supplementType.addNewTableCell().setText(supplement_type);
             //表格第五行
             XWPFTableRow supplementArea = supplementInfoTable.createRow();
             supplementArea.getCell(0).setText("被举报区域：");
@@ -301,11 +302,11 @@ public class ReportToWordController {
             } else {
                 supplement_area = "";
             }
-            supplementArea.getCell(1).setText(supplement_area);
+            supplementArea.addNewTableCell().setText(supplement_area);
             //表格第六行
             XWPFTableRow supplementContent = supplementInfoTable.createRow();
             supplementContent.getCell(0).setText("内容：");
-            supplementContent.getCell(1).setText(reportEntity.getSupplementContent() == null ? "" : reportEntity.getSupplementContent());
+            supplementContent.addNewTableCell().setText(reportEntity.getSupplementContent() == null ? "" : reportEntity.getSupplementContent());
             //表格 附件行
             //获取附件列表
             ReportAttachmentEntity supplementAttachmentBean = new ReportAttachmentEntity();

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

@@ -483,6 +483,7 @@
     </select>
 
     <select id="getRepList" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="ReportEntity">
+        SELECT * FROM(
         SELECT
         r.id AS "id",
         r.report_project AS "reportProject",
@@ -524,8 +525,10 @@
             <if test="dbName == 'oracle'"> AND create_date &lt;= to_date( #{endDate}|| ' 23:59:59', 'yyyy-MM-dd hh24:mi:ss')</if>
             <if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
         </if>
-        <if test="dbName == 'oracle'"> AND rownum &lt;= 10</if>
         order by r.create_date desc
+        )
+        WHERE
+        <if test="dbName == 'oracle'">rownum &lt;= 10</if>
         <if test="dbName == 'mysql'"> limit 0,10</if>
     </select>
 

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

@@ -213,12 +213,12 @@
         </div>
     </div>
     </c:if>
-    <c:if test="${report.reportStatus eq '2'}">
+    <c:if test="${report.dealResult ne null}">
         <span class="title">处理结果</span>
         <div class="control-group">
             <label class="control-label">处理人:</label>
             <div class="controls">
-                <form:input path="dealPersonName" value="${currentUser}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+                <form:input path="dealPersonName" value="${report.dealPersonName}" disabled="true" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
             </div>
         </div>
         <div class="control-group">