气瓶充装信息存es修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml

@@ -172,9 +172,9 @@
         FROM
             tz_cylinder_filling_record r
                 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
-                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
         WHERE
             r.is_not_es IS NULL

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -216,7 +216,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
 //        );
 
         SearchRequest request = new SearchRequest();
-        request.indices("cylinder_info");
+        request.indices("cylinder_filling");
 
         //通用匹配规则，条件构建
         boolean flag = true;