tijiao

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -286,8 +286,8 @@ public class DataChange {
     public static void queryDataByDateTimeYestDay(String startTime, String endTime, Map<String, Object> map,SimpleDateFormat sdf){
         SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
         if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
-            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
-            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime))));
+            map.put("startDate", sdfDate.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdfDate.format(new Date(Long.parseLong(endTime))));
         }
         //如果开始时间和结束时间有且只有一个为空 则只查那天的数据
         else if((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))){
@@ -301,7 +301,7 @@ public class DataChange {
             //如果两者时间都为空，则查询当天和昨天数据
             //String yesDate = sdfDate.format(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24));
             String nowDate = sdfDate.format(new Date());
-            map.put("oneDate", nowDate + " 08:00:00");
+            map.put("oneDate", nowDate);
 
         }
     }

src/main/java/com/steerinfo/dil/util/Test.java

@@ -1,10 +0,0 @@
-package com.steerinfo.dil.util;
-
-public class Test {
-    public static void main(String[] args) {
-        Integer a = null;
-        if(false || a== null){
-
-        }
-    }
-}

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -416,7 +416,6 @@
         WHERE OO.ORDER_TYPE = #{orderTypee}
         AND ASO.SHIPPER_ID = #{shipperId}
         AND OO.ORDER_STATUS IN (2,5)
-        AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         <if test="orderTypee!=null and orderTypee==1">
             AND ASM.MATERIAL_NUMBER IS NOT NULL
         </if>
@@ -1935,11 +1934,12 @@
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                     OO.CAN_WORK     "canwork",
                     OO.ORDER_STATUS              "carStatus",
+                    DECODE(OO.PRINTNUMBER,0,'已打印','未打印') "isPrintDelivery",
                     DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
                                                  4,'财务已审批',
                                                  0,'销售订单未上报') "saleOrderStatus",
-                    DECODE(OO.ORDER_STATUS ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
+                    DECODE(OO.ORDER_STATUS ,2,'作业已完成',4,'物流公司已派单',5,'司机已接单',0,'未派发',7,'已关闭',8,'已关闭')
                                                                   "orderStatus"
                     FROM AMS_SALE_ORDER ASO
                     LEFT JOIN RMS_CONSIGNEE RC
@@ -1989,14 +1989,14 @@
                           AND ASO.DELETED = 0
                           and ASM.SALE_MATERIAL_ID IS NOT NULL
                     <if test="oneDate != null">
-                        and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.SALE_DATE_OF_RECEIPT
+                        and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                     </if>
                     <if test="carrierSsoId != null">
                         and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
                     </if>
                     <if test="startDate != null">
-                        and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASOM.SALE_DATE_OF_RECEIPT
-                        and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASOM.SALE_DATE_OF_RECEIPT
+                        and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
+                        and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                     </if>
                     <if test="remark != null" >
                         and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}