|
@@ -44,14 +44,14 @@ public class LiquidService {
|
|
|
public PageModel<LiquidVO> query(String wellId,Date startTime,Date endTime,int pageNo,int pageSize){
|
|
|
String sql="""
|
|
|
select w.well_name,data_id,test_time,liquid_depth,compute_mode,sound_speed_dev,liquid_depth_dev,casing_press_dev,
|
|
|
- battery_voltage,sound_speed_factor,sound_speed_calc,sound_speed,
|
|
|
+ battery_voltage,sound_speed_factor,sound_speed_calc,sound_speed,d.create_time,
|
|
|
|
|
|
liquid_depth_static,liquid_depth_static_convert,liquid_depth_convert,static_calc_if,depth_diff,flow_press_diff
|
|
|
|
|
|
from tzl_gather_data_liquid d
|
|
|
left join tzl_well w on d.well_id=w.well_id
|
|
|
where d.well_id=? and test_time between ? and ?
|
|
|
- order by test_time desc
|
|
|
+ order by create_time desc
|
|
|
""";
|
|
|
return dao.queryForPagedData(sql, pageNo, pageSize, LiquidVO.class, wellId,startTime,endTime);
|
|
|
}
|