修改

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -628,7 +628,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         }
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> report = statisticalReportService.getCapacityByDefend(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
 

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1308,8 +1308,8 @@
         <if test="endDate != null" >
             and to_date(#{endDate},'yyyy-mm-dd hh24:mi:ss') >= tlfr.RESULT_OUT_GATE_TIME
         </if>
-        <if test="con != null">
-            and (instr(rc.CAPACITY_NUMBER, #{con}) > 0 or instr(rg1.GATEPOST_NAME, #{con}) > 0 or instr(rg2.GATEPOST_NAME, #{con}) > 0 )
+        <if test="con != null and con!=''.toString()">
+            and (instr(rc.CAPACITY_NUMBER, #{con}) > 0 or instr(rg2.GATEPOST_NAME, #{con}) > 0 )
         </if>
         </where>
 		order by ter.RESULT_ENTRY_GATE_TIME desc
@@ -1328,6 +1328,7 @@
                 </foreach>
             </if>
         </where>
+        <include refid="orderBy"></include>
     </select>
     <select id="getInwardReportForAssemble" resultType="java.util.Map" parameterType="java.util.Map">
         select *