tiaji

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

@@ -855,10 +855,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             String con) {
+                                             String con,
+                                             String startTime,
+                                             String endTime) {
         if (con != null && !con.equals("undefined") && !con.equals("null")) {
             mapValue.put("con", "%" + con + "%");
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getHaveCarTruckNoList(mapValue);

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

@@ -718,7 +718,8 @@
     a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
-    a_s_order.INSERT_TIME "insertTime"
+    a_s_order.INSERT_TIME "insertTime",
+
     from AMS_SALE_ORDER a_s_order
     left join (select sale_material.SALE_ORDER_ID saleOrderId,
     sum(tt.sum1) saleSum1,
@@ -3140,7 +3141,7 @@
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC
   </select>
 
-  <select id="getHaveCarTruckNoList" parameterType="java.util.Map" resultType="java.util.Map">
+  <select id="getHaveCarTruckNoList" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     SELECT * FROM (
     SELECT DISTINCT *
     FROM (
@@ -3166,7 +3167,8 @@
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel",
     RCP.CAPACITY_NUMBER AS "capacityNumber",
     OO.DRIVER_TEL AS "drivelTel",
-    ASM.MATERIAL_NUMBER AS "materialNumber"
+    ASM.MATERIAL_NUMBER AS "materialNumber",
+    OO.ORDER_ID AS "orderId"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3199,6 +3201,14 @@
     AND OO.ORDER_ID IS NOT NULL
     AND OO.ORDER_STATUS IN (4,5)
     AND ASO.DELETED != 2
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASOM.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASOM.INSERT_TIME
+    </if>
+    ORDER BY ASOM.SALE_ORDER_MATERIAL_ID DESC
     ) "HAVECAR"
     <where>
       <if test="con != null" >
@@ -3292,7 +3302,7 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+
 
   </select>