fix(jg):撬装式承压设备的新增/查询接口修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -116,7 +116,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
     public ResponseModel<List<DictionarieValueModel>> equCategoryListByCompanyType() {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, null));
     }
 
 
@@ -125,7 +125,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别")
     public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList,
                                                                       @RequestParam(value = "businessScenarios") String businessScenarios) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList,businessScenarios));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -132,4 +132,7 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String WHETHER_VEHICLE_CYLINDER;
+
+    @Field(type = FieldType.Text)
+    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
 }

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

@@ -177,5 +177,13 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
 	@TableField("\"WHETHER_VEHICLE_CYLINDER\"")
     private String whetherVehicleCylinder;
 
+    /**
+     * 是否撬装式压力容器（压力容器用于区分普通压力容器（安装改造维修单位新增的）和撬装式压力容器（使用单位新增的））
+     *  1：是
+     *  0：不是
+     */
+    @TableField("\"WHETHER_SKID_MOUNTED_PRESSURE_VESSEL\"")
+    private String whetherSkidMountedPressureVessel;
+
 
 }

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

@@ -102,6 +102,7 @@
                EQU_TYPE,
                DATA_SOURCE,
                WHETHER_VEHICLE_CYLINDER,
+               WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,
                DATE_FORMAT(PRODUCE_DATE, '%Y-%m-%d %H:%i:%s') as PRODUCE_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}