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/service/IIdxBizJgProjectContraptionService.java

+package com.yeejoin.amos.boot.module.jg.biz.service;
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+
+/**
+ * 管道工程装置表接口类
+ *
+ * @author system_generator
+ * @date 2024-12-11
+ */
+public interface IIdxBizJgProjectContraptionService {
+    boolean saveOrUpdateData(IdxBizJgProjectContraption projectContraption);
+}
\ No newline at end of file

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/IdxBizJgProjectContraptionServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProjectContraptionService;
+import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * 管道工程装置表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-12-11
+ */
+@Service
+public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgProjectContraptionDto,IdxBizJgProjectContraption, IdxBizJgProjectContraptionMapper> implements IIdxBizJgProjectContraptionService {
+    @Override
+    public boolean saveOrUpdateData(IdxBizJgProjectContraption projectContraption) {
+        return this.saveOrUpdate(projectContraption);
+    }
+}
\ No newline at end of file

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/JgUseRegistrationServiceImpl.java

@@ -1797,6 +1797,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
                     List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList());
                     jsonObject.remove("equipmentLists");
+                    // 查询气瓶设备详情
                     if (CylinderTypeEnum.CYLINDER.getCode().equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
                         List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
                         Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
@@ -1806,6 +1807,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         });
                         jsonObject.put("equipmentLists", result);
                     } else {
+                        // 查询管道设备详情
                         jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
                     }
                 }

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

@@ -14,10 +14,10 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="IdxBizJgProjectContraptionDto", description="管道工程装置表")
+@ApiModel(value = "IdxBizJgProjectContraptionDto", description = "管道工程装置表")
 public class IdxBizJgProjectContraptionDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "工程装置名称")
     private String projectContraption;
@@ -112,4 +112,13 @@ public class IdxBizJgProjectContraptionDto extends BaseDto {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty("是否是否纳管：true - 已纳管 false-未纳管")
+    private Boolean isIntoManagement;
+
+    @ApiModelProperty("数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）")
+    private String dataSource;
+
 }

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

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("idx_biz_jg_project_contraption")
-public class IdxBizJgProjectContraption extends TzsBaseEntity {
+public class IdxBizJgProjectContraption extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -58,10 +58,10 @@ public class IdxBizJgProjectContraption extends TzsBaseEntity {
     private String uscUnitName;
 
     /**
-     * 设备种类代码
+     * 设备种类名称
      */
-	@TableField("equ_list_code")
-    private String equListCode;
+	@TableField("equ_list_name")
+    private String equListName;
 
     /**
      * 设备种类
@@ -70,10 +70,10 @@ public class IdxBizJgProjectContraption extends TzsBaseEntity {
     private String equList;
 
     /**
-     * 设备类别代码
+     * 设备类别名称
      */
-	@TableField("equ_category_code")
-    private String equCategoryCode;
+	@TableField("equ_category_name")
+    private String equCategoryName;
 
     /**
      * 设备代码
@@ -82,10 +82,10 @@ public class IdxBizJgProjectContraption extends TzsBaseEntity {
     private String equCategory;
 
     /**
-     * 设备品种代码
+     * 设备品种名称
      */
-	@TableField("equ_define_code")
-    private String equDefineCode;
+	@TableField("equ_define_name")
+    private String equDefineName;
 
     /**
      * 设备品种
@@ -207,4 +207,21 @@ public class IdxBizJgProjectContraption extends TzsBaseEntity {
 	@TableField("supervisory_code")
     private String supervisoryCode;
 
+    /**
+     * 使用登记证编号
+     */
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     *  是否是否纳管：true - 已纳管 false-未纳管
+     */
+    @TableField("is_into_management")
+    private Boolean isIntoManagement;
+
+    /**
+     *  数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）
+     */
+    @TableField("data_source")
+    private String dataSource;
 }

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

@@ -273,4 +273,10 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     @TableField("\"O_REG_DATE\"")
     private String oRegDate;
 
+
+    /**
+     * 工程装置ID
+     */
+    @TableField("\"PROJECT_CONTRAPTION_ID\"")
+    private String projectContraptionId;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IIdxBizJgProjectContraptionService.java

 package com.yeejoin.amos.boot.module.ymt.api.service;
 
-
 /**
  * 管道工程装置表接口类
  *