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/dto/JgOverDesignServiceLifeDto.java

@@ -20,7 +20,6 @@ public class JgOverDesignServiceLifeDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "申请编号")
     private String applyNo;
 
@@ -93,6 +92,4 @@ public class JgOverDesignServiceLifeDto  extends BaseDto {
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
-    @ApiModelProperty(value = "延期使用年限")
-    private Date delayServiceLife;
 }

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

@@ -76,4 +76,9 @@ public class IdxBizJgDesignInfoDto extends BaseDto {
     @ApiModelProperty("资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】")
     private String designIsComplete;
 
+    @ApiModelProperty(value = "延期使用年限")
+    private Date delayServiceLife;
+
+    @ApiModelProperty(value = "超设计使用登记次数")
+    private Integer overDesignRegNum;
 }

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

@@ -6,7 +6,6 @@ import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
 import java.util.Date;
 
 /**
@@ -113,4 +112,15 @@ public class IdxBizJgDesignInfo extends TzsBaseEntity {
     @TableField("\"DESIGN_IS_COMPLETE\"")
     private String designIsComplete;
 
+    /**
+     * 延期使用年限日期
+     */
+    @TableField("\"DELAY_SERVICE_LIFE_DATE\"")
+    private String delayServiceLifeDate;
+
+    /**
+     * 超设计使用登记次数(默认0，最多2次)
+     */
+    @TableField("\"OVER_DESIGN_REG_NUM\"")
+    private String overDesignRegNum;
 }