修改列表页 查询条件

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

@@ -30,7 +30,7 @@
         r.create_date AS "createDate",
         r.update_by AS "updateBy",
         r.update_date AS "updateDate",
-        r.OA_NAME AS "oaname"
+        r.oa_name AS "oaname"
 
     </sql>
 
@@ -64,10 +64,15 @@
                 <if test="dbName == 'mysql'">CONCAT('%', #{supplementTitle}, '%')</if>
             </if>
             <if test="reportProject != null and reportProject != ''">
-                AND r.report_project LIKE
+                AND (r.report_project LIKE
                 <if test="dbName == 'oracle'">'%'||#{reportProject}||'%'</if>
                 <if test="dbName == 'mssql'">'%'+#{reportProject}+'%'</if>
                 <if test="dbName == 'mysql'">CONCAT('%', #{reportProject}, '%')</if>
+                OR r.supplement_department LIKE
+                <if test="dbName == 'oracle'">'%'||#{reportProject}||'%'</if>
+                <if test="dbName == 'mssql'">'%'+#{reportProject}+'%'</if>
+                <if test="dbName == 'mysql'">CONCAT('%', #{reportProject}, '%')</if>
+                )
             </if>
             <if test="reportTimeFrom != null and reportTimeFrom != ''">
                 AND r.report_time &gt;= #{reportTimeFrom}
@@ -153,6 +158,7 @@
         report_person_email,
         report_source,
         report_status,
+        supplement_informant,
         exchange_before_user,
         exchange_after_user,
         exchange_type,
@@ -160,7 +166,7 @@
         create_date,
         update_by,
         update_date,
-        OA_NAME
+        oa_name
         ) VALUES (
         #{id},
         #{reportProject},
@@ -172,6 +178,7 @@
         #{reportPersonEmail},
         #{reportSource},
         #{reportStatus},
+        #{supplementInformant}，
         #{exchangeBeforeUser},
         #{exchangeAfterUser},
         #{exchangeType},
@@ -216,8 +223,7 @@
     exchange_type = #{exchangeType},
     deal_result = #{dealResult},
     update_by = #{updateBy.id},
-    update_date = #{updateDate},
-    OA_NAME = #{oaname}
+    update_date = #{updateDate}
     WHERE id = #{id}
     </update>
 
@@ -507,8 +513,7 @@
         r.create_by AS "createBy",
         r.create_date AS "createDate",
         r.update_by AS "updateBy",
-        r.update_date AS "updateDate",
-        r.OA_NAME AS "oaname"
+        r.update_date AS "updateDate"
         FROM ct_bbtc_report r
         WHERE r.report_status = #{processStatus}
         <if test="isAdmin != null">

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

@@ -107,7 +107,7 @@
         <th>ID</th>
         <th>标题</th>
         <th>业务类型</th>
-        <th>被举报项目</th>
+        <th>被举报项目/被举报部门</th>
         <th>举报人</th>
         <th>举报人电话</th>
         <th>区域</th>
@@ -124,7 +124,7 @@
     <c:if test="${page.list.size()>0}">
         <c:forEach items="${page.list}" var="report" varStatus="vs">
             <tr>
-                <td><input type="checkbox" value="v                  ${report.id}"></td>
+                <td><input type="checkbox" value="${report.id}"></td>
                 <td>${vs.count}</td>
                 <td>${report.supplementTitle}</td>
                 <td>
@@ -150,7 +150,7 @@
                     <%--<c:if test="${report.supplementType eq '6'}">物业</c:if>--%>
                     <%--<c:if test="${report.supplementType eq '7'}">投诉</c:if>--%>
                 </td>
-                <td>${report.reportProject}</td>
+                <td>${report.reportProject}/${report.supplementDepartment}</td>
                 <td>${report.reportPersonName}</td>
                 <td>${report.reportPersonTel}</td>
                 <td>
@@ -177,9 +177,9 @@
                 </td>
                 <td>
                     <c:if test="${report.dealResult eq null}">--</c:if>
-                    <c:if test="${report.dealResult eq '1'}">投诉</c:if>
+                    <c:if test="${report.dealResult eq '1'}">移交客诉</c:if>
                     <c:if test="${report.dealResult eq '2'}">举报无效</c:if>
-                    <c:if test="${report.dealResult eq '3'}">举报属实</c:if>
+                    <c:if test="${report.dealResult eq '3'}">举报受理</c:if>
                 </td>
                 <td><c:if test="${report.dealResult eq null}">--</c:if>
                     <c:if test="${report.dealResult ne null}">${report.dealPersonName}</c:if>

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

@@ -77,14 +77,15 @@
         <input id="flag" name="flag" type="hidden" value="${flag}"/>
         <ul class="ul-form">
             <li><label>标题：</label><form:input  onchange="resetPageNo();"  path="supplementTitle" htmlEscape="false" maxlength="50" class="input-small"/></li>
-            <li><label>被举报项目：</label><form:input  onchange="resetPageNo();"  path="reportProject" htmlEscape="false" maxlength="50" class="input-small"/></li>
+            <li><label>被举报项目/部门：</label><form:input  onchange="resetPageNo();"  path="reportProject" htmlEscape="false" maxlength="50" class="input-small"
+                                                        style="position:relative;top:-12.5px"/></li>
             <li><label>举报时间：</label><input id="reportTimeFrom" name="reportTimeFrom"  onchange="resetPageNo();"  readonly="readonly" type="text"
                                            maxlength="200" class="input-mini Wdate required" value="${report.reportTimeFrom}"
                                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,maxDate:'#F{$dp.$D(\'reportTimeTo\')}'});" /></li>
             <li><label>至：</label><input id="reportTimeTo" name="reportTimeTo"  onchange="resetPageNo();"  readonly="readonly" type="text"
                                         maxlength="200" class="input-mini Wdate required" value="${report.reportTimeTo}"
                                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,minDate:'#F{$dp.$D(\'reportTimeFrom\')}'});" /></li>
-            <li class="clearfix"></li>
+
             <li><label>举报人：</label><form:input  onchange="resetPageNo();"  path="reportPersonName" htmlEscape="false" maxlength="50" class="input-small"/></li>
             <li><label>举报人电话：</label><form:input  onchange="resetPageNo();"  path="reportPersonTel" htmlEscape="false" maxlength="50" class="input-small"/></li>
             <li><label>业务类型：</label><form:select  onchange="resetPageNo();"  path="supplementType" class="input-small">
@@ -120,7 +121,7 @@
                 <th>ID</th>
                 <th>标题</th>
                 <th>业务类型</th>
-                <th>被举报项目</th>
+                <th>被举报项目/被举报部门</th>
                 <th>OA账号</th>
                 <th>举报人</th>
                 <th>举报人电话</th>
@@ -140,7 +141,7 @@
                     <td>${vs.count}</td>
                     <td>${report.supplementTitle}</td>
                     <td>${report.supplementType}</td>
-                    <td>${report.reportProject}</td>
+                    <td>${report.reportProject}/${report.supplementDepartment}</td>
                     <td>${report.oaname}</td>
                     <td>${report.reportPersonName}</td>
                     <td>${report.reportPersonTel}</td>