添加OA账号列

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

@@ -44,6 +44,17 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String reportAttachment;    //举报提交文件
     private String supplementAttachment;    //补充提交文件
     private String dealAttachment;    //处理成果文件
+    private String oaname;//当前用户名
+
+
+
+    public String getOaname() {
+        return oaname;
+    }
+
+    public void setOaname(String oaname) {
+        this.oaname = oaname;
+    }
 
     @ExcelField(title="被举报项目", align=2, sort=24)
     public String getReportProject() {

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

@@ -71,6 +71,10 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
     public void saveReport(ReportEntity reportEntity) {
         //保存举报信息
         reportEntity.preInsert();
+        //保存填写人信息
+        User user = UserUtils.getUser();
+        String oaname = user.getName();
+        reportEntity.setOaname(oaname);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String reportTime = sdf.format(reportEntity.getCreateDate());
         reportEntity.setReportTime(reportTime);

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

@@ -29,7 +29,8 @@
         r.create_by AS "createBy",
         r.create_date AS "createDate",
         r.update_by AS "updateBy",
-        r.update_date AS "updateDate"
+        r.update_date AS "updateDate",
+        r.OA_NAME AS "oaname"
 
     </sql>
 
@@ -155,7 +156,8 @@
         create_by,
         create_date,
         update_by,
-        update_date
+        update_date,
+        OA_NAME
         ) VALUES (
         #{id},
         #{reportProject},
@@ -173,7 +175,8 @@
         #{createBy.id},
         #{createDate},
         #{updateBy.id},
-        #{updateDate}
+        #{updateDate},
+        #{oaname}
         )
     </insert>
 
@@ -210,7 +213,8 @@
     exchange_type = #{exchangeType},
     deal_result = #{dealResult},
     update_by = #{updateBy.id},
-    update_date = #{updateDate}
+    update_date = #{updateDate},
+    OA_NAME = #{oaname}
     WHERE id = #{id}
     </update>
 
@@ -489,7 +493,8 @@
         r.create_by AS "createBy",
         r.create_date AS "createDate",
         r.update_by AS "updateBy",
-        r.update_date AS "updateDate"
+        r.update_date AS "updateDate",
+        r.OA_NAME AS "oaname"
         FROM ct_bbtc_report r
         WHERE r.report_status = #{processStatus}
         <if test="isAdmin != null">

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

@@ -121,6 +121,7 @@
                 <th>标题</th>
                 <th>业务类型</th>
                 <th>被举报项目</th>
+                <th>OA账号</th>
                 <th>举报人</th>
                 <th>举报人电话</th>
                 <th>区域</th>
@@ -148,6 +149,7 @@
                         <c:if test="${report.supplementType eq '7'}">投诉</c:if>
                     </td>
                     <td>${report.reportProject}</td>
+                    <td>${report.oaname}</td>
                     <td>${report.reportPersonName}</td>
                     <td>${report.reportPersonTel}</td>
                     <td>