refact(检验开通)：需求变更

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseLogicEntity.java

+package com.yeejoin.amos.boot.biz.common.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 公共实体类
+ *
+ * @author DELL
+ */
+@Data
+public class BaseLogicEntity implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+	protected Long sequenceNbr;
+
+	@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+	protected Date recDate;
+
+	@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserId;
+
+	@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserName;
+
+	/**
+	 * 是否删除
+	 */
+	@TableField(value = "is_delete")
+	@TableLogic
+	public Boolean isDelete=false;
+
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/LicenceStateEnum.java

+package com.yeejoin.amos.boot.biz.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum LicenceStateEnum {
+
+    enabled("启用", 1),
+    disabled("停用", 2),
+    overdue("超期", 3);
+
+    private final String name;
+    private final int value;
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BaseEnterpriseCertDto.java

@@ -62,4 +62,7 @@ public class BaseEnterpriseCertDto extends BaseDto {
 
     @ApiModelProperty(value = "分类-哪个身份创建的证书")
     private String unitType;
+
+    @ApiModelProperty(value = "证的状态：报检预留字段，如启用、停用、超期等")
+    private Integer certState;
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/BaseEnterpriseCert.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.common.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.BaseLogicEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,7 +20,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tz_base_enterprise_cert")
-public class BaseEnterpriseCert extends BaseEntity {
+public class BaseEnterpriseCert extends BaseLogicEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -59,7 +61,7 @@ public class BaseEnterpriseCert extends BaseEntity {
     private Date issueDate;
 
     /**
-     * 发证机关
+     * 发证机关名称
      */
 	@TableField("approved_organ")
     private String approvedOrgan;
@@ -94,4 +96,10 @@ public class BaseEnterpriseCert extends BaseEntity {
      */
     @TableField("unit_type")
     private String unitType;
+
+    /**
+     * 证的状态：报检预留字段，如启用、停用、超期等
+     */
+    @TableField("cert_state")
+    private Integer certState;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/OpenApplicationTimingDiscardJob.java

@@ -41,7 +41,6 @@ public class OpenApplicationTimingDiscardJob {
             for (Long aLong : longs) {
                 String remark = "许可到期，系统自动作废";
                 jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
-
             }
         }
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java

@@ -115,4 +115,7 @@ public class BaseUnitLicenceDto extends BaseDto {
 
     @ApiModelProperty(value = "企业资质证书照片")
     private JSONArray qualificationCertificateAttachment;
+
+    @ApiModelProperty(value = "企业资质状态：报检预留字段，如启用、停用、超期等")
+    private Integer licenceState;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java

 package com.yeejoin.amos.boot.module.tcm.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
@@ -102,5 +103,17 @@ public class TzBaseUnitLicenceDto extends BaseDto {
     @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
     private String licenceType;
 
+    @ApiModelProperty(value = "所属证书")
+    private String enterpriseCertSeq;
+
+    @ApiModelProperty(value = "字典表id")
+    private Long dictSeq;
+
+    @ApiModelProperty(value = "企业资质证书照片")
+    private JSONArray qualificationCertificateAttachment;
+
+    @ApiModelProperty(value = "企业资质状态：报检预留字段，如启用、停用、超期等")
+    private Integer licenceState;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/BaseUnitLicence.java

@@ -199,4 +199,10 @@ public class BaseUnitLicence extends BaseEntity {
      */
     @TableField("qualification_certificate_attachment")
     private String qualificationCertificateAttachment;
+
+    /**
+     *  企业资质状态：报检预留字段，如启用、停用、超期等
+     */
+    @TableField("licence_state")
+    private Integer licenceState;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java

@@ -131,4 +131,10 @@ public class TzBaseUnitLicence extends BaseEntity {
     @TableField("qualification_certificate_attachment")
     private String qualificationCertificateAttachment;
 
+    /**
+     *  企业资质状态：报检预留字段，如启用、停用、超期等
+     */
+    @TableField("licence_state")
+    private Integer licenceState;
+
 }

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

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 
 /**
@@ -16,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="BaseUnitLicenceDto", description="单位注册许可信息表")
+@ApiModel(value = "BaseUnitLicenceDto", description = "单位注册许可信息表")
 public class BaseUnitLicenceDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -97,4 +98,30 @@ public class BaseUnitLicenceDto  extends BaseDto {
     @ApiModelProperty(value = "是否同步自许可（1是 0否）")
     private String isNotSync;
 
+
+    @ApiModelProperty(value = "机构类别枚举")
+    private String agencyType;
+
+
+    @ApiModelProperty(value = "机构类别枚举名称，冗余")
+    private String agencyTypeName;
+
+
+    @ApiModelProperty(value = "资质类型编码（检验检测、其他）")
+    private String licenceType;
+
+
+    @ApiModelProperty(value = "所属证书ID")
+    private String enterpriseCertSeq;
+
+    @ApiModelProperty(value = "字典表id")
+    private Long dictSeq;
+
+    @ApiModelProperty(value = "企业资质证书照片")
+    private String qualificationCertificateAttachment;
+
+
+    @ApiModelProperty(value = "企业资质状态：报检预留字段，如启用、停用、超期等")
+    private Integer licenceState;
+
 }

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

@@ -117,4 +117,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
 
     @ApiModelProperty(value = "企业资质证书照片")
     private String qualificationCertificateAttachment;
+
+    @ApiModelProperty(value = "企业资质状态：报检预留字段，如启用、停用、超期等")
+    private Integer licenceState;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -202,4 +203,10 @@ public class BaseUnitLicence extends BaseEntity {
     @TableField("qualification_certificate_attachment")
     private String qualificationCertificateAttachment;
 
+    /**
+     *  企业资质状态：报检预留字段，如启用、停用、超期等
+     */
+    @TableField("licence_state")
+    private Integer licenceState;
+
 }

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

@@ -128,4 +128,10 @@ public class TzBaseUnitLicence extends BaseEntity {
      */
     @TableField("qualification_certificate_attachment")
     private String qualificationCertificateAttachment;
+
+    /**
+     *  企业资质状态：报检预留字段，如启用、停用、超期等
+     */
+    @TableField("licence_state")
+    private Integer licenceState;
 }