yumeng 9 months ago
parent
commit
a2b501631e

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -1892,6 +1892,10 @@ public class SupplyChainController extends BaseController {
             Integer start = DateUtils.getIntegerTime(orderStartDate);
             requestMap.put("start", start);
         }
+        if (!Check.isNull(orderEndDate)) {
+            Integer end = DateUtils.getIntegerTime(orderEndDate);
+            requestMap.put("end", end);
+        }
         if (!Check.isNull(collectSampleId)) {
             requestMap.put("collectSampleId", collectSampleId);
         }

+ 1 - 2
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -2678,8 +2678,7 @@
             and collect_sample_id = #{collectSampleId}
         </if>
         <if test="start != null and start != ''">
-            and create_time &gt;= str_to_date(concat(date_format(#{start}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d
-            %H:%i:%s')
+            and create_time &gt;= str_to_date(concat(date_format(#{start}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d %H:%i:%s')
         </if>
         <if test="end != null and end != ''">
             and create_time &lt;= str_to_date(concat(date_format(#{end}, '%Y-%m-%d'), '23:59:59'), '%Y-%m-%d %H:%i:%s')