merge

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

@@ -2,41 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.CommonMapper">
     <sql id="orderBy">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
+        <if test="orderByField!=null and orderByField !=''">
+            order by "${orderByField}"
+            <if test="orderByType == 'desc'">
+                desc
             </if>
-        </if>
-    </sql>
-    <sql id="timeFilter">
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ${timeFilterProp}
-        </if>
-        <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ${timeFilterProp}
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= ${timeFilterProp}
-        </if>
-    </sql>
-    <sql id="companyFilter">
-        <if test="${companyType} != null">
-            <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
-                AND ${prop}
-                in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    <if test="item.companyType == ${companyType}">
-                        #{item.companyId}
-                    </if>
-                </foreach>
-            </if>
-        </if>
-        <if test="${companyType} == null">
-            <if test="!roleCodes.contains('admin') and dilCompanyList != null and dilCompanyList.size > 0">
-                AND ${prop}
-                in
-                <foreach collection="dilCompanyList" item="item" open="(" close=")" separator=",">
-                    #{item.companyId}
-                </foreach>
+            <if test="orderByType == 'asc'">
+                asc
             </if>
         </if>
     </sql>

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

@@ -806,16 +806,6 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-    <!--  根据插入时间排序  -->
-    <sql id="orderBy">
-        <if test="orderField != null and orderField != ''">
-            order by "${orderField}"
-            <if test="orderType != null and orderType != ''">
-                ${orderType}
-            </if>
-        </if>
-    </sql>
-
     <!--  查询运输订单 -->
     <select id="getAllTruckOrder" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         select