Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationNameDto.java

@@ -117,4 +117,8 @@ public class JgChangeRegistrationNameDto extends BaseDto {
      */
     private String transferToUserIds;
 
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationReformDto.java

 package com.yeejoin.amos.boot.module.jg.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;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -127,4 +126,7 @@ public class JgChangeRegistrationReformDto extends BaseDto {
 
     private String nextExecuteUserIds;
 
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -3,12 +3,13 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ import java.util.Map;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationUnitDto", description="单位变更登记")
+@ApiModel(value = "JgChangeRegistrationUnitDto", description = "单位变更登记")
 public class JgChangeRegistrationUnitDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -148,4 +149,6 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     @ApiModelProperty(value = "转办人")
     private String transferToUserIds;
 
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
@@ -279,4 +277,7 @@ public class JgInstallationNoticeDto extends BaseDto {
      * '属地监管部门name'
      */
     private String orgBranchName;
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintainNoticeDto.java

@@ -132,7 +132,7 @@ public class JgMaintainNoticeDto extends BaseDto {
     @ApiModelProperty(value = "委托书附件")
     private String powerOfAttorney;
 
-    @ApiModelProperty(value = "施工合同附件")
+    @ApiModelProperty(value = "其他附件")
     private String constructionContract;
 
     @ApiModelProperty(value = "委托书附件")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintenanceContractDto.java

@@ -184,4 +184,7 @@ public class JgMaintenanceContractDto extends BaseDto {
 
     @ApiModelProperty(value = "转办后执行人的Id逗号分割")
     private String transferToUserIds;
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgReformNoticeDto.java

@@ -225,4 +225,7 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "转办人")
     private String  transferToUserIds;
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -122,4 +122,7 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "设备地址")
     private String fullAddress;
 
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java

@@ -234,4 +234,8 @@ public class JgTransferNoticeDto extends BaseDto {
 
     private String transferToUserIds;
 
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

 package com.yeejoin.amos.boot.module.jg.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;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-12
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgUseRegistrationDto", description="")
+@ApiModel(value = "JgUseRegistrationDto", description = "")
 public class JgUseRegistrationDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -101,11 +99,14 @@ public class JgUseRegistrationDto  extends BaseDto {
 
     private List<String> roleIds;
 
-    private  String dataType  ;
+    private String dataType;
 
     private String unitCode;
 
     private String isXixian;
 
     private String currentUserId;
+
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationName.java

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -166,4 +165,10 @@ public class JgChangeRegistrationName extends BaseEntity {
      */
     @TableField("transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java

@@ -6,8 +6,8 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
-import java.util.List;
 
 /**
  * 改造变更登记
@@ -246,4 +246,11 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -235,4 +235,10 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * */
     @TableField(value = "transfer_to_user_ids")
     private String  transferToUserIds;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -11,8 +11,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author system_generator
@@ -447,4 +445,11 @@ public class JgInstallationNotice extends BaseEntity {
      */
     @TableField(value = "inform_number")
     private String informNumber;
+
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -233,7 +233,7 @@ public class JgMaintainNotice extends BaseEntity {
     private String powerOfAttorney;
 
     /**
-     * 施工合同附件
+     * 其他附件
      */
     @TableField("construction_contract")
     private String constructionContract;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintenanceContract.java

@@ -289,4 +289,11 @@ public class JgMaintenanceContract extends BaseEntity {
      */
     @TableField("equ_category")
     private String equCategory;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 import java.util.List;
 
@@ -213,7 +213,7 @@ public class JgReformNotice extends BaseEntity {
     private List<JSONObject> powerOfAttorney;
 
     /**
-     * 施工合同附件
+     * 其他附件
      */
 	@TableField(value = "construction_contract", typeHandler = FastjsonTypeHandler.class)
     private List<JSONObject> constructionContract;
@@ -351,4 +351,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "inform_number")
     private String informNumber;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -175,4 +175,10 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(exist = false)
     private String fullAddress;
 
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -331,4 +331,11 @@ public class JgTransferNotice extends BaseEntity {
      */
     @TableField(value = "inform_number")
     private String informNumber;
+
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -192,4 +192,11 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "other_accessories")
+    private String otherAccessories;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

@@ -172,4 +172,7 @@ public class JgMaintenanceContractVo {
      */
     @ApiModelProperty("maintenance_manager_phone")
     private String maintenanceManagerPhone;
+
+    @ApiModelProperty (value = "其他附件")
+    private String otherAccessories;
 }

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

@@ -136,6 +136,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
         jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName()) ? reginParams.getCompany().getCompanyName() : useInfo.getUseUnitName());
         jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? reginParams.getCompany().getCompanyCode() : useInfo.getUseUnitCreditCode());
+        jgChangeRegistrationReform.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
 
         if (!ObjectUtils.isEmpty(map.get("transformationQualityCertificate"))) {
             jgChangeRegistrationReform.setTransformationQualityCertificate(JSONObject.toJSONString(map.get("transformationQualityCertificate")));

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

@@ -282,6 +282,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(String.valueOf(map.get("useUnitName")));
         jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
+        jgUseRegistration.setOtherAccessories(String.valueOf(map.get("otherAccessories")));
         String equType = this.baseMapper.getEquType(String.valueOf(map.get("equipId")));
         if (map.containsKey("receiveOrgCode")) {
             // 接收单位信息

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

@@ -2,12 +2,10 @@ 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.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.checkerframework.checker.units.qual.A;
 
 import java.util.Date;
 
@@ -103,4 +101,10 @@ public class IdxBizJgDesignInfo extends TzsBaseEntity {
 	@TableField("\"DESIGN_STANDARD\"")
     private String designStandard;
 
+    /**
+     *其他附件
+     */
+	@TableField("\"OTHER_ACCESSORIES_DES\"")
+    private String otherAccessoriesDes;
+
 }

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

@@ -2,11 +2,11 @@ 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.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -114,4 +114,10 @@ public class IdxBizJgFactoryInfo extends TzsBaseEntity {
 	@TableField("\"TYPE_TEST_CREDENTIAL\"")
     private String typeTestCredential;
 
+    /**
+     * 其他附件
+     */
+	@TableField("\"OTHER_ACCESSORIES_FACT\"")
+    private String otherAccessoriesFact;
+
 }

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

@@ -2,12 +2,10 @@ 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.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 注册登记信息表
@@ -157,4 +155,10 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
 	@TableField("\"MOTOR_NUMBER\"")
     private String motorNumber;
 
+    /**
+     *
+     */
+	@TableField("\"OTHER_ACCESSORIES_REG\"")
+    private String otherAccessoriesReg;
+
 }