|
|
@@ -1,9 +1,6 @@
|
|
1
|
1
|
package com.chinaitop.depot.storage.controller;
|
|
2
|
2
|
|
|
3
|
|
-import java.util.ArrayList;
|
|
4
|
|
-import java.util.HashMap;
|
|
5
|
|
-import java.util.List;
|
|
6
|
|
-import java.util.Map;
|
|
|
3
|
+import java.util.*;
|
|
7
|
4
|
|
|
8
|
5
|
import javax.annotation.Resource;
|
|
9
|
6
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -189,7 +186,9 @@ public class StorageThreetempCheckController {
|
|
189
|
186
|
if (StringUtils.isNotBlank(houseId))
|
|
190
|
187
|
map.put("storehouse", houseId);
|
|
191
|
188
|
if(StringUtils.isNotBlank(checkDate)) {
|
|
192
|
|
- map.put("startDate", ParameterUtil.string2datetime(checkDate + " 00:00:00"));
|
|
|
189
|
+ // 开始时间前推三天
|
|
|
190
|
+ Date startDate = new Date((ParameterUtil.string2datetime(checkDate + " 00:00:00").getTime()/1000-3600*24*3)*1000);
|
|
|
191
|
+ map.put("startDate", startDate);
|
|
193
|
192
|
map.put("endDate", ParameterUtil.string2datetime(checkDate + " 23:59:59"));
|
|
194
|
193
|
}
|
|
195
|
194
|
List<Map<String, Object>> list = threetempCheckService.getThreeTempData(map);
|