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/enums/IsIntoManagementEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Getter
+@AllArgsConstructor
+public enum IsIntoManagementEnum {
+    FALSE("未纳管", false),
+    TRUE("已纳管", true);
+
+    private final String name;
+    private final boolean code;
+
+    private static final Map<Boolean, String> CODE_NAME_MAP = Arrays.stream(values())
+            .collect(Collectors.toMap(IsIntoManagementEnum::isCode, IsIntoManagementEnum::getName));
+
+    /**
+     * 根据 code获取枚举对应的 name
+     */
+    public static String getName(boolean code) {
+        return CODE_NAME_MAP.get(code);
+    }
+}
+

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImplService.java

@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipRequestParamsDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.IsIntoManagementEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
@@ -400,6 +401,7 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
                 record.setCompanyType(companyType2);
                 // 来源类型：前端控制编辑按钮显示隐藏
                 record.setRegType(CommonServiceImpl.genRegTypeByDataSource(record.getDataSource()));
+                record.setIsIntoManagementName(IsIntoManagementEnum.getName(record.getIsIntoManagement()));
                 // 设置是否发生过后续业务：：前端控制编辑按钮显示隐藏
                 record.setHappenAfterBiz(projectContraptionUseMap.getOrDefault(record.getSequenceNbr() + "", false));
             });

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -147,6 +147,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL = "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL";
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
+    public static final String IS_INTO_MANAGEMENT_NAME = "IS_INTO_MANAGEMENT_NAME";
     public static final String IS_DO_BUSINESS = "IS_DO_BUSINESS";
     // 设备来源 jg：新设备录入  jg_his：历史数据录入
     public static final String DATA_SOURCE = "DATA_SOURCE";
@@ -3014,6 +3015,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     dto2.put(DATA_SOURCE, s);
                     dto2.put(DATA_SOURCE_NAME, EquipSourceEnum.getDataSourceName(s));
                 }
+                dto2.computeIfPresent(IS_INTO_MANAGEMENT, (k, v) -> {
+                    dto2.put(IS_INTO_MANAGEMENT_NAME, IsIntoManagementEnum.getName(Boolean.parseBoolean(v.toString())));
+                    return v;
+                });
                 dto2.put("record", dto2.get(SEQUENCE_NBR));
                 list.add(dto2);
             }

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

@@ -332,6 +332,9 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     @TableField(exist = false)
     private String regType;
 
-
-
+    /**
+     *  是否是否纳管中文返回
+     */
+    @TableField(exist = false)
+    private String isIntoManagementName;
 }