气瓶记录列表按主键倒叙，列表充装单位匹配气瓶企业表

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

@@ -168,7 +168,7 @@
                        b.sequence_code                   AS sequenceCode,
                        b.app_id                          AS appId,
                        concat(b.app_id, b.sequence_code) AS appIdAndSequenceCode,
-                       b.filling_unit_name               AS fillingUnitName,
+                       tcn.unit_name                     AS fillingUnitName,
                        af.inspector                      AS inspector,
                        af.inspection_date                AS inspectionDateAfter,
                        af.check_results                  AS checkResult
@@ -180,6 +180,7 @@
                 AND date_format ( b.inspection_date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' ) and b.sequence_code is not null AND b.app_id is not null
                 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' )
+                LEFT JOIN tz_cylinder_unit tcn ON tcn.app_id = r.app_id
     </select>
 
     <select id="getCylinderFillingRecordTotal" resultType="java.lang.Integer">

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

@@ -21,6 +21,7 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -376,6 +377,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         }
 
         builder.query(boolMust);
+        builder.sort("sequenceNbr",SortOrder.DESC);
         builder.from((pageNum - 1) * pageSize);
         builder.size(pageSize);
         builder.trackTotalHits(true);