Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -87,6 +87,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         List<Map<String, Object>> allReport =  statisticalReportService.getAllSaleReportNum(mapValue);
         PageHelper.startPage(pageNum, pageSize);

src/main/java/com/steerinfo/dil/service/impl/TmstruckSmsRusultServiceImpl.java

@@ -67,7 +67,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String tmpTmp = MD5Util.formatTimeTmp();
         String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
         String mobile1 = mobile;
-        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车.欲知详情，请前往https://wl.dasteel.cn:32322/views/#/地址，浏览车辆实时运输状态。退订";
+        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。欲知详情，请前往https://wl.dasteel.cn:32322，浏览车辆实时运输状态。退订";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();

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

@@ -59,12 +59,12 @@ import java.util.SimpleTimeZone;
          * @throws Exception
          */
         public static void main(String[] args) throws Exception {
-            String str = "123456";
             String ApiId = "EUCP-EMY-SMS1-10QNI";
             String sererct = "EE20B0B28B75E567";
             System.out.println(formatTimeTmp());
             System.out.println(sign(ApiId,sererct));
         }
 
+
     }
 

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

@@ -1065,11 +1065,11 @@
     on ASM1.MATERIAL_ID=RM.MATERIAL_ID
     where OO.ORDER_TYPE in (1) and TRR.INSERT_TIME IS NOT NULL
     <if test="oneDate != null">
-      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TAR.INSERT_TIME
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =  TRR.INSERT_TIME
     </if>
     <if test="startDate != null">
-      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TAR.INSERT_TIME
-      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TAR.INSERT_TIME
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TRR.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TRR.INSERT_TIME
     </if>
     <if test="con!=null">
       and (instr(RC.CAPACITY_NUMBER,#{con})>0 or instr(RM.MATERIAL_NAME,#{con})>0