1128修改方案

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

@@ -66,7 +66,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
 
     private String[] types;//新业务类型
 
-    @ExcelField(title="被举报项目", align=2, sort=24)
+    @ExcelField(title="被举报项目/被举报部门", align=2, sort=24)
     public String getReportProject() {
         return reportProject;
     }

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

@@ -96,6 +96,10 @@ public class ReportToWordController {
         reportProject.getCell(0).setText("被举报项目：");
         reportProject.addNewTableCell().setText(reportEntity.getReportProject()==null?"":reportEntity.getReportProject());
 
+        XWPFTableRow supplementTitle = basicInfoTable.createRow();
+        supplementTitle.getCell(0).setText("标题：");
+        supplementTitle.addNewTableCell().setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
+
         //表格第二行
         XWPFTableRow supplementInformant = basicInfoTable.createRow();
         supplementInformant.getCell(0).setText("被举报人：");
@@ -229,17 +233,7 @@ public class ReportToWordController {
             supplementInfoTableWidth.setW(BigInteger.valueOf(9072));
 
             //表格第一行
-            XWPFTableRow supplementTitle = supplementInfoTable.getRow(0);
-            supplementTitle.getCell(0).setText("标题：");
-            supplementTitle.addNewTableCell().setText(reportEntity.getSupplementTitle() == null ? "" : reportEntity.getSupplementTitle());
-            //表格第二行
-            XWPFTableRow supplementCompany = supplementInfoTable.createRow();
-            supplementCompany.getCell(0).setText("被举报公司：");
-            supplementCompany.getCell(1).setText(reportEntity.getSupplementCompany() == null ? "" : reportEntity.getSupplementCompany());
-            //表格第三行
-            XWPFTableRow supplementDepartment = supplementInfoTable.createRow();
-            supplementDepartment.getCell(0).setText("被举报部门：");
-            supplementDepartment.getCell(1).setText(reportEntity.getSupplementDepartment() == null ? "" : reportEntity.getSupplementDepartment());
+
             //表格第四行
             XWPFTableRow supplementType = supplementInfoTable.createRow();
             supplementType.getCell(0).setText("业务类型：");

src/main/resources/mappings/modules/front/report/FrontReportDao.xml

@@ -42,6 +42,7 @@
             report_source,
             report_status,
             supplement_informant,
+            supplement_title,
             exchange_before_user,
             exchange_after_user,
             create_by,
@@ -61,6 +62,7 @@
             #{reportSource},
             #{reportStatus},
             #{supplementInformant},
+            #{supplementTitle},
             #{exchangeBeforeUser},
             #{exchangeAfterUser},
             #{createBy},

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

@@ -210,10 +210,7 @@
 
     <update id="addTrack">
     UPDATE ct_bbtc_report SET
-    supplement_company = #{supplementCompany},
-    supplement_department = #{supplementDepartment},
     supplement_informant = #{supplementInformant},
-    supplement_title = #{supplementTitle},
     supplement_type = #{supplementType},
     supplement_area = #{supplementArea},
     supplement_project = #{supplementProject},

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

@@ -92,6 +92,12 @@
         </div>
     </div>
     <div class="control-group">
+        <label class="control-label">标题:</label>
+        <div class="controls">
+            <form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
         <label class="control-label">被举报人:</label>
         <div class="controls">
             <form:input path="supplementInformant" htmlEscape="false" maxlength="200" class="input-xlarge required"/>

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

@@ -141,7 +141,7 @@
                     <td>${vs.count}</td>
                     <td>${report.supplementTitle}</td>
                     <td>${report.supplementType}</td>
-                    <td>${report.reportProject}/${report.supplementDepartment}</td>
+                    <td>${report.reportProject}</td>
                     <td>${report.oaname}</td>
                     <td>${report.reportPersonName}</td>
                     <td>${report.reportPersonTel}</td>

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

@@ -310,9 +310,9 @@
             <th>ID</th>
             <th>标题</th>
             <th>业务类型</th>
-            <th>被举报公司</th>
-            <th>举报人</th>
-            <th>举报人电话</th>
+            <th>被举报项目/部门</th>
+            <th>所在城市</th>
+            <th>被举报人</th>
             <th>操作</th>
         </tr>
         </thead>
@@ -331,9 +331,9 @@
                         <c:if test="${report.supplementType eq '6'}">物业</c:if>
                         <c:if test="${report.supplementType eq '7'}">投诉</c:if>
                     </td>
-                    <td>${report.supplementCompany}</td>
-                    <td>${report.reportPersonName}</td>
-                    <td>${report.reportPersonTel}</td>
+                    <td>${report.reportProject}</td>
+                    <td>${report.reportCity}</td>
+                    <td>${report.supplementInformant}</td>
                     <td>
                         <a href="${ctx}/report/view?id=${report.id}">查看</a>
                     </td>