Merge branch 'develop_tzs_register' of…

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

@@ -1280,6 +1280,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
+        useInfo.setDataSource("jg");
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
 
         if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {

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

@@ -126,4 +126,7 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String PRODUCE_DATE;
+
+    @Field(type = FieldType.Text)
+    private String DATA_SOURCE;
 }

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

@@ -209,7 +209,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     private Date claimDate;
 
     /**
-     *  数据来源（新增：0、导入：1、复制：复制数据的id ）
+     *  数据来源（新增：0、导入：1、复制：复制数据的id 、jg:20240315日后从监管新加设备）
      */
     @TableField("\"DATA_SOURCE\"")
     private String dataSource;

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

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