1.增加技术参数默认值null时为0

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/listener/InspectionOrgRefreshListener.java

@@ -140,6 +140,8 @@ public class InspectionOrgRefreshListener extends EmqxListener {
         JyjcInspectionApplicationNoAcceptLog jyjcInspectionApplicationNoAcceptLog = getLastNoAcceptLog(equipInfoModel);
         inspectionEquipInfo.setRequestType(this.buildRequestType(equipInfoModel, jyjcInspectionApplicationNoAcceptLog));
         inspectionEquipInfo.setLastNoAcceptInspectionCode(this.buildLastNoAcceptInspectionCode(jyjcInspectionApplicationNoAcceptLog));
+        // 是否球罐 0 1 转 boolean
+        inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
         touchRuleWithApi(inspectionEquipInfo);
     }
 
@@ -180,7 +182,7 @@ public class InspectionOrgRefreshListener extends EmqxListener {
     private RegistrationInfo fetchRegistrationInfo(String record) {
         return registrationInfoMapper.selectOne(
                 Wrappers.<RegistrationInfo>lambdaQuery().select(RegistrationInfo::getRecord, RegistrationInfo::getEquCategory,
-                        RegistrationInfo::getEquDefine, RegistrationInfo::getEquList)
+                        RegistrationInfo::getEquDefine, RegistrationInfo::getEquList, RegistrationInfo::getWhetherSphericalTank)
                         .eq(RegistrationInfo::getRecord, record));
     }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/RegistrationInfo.java

@@ -185,4 +185,13 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
     @TableField("\"LAST_USE_CERT_FILE_PATH\"")
     private String lastUseCertFilePath;
 
+
+    /**
+     * 是否球罐
+     *  1：是
+     *  0：不是
+     */
+    @TableField("\"WHETHER_SPHERICAL_TANK\"")
+    private String whetherSphericalTank;
+
 }

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

@@ -5,8 +5,8 @@
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamBoiler">
         select
             "DEVICE_LEVEL",
-            "RATED_EVAPORATION_CAPACITY_THERMAL_POWER",
-            "RATED_WORKING_PRESSURE",
+            COALESCE("RATED_EVAPORATION_CAPACITY_THERMAL_POWER", 0)  as RATED_EVAPORATION_CAPACITY_THERMAL_POWER,
+            COALESCE("RATED_WORKING_PRESSURE", 0)  as RATED_WORKING_PRESSURE,
             "RATED_OPERATING_TEMPERATURE",
             "DESIGN_THERMAL_EFFICIENCY",
             "FEEDWATER_TEMPERATURE",

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

@@ -3,17 +3,17 @@
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamRidesMapper">
     <select id="queryTechParamInUse" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRides">
             SELECT
-                "TRACK_HEIGHT",
-                "RUNNING_SPEED",
-                "NUMBER_OF_PASSENGERS",
-                "SLIDE_LENGTH",
+                COALESCE("TRACK_HEIGHT", 0) as TRACK_HEIGHT,
+                COALESCE("RUNNING_SPEED", 0) as RUNNING_SPEED,
+                COALESCE("NUMBER_OF_PASSENGERS", 0) as NUMBER_OF_PASSENGERS,
+                COALESCE("SLIDE_LENGTH", 0) as SLIDE_LENGTH,
                 "NUMBER_OF_VEHICLES",
-                "OPERATING_HEIGHT",
-                "ROTARY_DIAMETER",
+                COALESCE("OPERATING_HEIGHT", 0) as OPERATING_HEIGHT,
+                COALESCE("ROTARY_DIAMETER", 0) as ROTARY_DIAMETER,
                 "UNILATERAL_SWING_ANGLE",
-                "DIP",
+                COALESCE("DIP", 0) as DIP,
                 "SLEWING_SPEED",
-                "EQUIPMENT_HEIGHT"
+                COALESCE("EQUIPMENT_HEIGHT", 0) as EQUIPMENT_HEIGHT
             FROM
                 idx_biz_jg_tech_params_rides
                  WHERE RECORD = #{record}

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

@@ -33,7 +33,7 @@
             heat_treatment_method,
             qp_heat_treatment_temperature,
             installation_position,
-            container_volume,
+            COALESCE(container_volume, 0) as container_volume,
             pressure_vessel_diameter,
             height,
             material_cylinder_shell,