Selaa lähdekoodia

修改出库查询

Tiroble 3 vuotta sitten
vanhempi
commit
3add5c187f

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/WmspOutboundResultController.java

@@ -90,6 +90,12 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                                                String endTime)
     {
 
+        if (mapval.containsKey("starTime")&&mapval.get("starTime")!=null){
+            startTime=mapval.get("starTime").toString();
+        }
+        if (mapval.containsKey("endTime")&&mapval.get("endTime")!=null){
+            endTime=mapval.get("endTime").toString();
+        }
         DataChange.queryDataByDateTime(startTime,endTime,mapval,simpleDateFormat);
         List<Map<String, Object>> libaryOutBoundList  = wmspOutboundResultService.selectResultNumber(mapval);
         PageHelper.startPage(pageNum, pageSize);

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/WmspOutboundResultMapper.xml

@@ -735,7 +735,7 @@
         </foreach>
       </if>
       <if test="startTime != null and endTime !=null">
-        and ckd.insert_time between to_date(#{startTime}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endTime}, 'yyyy-mm-dd hh24:mi:ss')
+        and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
       </if>
       <if test="oneDate != null">
         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time