路线管理列表查询

mhd_wms/src/main/resources/mapper/lineManagement/LineManagementMapper.xml

@@ -33,28 +33,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.organization_name,
             a.top_organization_id,
             a.warehouse_id,
-            COALESCE(w.warehouse_name, a.warehouse_name) as warehouse_name,
+            a.warehouse_name,
             a.route_code,
             a.route_name,
             a.customer_json,
-            a.create_time,
             a.create_by,
             a.create_by_name,
-            a.update_time,
+            a.create_time,
             a.update_by,
             a.update_by_name,
-            a.del_flag,
+            a.update_time,
-            a.service_items_code,
+            a.del_flag
-            a.second_subject_code,
+        from line_management a
-            a.second_subject_name,
-            a.service_items_name,
-            a.bill_days,
-            a.bill_time,
-            a.salesman_name,
-            a.settlement_currency,
-            a.salesman_id
-        from lease a
-        LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1
     </sql>
 
     <sql id="selectLineManagementPo1">
@@ -97,19 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateByName != null and updateByName != ''">
                 and a.update_by_name like concat('%', #{updateByName}, '%')
             </if>
-            <!-- 时间范围查询 -->
-            <if test="createTimeStart != null and createTimeStart != ''">
-                and a.create_time >= #{createTimeStart}
-            </if>
-            <if test="createTimeEnd != null and createTimeEnd != ''">
-                and a.create_time &lt;= #{createTimeEnd}
-            </if>
-            <if test="updateTimeStart != null and updateTimeStart != ''">
-                and a.update_time >= #{updateTimeStart}
-            </if>
-            <if test="updateTimeEnd != null and updateTimeEnd != ''">
-                and a.update_time &lt;= #{updateTimeEnd}
-            </if>
             <!-- 删除标记 -->
             <choose>
                 <when test="delFlag != null">