Browse Source

剩下的除了智能仓房的查询

lvzhikai 4 years ago
parent
commit
3a005d4884

+ 2 - 2
src/main/java/com/chinaitop/depot/supervise/controller/GrainConditionController.java

@@ -45,11 +45,11 @@ public class GrainConditionController {
45 45
             @ApiImplicitParam(name = "TestStartDate", value = "检测日期开始", paramType = "query"),
46 46
             @ApiImplicitParam(name = "TestEndDate", value = "检测日期结束", paramType = "query")
47 47
     })
48
-    public PageInfo<Map<String,Object>> getDataList(Integer pageNum, Integer pageSize,String houseNo, String orgId, String TestStartDate, String TestEndDate){
48
+    public PageInfo<Map<String,Object>> getDataList(Integer pageNum, Integer pageSize,String houseNo, String orgId, String createTimeStart, String createTimeEnd){
49 49
         PageHelper.startPage(pageNum, pageSize);
50 50
 
51 51
 
52
-        List<Map<String,Object>> retList = grainConditionService.getDataList(houseNo, orgId,TestStartDate, TestEndDate);
52
+        List<Map<String,Object>> retList = grainConditionService.getDataList(houseNo, orgId,createTimeStart, createTimeEnd);
53 53
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(retList);
54 54
         return pageInfo;
55 55
     }

+ 1 - 1
src/main/java/com/chinaitop/depot/supervise/service/GrainConditionService.java

@@ -7,7 +7,7 @@ public interface GrainConditionService {
7 7
      * 获取最新仓房温度列表
8 8
      * @return
9 9
      */
10
-    List<Map<String,Object>> getDataList(String houseNo, String orgId, String TestStartDate, String TestEndDate);
10
+    List<Map<String,Object>> getDataList(String houseNo, String orgId, String createTimeStart, String createTimeEnd);
11 11
 
12 12
     List<Map<String,Object>> getThreeCondition(Map<String,Object> example);
13 13
 

+ 4 - 4
src/main/java/com/chinaitop/depot/supervise/service/impl/GrainConditionServiceImpl.java

@@ -25,14 +25,14 @@ public class GrainConditionServiceImpl implements GrainConditionService {
25 25
      * @return
26 26
      */
27 27
     @Override
28
-    public List<Map<String, Object>> getDataList(String houseNo, String orgId, String TestStartDate, String TestEndDate) {
28
+    public List<Map<String, Object>> getDataList(String houseNo, String orgId, String createTimeStart, String createTimeEnd) {
29 29
         Map<String,String> map = new HashMap<String, String>();
30 30
         if(!StringUtils.isEmpty(houseNo)){
31 31
             map.put("houseNo",houseNo);
32 32
         }
33
-        if(ParameterUtil.isnotnull(TestStartDate) && ParameterUtil.isnotnull(TestEndDate)){
34
-            map.put("TestStartDate",TestStartDate);
35
-            map.put("TestEndDate",TestEndDate);
33
+        if(ParameterUtil.isnotnull(createTimeStart) && ParameterUtil.isnotnull(createTimeEnd)){
34
+            map.put("TestStartDate",createTimeStart);
35
+            map.put("TestEndDate",createTimeEnd);
36 36
         }
37 37
         map.put("orgId",orgId);
38 38
         return testDatasMapper.getDataList(map);