燃气气瓶追溯详情接口修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCylinderFillingDto.java

@@ -87,11 +87,36 @@ public class TzCylinderFillingDto {
      */
     private String checkResultsAfter;
 
-
+    /**
+     * 充装前检查项内容及结果
+     */
     private List<TzCylinderCheckDto> tzCylinderCheckDtoList;
 
+    /**
+     * 充装后检查项内容及结果
+     */
     private List<TzCylinderCheckDto> tzCylinderAfterCheckDtoList;
 
+    /**
+     * 充装前检查人员
+     */
+    private String inspectorBeforeUser;
+
+    /**
+     * 充装前检查时间
+     */
+    private String inspectionBeforeDate;
+
+    /**
+     * 充装后检查时间
+     */
+    private String inspectionAfterDate;
+
+    /**
+     * 充装后检查人员
+     */
+    private String inspectorAfter;
+
 
 
 }

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

@@ -144,6 +144,10 @@
 
     <select id="getTzCylinderFillingDto" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderFillingDto">
         SELECT
+            CF.inspector_user AS inspector_before_user,
+            CF.inspection_date AS inspection_before_date,
+            FC.inspection_date AS inspection_after_date,
+            FC.inspector AS inspector_after,
             FR.sequence_nbr,
             FC.filling_check_id,
             FR.filling_quantity,