Commit 14eb31a2 authored by tianyiming's avatar tianyiming

气瓶充装信息存es修改

parent 38480cd4
...@@ -172,9 +172,9 @@ ...@@ -172,9 +172,9 @@
FROM FROM
tz_cylinder_filling_record r tz_cylinder_filling_record r
LEFT JOIN tz_cylinder_filling b ON b.filling_before_id = r.filling_before_id LEFT JOIN tz_cylinder_filling b ON b.filling_before_id = r.filling_before_id
AND date_format ( b.inspection_date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' ) AND date_format ( to_timestamp(b.inspection_date/1000)::date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' )
LEFT JOIN tz_cylinder_filling_check af ON af.filling_check_id = r.filling_check_id LEFT JOIN tz_cylinder_filling_check af ON af.filling_check_id = r.filling_check_id
AND date_format ( af.inspection_date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' ) AND date_format ( to_timestamp(af.inspection_date/1000)::date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' )
LEFT JOIN tz_cylinder_info i ON b.sequence_code = i.sequence_code LEFT JOIN tz_cylinder_info i ON b.sequence_code = i.sequence_code
WHERE WHERE
r.is_not_es IS NULL r.is_not_es IS NULL
......
...@@ -216,7 +216,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -216,7 +216,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
// ); // );
SearchRequest request = new SearchRequest(); SearchRequest request = new SearchRequest();
request.indices("cylinder_info"); request.indices("cylinder_filling");
//通用匹配规则,条件构建 //通用匹配规则,条件构建
boolean flag = true; boolean flag = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment