Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java

@@ -2,10 +2,13 @@ package com.ejweb.modules.front.report.api;
 
 import com.ejweb.conf.ErrorCode;
 import com.ejweb.core.api.ResponseBean;
+import com.ejweb.core.utils.StringUtils;
 import com.ejweb.modules.front.report.bean.FrontReportBean;
 import com.ejweb.modules.front.report.entity.Captcha;
 import com.ejweb.modules.front.report.service.FrontReportService;
 import com.ejweb.modules.front.report.utils.CaptchaUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,6 +24,7 @@ public class FrontReportController {
     @Autowired
     private FrontReportService frontReportService;
 
+
     /**
      * 获取验证码的code值
      * @return
@@ -48,7 +52,13 @@ public class FrontReportController {
                 responseBean.setMessage("captcha is incorrect");
                 return responseBean;
             }
-            return frontReportService.addReport(bean);
+            if (StringUtils.isNotBlank(bean.getReportSource())){
+                responseBean.setStatus(ErrorCode.STATUS_CODE_4002);
+                responseBean.setMessage("report_source为空");
+                return responseBean;
+            }else {
+                return frontReportService.addReport(bean);
+            }
         }
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         responseBean.setMessage("接收参数失败");

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

@@ -41,6 +41,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;
+    }
 //    private String ifDone;            //是否完成
 //
 //

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/ejweb.properties

@@ -95,7 +95,7 @@ file.image.thumb.width=640
 file.image.thumb.height=640
 # The Prefix Url
 #file.prefix.url=http://123.56.146.81:8808/
-file.prefix.url=http://192.168.3.232:8081/
+file.prefix.url=http://192.168.7.210:8081/
 
 # The Prefix separator
 file.upload.path.separator = /

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/reportForm.jsp

@@ -165,8 +165,8 @@
     <div class="control-group">
         <label class="control-label">内容:</label>
             <div class="controls">
-                <form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="500"
-                               class="input-xxlarge" placeholder="最多输入500个字符"/>
+                <form:textarea id="reportContent" htmlEscape="true" path="reportContent" rows="4" maxlength="3000"
+                               class="input-xxlarge" placeholder="最多输入3000个字符"/>
                 <span class="help-inline"><font color="red">*</font> </span>
             </div>
         </div>

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>

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

@@ -9,6 +9,9 @@
         $(document).ready(function () {
             $("#inputForm").validate({
                 submitHandler: function (form) {
+                    messages: {
+                        supplementContent: {maxlength: "最多输入{0}个字符"}
+                    }
                     if ($("#supplementType").val() == " "){
                         top.$.jBox.tip('请选择业务类型', 'warning');
                     }else if ($("#supplementArea").val() == " "){
@@ -259,7 +262,8 @@
         <div class="control-group">
             <label class="control-label">内容:</label>
             <div class="controls">
-                <form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4" maxlength="500" class="input-xxlarge"/>
+                <form:textarea id="supplementContent" htmlEscape="true" path="supplementContent" rows="4"
+                               maxlength="500" class="input-xxlarge" placeholder="最多输入3000个字符"/>
             </div>
         </div>
         <div class="control-group">
@@ -353,7 +357,7 @@
                     $("input:radio").attr("checked",false);
                     $("#chooseItem").empty();
                     $(this).attr("checked",true);
-                    $("#chooseItem").html("已选择 " + $("input:radio:checked").parent().next().next().next().html()+"<span onclick='remove();'><font size='5'> ×</font></span>");
+                    $("#chooseItem").html("已选择 " +  b.parent().next().next().next().html()+"<span onclick='remove();'><font size='5'> ×</font></span>");
                 });
 
             });