fix(JG)：车用气瓶-后端修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationDto.java

@@ -225,4 +225,7 @@ public class JgVehicleInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "产权单位名称")
     private String estateUnitName;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgVehicleInformation.java

@@ -405,4 +405,7 @@ public class JgVehicleInformation extends BaseEntity {
 
     @TableField(value = "estate_unit_name")
     private String estateUnitName;
+
+    @TableField(value = "phone")
+    private String phone;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java

@@ -26,5 +26,8 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
     @MapKey("id")
     List<Map<String, Object>> selectEquipList(@Param("id")Long id);
 
+    @MapKey("records")
+    List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records")List<String> records);
+
     Long countVesselCylinderIsUsedNumber(@Param("vehicleId") Long vehicleId, @Param("records") List<String> records);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

 package com.yeejoin.amos.boot.module.jg.api.vo;
 
 import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -227,4 +228,23 @@ public class JgVehicleInformationVo implements Serializable {
     @ApiModelProperty(value = "设备品种")
     private String equDefineCode;
 
+    @ApiModelProperty(value = "安全员ID")
+    private String safetyManagerId;
+
+    @ApiModelProperty(value = "安全员名称")
+    private String safetyManagerName;
+
+    @ApiModelProperty(value = "产权单位Code")
+    private String estateUnitCreditCode;
+
+    @ApiModelProperty(value = "产权单位名称")
+    private String estateUnitName;
+
+    @ApiModelProperty(value = "其他附件")
+    private List<?> otherAccessories;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    private CompanyBo companyInfo;
 }

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

@@ -203,5 +203,47 @@
             #{record}
         </foreach>
     </select>
+    <sql id="page-list-vessel">
+        SELECT
+            ui."USE_UNIT_NAME" useUnitName,
+            ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
+            (SELECT "PRODUCE_UNIT_NAME" from idx_biz_jg_factory_info where "RECORD" = tjvie.equ_id) produceUnitName,
+            to_char((SELECT "PRODUCE_DATE" from idx_biz_jg_factory_info where "RECORD" = tjvie.equ_id), 'YYYY-MM') produceDate,
+            ri."RECORD" record,
+            jui."USE_INNER_CODE" useInnerCode,
+            ri."EQU_CODE" equCode,
+            ri."EQU_LIST" equList,
+            (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+            ri."EQU_CATEGORY" equCategory,
+            (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
+            ri."EQU_DEFINE" equDefine,
+            (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
+            ri."PRODUCT_NAME" productName,
+            ri."BRAND_NAME" brandName,
+            ri."EQU_TYPE" equType,
+            ri."EQU_CODE_TYPE" equCodeType,
+            ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+            pv."CHARGING_MEDIUM" chargingMedium,
+            pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
+            pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
+            to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = tjvie.equ_id ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = tjvie.equ_id ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+        FROM
+            tzs_jg_vehicle_information ui
+            left join tzs_jg_vehicle_information_eq tjvie  on tjvie.vehicle_id = ui.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" =  tjvie.equ_id
+            LEFT JOIN idx_biz_jg_use_info jui on tjvie.equ_id = jui.RECORD
+            LEFT JOIN idx_biz_jg_tech_params_vessel pv ON pv."RECORD" = tjvie.equ_id
+    </sql>
+
+    <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
+        <include refid="page-list-vessel"/>
+        WHERE ri."EQU_CATEGORY" = '2300' and jui."DATA_SOURCE" = 'jg' and ri.whether_vehicle_cylinder = 1
+        and jui.record in
+        <foreach collection="records" item="record" open="(" close=")" separator=",">
+            #{record}
+        </foreach>
+        ORDER BY ui.REC_DATE DESC
+    </select>
 
 </mapper>