消息中心修改+添加功能：转为word文档

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

@@ -243,6 +243,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         ReportNotice reportNotice = reportDao.findReportNotice(reportEntity);
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
+        String dateStr = sdf1.format(date);
         if (reportNotice != null){
             //消息表中已存在该条举报的移交信息,更新该记录
             if (StringUtils.isNotBlank(user.getId())){
@@ -256,8 +258,8 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
             reportNotice.setStatus("0");
             if (flag.equals("answer")){
                 reportNotice.setSendToId(reportDao.findAdmin(new Office()));
-                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
-                String dateStr = sdf1.format(date);
+                reportNotice.setTitle("“"+reportEntity.getSupplementTitle()+"”已由"+user.getName()+"于"+dateStr+"处理完成");
+            }if (flag.equals("meanWhile")){
                 reportNotice.setTitle("“"+reportEntity.getSupplementTitle()+"”已由"+user.getName()+"于"+dateStr+"处理完成");
             }
             reportDao.updateReportNotice(reportNotice);
@@ -267,8 +269,19 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
             reportNotice = new ReportNotice();
             reportNotice.setId(IdGen.uuid());
             reportNotice.setReportId(reportEntity.getId());
+            reportNotice.setCreateDate(date);
+            reportNotice.setUpdateDate(date);
+            String sendTime = sdf.format(date);
+            reportNotice.setSendTime(sendTime);
+            reportNotice.setSendFromId(user.getId());
+            reportNotice.setStatus("0");
+            reportNotice.setCreateBy(user.getId());
+            reportNotice.setUpdateBy(user.getId());
             if (flag.equals("answer")){
                 return 0;
+            }else if (flag.equals("meanWhile")){
+                reportNotice.setSendToId(reportEntity.getExchangeAfterUser());
+                reportNotice.setTitle("“"+reportEntity.getSupplementTitle()+"”已由"+user.getName()+"于"+dateStr+"处理完成");
             }else{
                 //管理员转交或移交，消息标题为“请处理xxx”
                 String title = reportEntity.getSupplementTitle();
@@ -278,14 +291,6 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 reportNotice.setTitle("请处理-“"+title+"”");
                 reportNotice.setSendToId(reportEntity.getExchangeAfterUser());
             }
-            reportNotice.setCreateDate(date);
-            reportNotice.setUpdateDate(date);
-            String sendTime = sdf.format(date);
-            reportNotice.setSendTime(sendTime);
-            reportNotice.setSendFromId(user.getId());
-            reportNotice.setStatus("0");
-            reportNotice.setCreateBy(user.getId());
-            reportNotice.setUpdateBy(user.getId());
             reportDao.addReportNotice(reportNotice);
             return 1;
         }

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

@@ -209,12 +209,16 @@ public class ReportController extends BaseController {
         }
         reportService.saveTrack(reportEntity);
         String exchangeAfterUser = request.getParameter("exchangeAfterUser");
-        if (StringUtils.isNotBlank(exchangeAfterUser)){
+        if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isBlank(reportEntity.getDealResult())){
+            //管理员移交给他人处理
             reportService.addNotice(reportEntity,"transfer");
             reportService.addRecord(reportEntity,"1");
-        }
-        if (StringUtils.isNotBlank(reportEntity.getDealResult())){
+        }else if (StringUtils.isNotBlank(reportEntity.getDealResult()) && StringUtils.isBlank(exchangeAfterUser)){
+            //自行处理
             reportService.addNotice(reportEntity,"answer");
+        }else if (StringUtils.isNotBlank(exchangeAfterUser) && StringUtils.isNotBlank(reportEntity.getDealResult())){
+            //管理员进行处理，同时移交给他人
+            reportService.addNotice(reportEntity,"meanWhile");
         }
         addMessage(redirectAttributes, "补充举报"+ reportEntity.getSupplementTitle() + "'成功");
         return "redirect:" + adminPath + "/report/list/?repage&flag=0";

src/main/resources/mappings/modules/workbench/ReportNoticeMapper.xml

@@ -156,7 +156,7 @@
     <include refid="Base_Column_List"/>
     FROM ct_bbtc_report_notice
     WHERE send_to_id = #{sendToId,jdbcType=VARCHAR}
-    order by create_date desc
+    order by send_time desc
   </select>
 
   <select id="getMessageCount" resultType="Integer">

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

@@ -155,6 +155,14 @@
          </div>
      </div>
     <div class="control-group">
+        <label class="control-label">被举报人:</label>
+        <div class="controls">
+            <form:input path="supplementInformant" htmlEscape="false" maxlength="50" class="input-xlarge required"
+                        placeholder="最多输入50个字符"/>
+            <span class="help-inline"><font color="red">*</font> </span>
+        </div>
+    </div>
+    <div class="control-group">
         <label class="control-label">内容:</label>
             <div class="controls">
                 <form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="500"