|
@@ -3,6 +3,7 @@ package com.gct.aoid.service.impl;
|
3
|
3
|
import com.alibaba.fastjson.JSONObject;
|
4
|
4
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
5
|
5
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
6
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
6
|
7
|
import com.gct.aoid.entity.AoidDailyYield;
|
7
|
8
|
import com.gct.aoid.feignclient.BaseDataClient;
|
8
|
9
|
import com.gct.aoid.mapper.AoidDailyYieldMapper;
|
|
@@ -70,8 +71,28 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
|
70
|
71
|
for (Map<String, Object> map : maps) {
|
71
|
72
|
String date = map.get("prod_date").toString().substring(0, 10);
|
72
|
73
|
String time = map.get("prod_date").toString().substring(11, 19);
|
73
|
|
- map.put("prod_date",date+" "+time);
|
|
74
|
+// map.put("prod_date",date+" "+time);
|
|
75
|
+ map.put("prod_date",date);
|
74
|
76
|
}
|
75
|
77
|
return maps;
|
76
|
78
|
}
|
|
79
|
+ public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
|
|
80
|
+ startDate = startDate+" 00:00:00";
|
|
81
|
+ LocalDateTime localDateTime = LocalDateTime.parse(startDate, df);
|
|
82
|
+ LocalDateTime localDateTime1 = localDateTime.plusDays(1);
|
|
83
|
+ String end = localDateTime1.format(df);
|
|
84
|
+ QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<>();
|
|
85
|
+ LambdaQueryWrapper<AoidDailyYield> queryWrapper = wrapper.lambda().eq(AoidDailyYield::getWellId, wellId).
|
|
86
|
+ ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate,df))).
|
|
87
|
+ le(AoidDailyYield::getProdDate,Timestamp.valueOf(LocalDateTime.parse(end,df))).orderByAsc(AoidDailyYield::getProdDate);
|
|
88
|
+ Page<Map<String,Object>> paramPage = new Page<>(pageNum,pageSize);
|
|
89
|
+ Page<Map<String, Object>> mapPage = aoidDailyYieldMapper.selectMapsPage(paramPage, queryWrapper);
|
|
90
|
+ for (Map<String, Object> map : mapPage.getRecords()) {
|
|
91
|
+ String date = map.get("prod_date").toString().substring(0, 10);
|
|
92
|
+ String time = map.get("prod_date").toString().substring(11, 19);
|
|
93
|
+// map.put("prod_date",date+" "+time);
|
|
94
|
+ map.put("prod_date",date);
|
|
95
|
+ }
|
|
96
|
+ return mapPage;
|
|
97
|
+ }
|
77
|
98
|
}
|