Merge remote-tracking branch 'origin/master'

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java

@@ -14,7 +14,7 @@ import lombok.Data;
 * 证照申请实体对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 @Data
 public class ApplyLogEntity extends ApplyLogVo {
@@ -136,6 +136,22 @@ public class ApplyLogEntity extends ApplyLogVo {
     * 二维码
     */
     private String qRCode;
+    /**
+    * 行业名称
+    */
+    private String industryName;
+    /**
+    * 经营场所
+    */
+    private String businessPlace;
+    /**
+    * 许可项目
+    */
+    private String licenseProject;
+    /**
+    * 制证机关
+    */
+    private String authority;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -182,5 +198,9 @@ public class ApplyLogEntity extends ApplyLogVo {
             this.operType = 1;
             this.recordStatus = 0;
             this.qRCode = "";
+            this.industryName = "";
+            this.businessPlace = "";
+            this.licenseProject = "";
+            this.authority = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.ApplyLogEntity;
 * 证照申请查询对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 public class ApplyLogQuery extends ApplyLogEntity {
     /** 开始 序号，主键，自增长 */
@@ -295,6 +295,26 @@ public class ApplyLogQuery extends ApplyLogEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 行业名称 */
+    private List<String> industryNameList;
+
+    /** 行业名称排除列表 */
+    private List <String> industryNameNotList;
+    /** 经营场所 */
+    private List<String> businessPlaceList;
+
+    /** 经营场所排除列表 */
+    private List <String> businessPlaceNotList;
+    /** 许可项目 */
+    private List<String> licenseProjectList;
+
+    /** 许可项目排除列表 */
+    private List <String> licenseProjectNotList;
+    /** 制证机关 */
+    private List<String> authorityList;
+
+    /** 制证机关排除列表 */
+    private List <String> authorityNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<ApplyLogQuery> orConditionList;
 
@@ -1930,6 +1950,134 @@ public class ApplyLogQuery extends ApplyLogEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 行业名称
+    * @return industryNameList
+    */
+    public List<String> getIndustryNameList(){
+        return this.industryNameList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public void setIndustryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+    }
+
+    /**
+    * 获取 行业名称
+    * @return industryNameNotList
+    */
+    public List<String> getIndustryNameNotList(){
+        return this.industryNameNotList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameNotList
+    */
+    public void setIndustryNameNotList(List<String> industryNameNotList){
+        this.industryNameNotList = industryNameNotList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceList
+    */
+    public List<String> getBusinessPlaceList(){
+        return this.businessPlaceList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public void setBusinessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceNotList
+    */
+    public List<String> getBusinessPlaceNotList(){
+        return this.businessPlaceNotList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceNotList
+    */
+    public void setBusinessPlaceNotList(List<String> businessPlaceNotList){
+        this.businessPlaceNotList = businessPlaceNotList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectList
+    */
+    public List<String> getLicenseProjectList(){
+        return this.licenseProjectList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public void setLicenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectNotList
+    */
+    public List<String> getLicenseProjectNotList(){
+        return this.licenseProjectNotList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectNotList
+    */
+    public void setLicenseProjectNotList(List<String> licenseProjectNotList){
+        this.licenseProjectNotList = licenseProjectNotList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityList
+    */
+    public List<String> getAuthorityList(){
+        return this.authorityList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public void setAuthorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityNotList
+    */
+    public List<String> getAuthorityNotList(){
+        return this.authorityNotList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityNotList
+    */
+    public void setAuthorityNotList(List<String> authorityNotList){
+        this.authorityNotList = authorityNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2871,6 +3019,82 @@ public class ApplyLogQuery extends ApplyLogEntity {
         }
 
 
+
+	/**
+    * 设置 行业名称
+    * @param industryName
+    */
+    public ApplyLogQuery industryName(String industryName){
+        setIndustryName(industryName);
+		return this;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public ApplyLogQuery industryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 经营场所
+    * @param businessPlace
+    */
+    public ApplyLogQuery businessPlace(String businessPlace){
+        setBusinessPlace(businessPlace);
+		return this;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public ApplyLogQuery businessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 许可项目
+    * @param licenseProject
+    */
+    public ApplyLogQuery licenseProject(String licenseProject){
+        setLicenseProject(licenseProject);
+		return this;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public ApplyLogQuery licenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+		return this;
+    }
+
+
+	/**
+    * 设置 制证机关
+    * @param authority
+    */
+    public ApplyLogQuery authority(String authority){
+        setAuthority(authority);
+		return this;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public ApplyLogQuery authorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java

@@ -14,7 +14,7 @@ import lombok.Data;
 * 证照打印记录实体对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 @Data
 public class PrintLogEntity extends PrintLogVo {
@@ -96,6 +96,22 @@ public class PrintLogEntity extends PrintLogVo {
     * 打印设备
     */
     private Long deviceId;
+    /**
+    * 行业名称
+    */
+    private String industryName;
+    /**
+    * 经营场所
+    */
+    private String businessPlace;
+    /**
+    * 许可项目
+    */
+    private String licenseProject;
+    /**
+    * 制证机关
+    */
+    private String authority;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -132,5 +148,9 @@ public class PrintLogEntity extends PrintLogVo {
             this.printDate = null;
             this.statusRemark = "";
             this.deviceId = null;
+            this.industryName = "";
+            this.businessPlace = "";
+            this.licenseProject = "";
+            this.authority = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.PrintLogEntity;
 * 证照打印记录查询对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 public class PrintLogQuery extends PrintLogEntity {
     /** 开始 序号，主键，自增长 */
@@ -203,6 +203,26 @@ public class PrintLogQuery extends PrintLogEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 行业名称 */
+    private List<String> industryNameList;
+
+    /** 行业名称排除列表 */
+    private List <String> industryNameNotList;
+    /** 经营场所 */
+    private List<String> businessPlaceList;
+
+    /** 经营场所排除列表 */
+    private List <String> businessPlaceNotList;
+    /** 许可项目 */
+    private List<String> licenseProjectList;
+
+    /** 许可项目排除列表 */
+    private List <String> licenseProjectNotList;
+    /** 制证机关 */
+    private List<String> authorityList;
+
+    /** 制证机关排除列表 */
+    private List <String> authorityNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PrintLogQuery> orConditionList;
 
@@ -1322,6 +1342,134 @@ public class PrintLogQuery extends PrintLogEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 行业名称
+    * @return industryNameList
+    */
+    public List<String> getIndustryNameList(){
+        return this.industryNameList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public void setIndustryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+    }
+
+    /**
+    * 获取 行业名称
+    * @return industryNameNotList
+    */
+    public List<String> getIndustryNameNotList(){
+        return this.industryNameNotList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameNotList
+    */
+    public void setIndustryNameNotList(List<String> industryNameNotList){
+        this.industryNameNotList = industryNameNotList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceList
+    */
+    public List<String> getBusinessPlaceList(){
+        return this.businessPlaceList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public void setBusinessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceNotList
+    */
+    public List<String> getBusinessPlaceNotList(){
+        return this.businessPlaceNotList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceNotList
+    */
+    public void setBusinessPlaceNotList(List<String> businessPlaceNotList){
+        this.businessPlaceNotList = businessPlaceNotList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectList
+    */
+    public List<String> getLicenseProjectList(){
+        return this.licenseProjectList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public void setLicenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectNotList
+    */
+    public List<String> getLicenseProjectNotList(){
+        return this.licenseProjectNotList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectNotList
+    */
+    public void setLicenseProjectNotList(List<String> licenseProjectNotList){
+        this.licenseProjectNotList = licenseProjectNotList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityList
+    */
+    public List<String> getAuthorityList(){
+        return this.authorityList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public void setAuthorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityNotList
+    */
+    public List<String> getAuthorityNotList(){
+        return this.authorityNotList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityNotList
+    */
+    public void setAuthorityNotList(List<String> authorityNotList){
+        this.authorityNotList = authorityNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -1969,6 +2117,82 @@ public class PrintLogQuery extends PrintLogEntity {
         }
 
 
+
+	/**
+    * 设置 行业名称
+    * @param industryName
+    */
+    public PrintLogQuery industryName(String industryName){
+        setIndustryName(industryName);
+		return this;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public PrintLogQuery industryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 经营场所
+    * @param businessPlace
+    */
+    public PrintLogQuery businessPlace(String businessPlace){
+        setBusinessPlace(businessPlace);
+		return this;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public PrintLogQuery businessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 许可项目
+    * @param licenseProject
+    */
+    public PrintLogQuery licenseProject(String licenseProject){
+        setLicenseProject(licenseProject);
+		return this;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public PrintLogQuery licenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+		return this;
+    }
+
+
+	/**
+    * 设置 制证机关
+    * @param authority
+    */
+    public PrintLogQuery authority(String authority){
+        setAuthority(authority);
+		return this;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public PrintLogQuery authorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java

@@ -10,10 +10,10 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
 import lombok.Data;
 /**
-* 证照打印记录实体对象
+* 证照打印列表实体对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 @Data
 public class PrintWaitQueueEntity extends PrintWaitQueueVo {
@@ -103,6 +103,22 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     * 允许打印次数
     */
     private Integer total;
+    /**
+    * 行业名称
+    */
+    private String industryName;
+    /**
+    * 经营场所
+    */
+    private String businessPlace;
+    /**
+    * 许可项目
+    */
+    private String licenseProject;
+    /**
+    * 制证机关
+    */
+    private String authority;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -141,5 +157,9 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
             this.certificateUrl = "";
             this.printStatus = 0;
             this.total = 1;
+            this.industryName = "";
+            this.businessPlace = "";
+            this.licenseProject = "";
+            this.authority = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java

@@ -3,10 +3,10 @@ package com.mortals.xhx.module.record.model;
 import java.util.List;
 import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
 /**
-* 证照打印记录查询对象
+* 证照打印列表查询对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
     /** 开始 序号，主键，自增长 */
@@ -231,6 +231,26 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 行业名称 */
+    private List<String> industryNameList;
+
+    /** 行业名称排除列表 */
+    private List <String> industryNameNotList;
+    /** 经营场所 */
+    private List<String> businessPlaceList;
+
+    /** 经营场所排除列表 */
+    private List <String> businessPlaceNotList;
+    /** 许可项目 */
+    private List<String> licenseProjectList;
+
+    /** 许可项目排除列表 */
+    private List <String> licenseProjectNotList;
+    /** 制证机关 */
+    private List<String> authorityList;
+
+    /** 制证机关排除列表 */
+    private List <String> authorityNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PrintWaitQueueQuery> orConditionList;
 
@@ -1512,6 +1532,134 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 行业名称
+    * @return industryNameList
+    */
+    public List<String> getIndustryNameList(){
+        return this.industryNameList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public void setIndustryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+    }
+
+    /**
+    * 获取 行业名称
+    * @return industryNameNotList
+    */
+    public List<String> getIndustryNameNotList(){
+        return this.industryNameNotList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameNotList
+    */
+    public void setIndustryNameNotList(List<String> industryNameNotList){
+        this.industryNameNotList = industryNameNotList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceList
+    */
+    public List<String> getBusinessPlaceList(){
+        return this.businessPlaceList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public void setBusinessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceNotList
+    */
+    public List<String> getBusinessPlaceNotList(){
+        return this.businessPlaceNotList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceNotList
+    */
+    public void setBusinessPlaceNotList(List<String> businessPlaceNotList){
+        this.businessPlaceNotList = businessPlaceNotList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectList
+    */
+    public List<String> getLicenseProjectList(){
+        return this.licenseProjectList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public void setLicenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectNotList
+    */
+    public List<String> getLicenseProjectNotList(){
+        return this.licenseProjectNotList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectNotList
+    */
+    public void setLicenseProjectNotList(List<String> licenseProjectNotList){
+        this.licenseProjectNotList = licenseProjectNotList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityList
+    */
+    public List<String> getAuthorityList(){
+        return this.authorityList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public void setAuthorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityNotList
+    */
+    public List<String> getAuthorityNotList(){
+        return this.authorityNotList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityNotList
+    */
+    public void setAuthorityNotList(List<String> authorityNotList){
+        this.authorityNotList = authorityNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2285,6 +2433,82 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
         }
 
 
+
+	/**
+    * 设置 行业名称
+    * @param industryName
+    */
+    public PrintWaitQueueQuery industryName(String industryName){
+        setIndustryName(industryName);
+		return this;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public PrintWaitQueueQuery industryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 经营场所
+    * @param businessPlace
+    */
+    public PrintWaitQueueQuery businessPlace(String businessPlace){
+        setBusinessPlace(businessPlace);
+		return this;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public PrintWaitQueueQuery businessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 许可项目
+    * @param licenseProject
+    */
+    public PrintWaitQueueQuery licenseProject(String licenseProject){
+        setLicenseProject(licenseProject);
+		return this;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public PrintWaitQueueQuery licenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+		return this;
+    }
+
+
+	/**
+    * 设置 制证机关
+    * @param authority
+    */
+    public PrintWaitQueueQuery authority(String authority){
+        setAuthority(authority);
+		return this;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public PrintWaitQueueQuery authorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
 * 证照持有实体对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 @Data
 public class RetainLogEntity extends RetainLogVo {
@@ -87,6 +87,22 @@ public class RetainLogEntity extends RetainLogVo {
     * 证件预览地址
     */
     private String previewUrl;
+    /**
+    * 行业名称
+    */
+    private String industryName;
+    /**
+    * 经营场所
+    */
+    private String businessPlace;
+    /**
+    * 许可项目
+    */
+    private String licenseProject;
+    /**
+    * 制证机关
+    */
+    private String authority;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -121,5 +137,9 @@ public class RetainLogEntity extends RetainLogVo {
             this.certificateStatus = 1;
             this.certificateUrl = "";
             this.previewUrl = "";
+            this.industryName = "";
+            this.businessPlace = "";
+            this.licenseProject = "";
+            this.authority = "";
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.record.model.RetainLogEntity;
 * 证照持有查询对象
 *
 * @author zxfei
-* @date 2024-07-27
+* @date 2024-07-28
 */
 public class RetainLogQuery extends RetainLogEntity {
     /** 开始 序号，主键，自增长 */
@@ -191,6 +191,26 @@ public class RetainLogQuery extends RetainLogEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 行业名称 */
+    private List<String> industryNameList;
+
+    /** 行业名称排除列表 */
+    private List <String> industryNameNotList;
+    /** 经营场所 */
+    private List<String> businessPlaceList;
+
+    /** 经营场所排除列表 */
+    private List <String> businessPlaceNotList;
+    /** 许可项目 */
+    private List<String> licenseProjectList;
+
+    /** 许可项目排除列表 */
+    private List <String> licenseProjectNotList;
+    /** 制证机关 */
+    private List<String> authorityList;
+
+    /** 制证机关排除列表 */
+    private List <String> authorityNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<RetainLogQuery> orConditionList;
 
@@ -1246,6 +1266,134 @@ public class RetainLogQuery extends RetainLogEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+    * 获取 行业名称
+    * @return industryNameList
+    */
+    public List<String> getIndustryNameList(){
+        return this.industryNameList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public void setIndustryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+    }
+
+    /**
+    * 获取 行业名称
+    * @return industryNameNotList
+    */
+    public List<String> getIndustryNameNotList(){
+        return this.industryNameNotList;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameNotList
+    */
+    public void setIndustryNameNotList(List<String> industryNameNotList){
+        this.industryNameNotList = industryNameNotList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceList
+    */
+    public List<String> getBusinessPlaceList(){
+        return this.businessPlaceList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public void setBusinessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+    }
+
+    /**
+    * 获取 经营场所
+    * @return businessPlaceNotList
+    */
+    public List<String> getBusinessPlaceNotList(){
+        return this.businessPlaceNotList;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceNotList
+    */
+    public void setBusinessPlaceNotList(List<String> businessPlaceNotList){
+        this.businessPlaceNotList = businessPlaceNotList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectList
+    */
+    public List<String> getLicenseProjectList(){
+        return this.licenseProjectList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public void setLicenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+    }
+
+    /**
+    * 获取 许可项目
+    * @return licenseProjectNotList
+    */
+    public List<String> getLicenseProjectNotList(){
+        return this.licenseProjectNotList;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectNotList
+    */
+    public void setLicenseProjectNotList(List<String> licenseProjectNotList){
+        this.licenseProjectNotList = licenseProjectNotList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityList
+    */
+    public List<String> getAuthorityList(){
+        return this.authorityList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public void setAuthorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+    }
+
+    /**
+    * 获取 制证机关
+    * @return authorityNotList
+    */
+    public List<String> getAuthorityNotList(){
+        return this.authorityNotList;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityNotList
+    */
+    public void setAuthorityNotList(List<String> authorityNotList){
+        this.authorityNotList = authorityNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -1873,6 +2021,82 @@ public class RetainLogQuery extends RetainLogEntity {
         }
 
 
+
+	/**
+    * 设置 行业名称
+    * @param industryName
+    */
+    public RetainLogQuery industryName(String industryName){
+        setIndustryName(industryName);
+		return this;
+    }
+
+    /**
+    * 设置 行业名称
+    * @param industryNameList
+    */
+    public RetainLogQuery industryNameList(List<String> industryNameList){
+        this.industryNameList = industryNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 经营场所
+    * @param businessPlace
+    */
+    public RetainLogQuery businessPlace(String businessPlace){
+        setBusinessPlace(businessPlace);
+		return this;
+    }
+
+    /**
+    * 设置 经营场所
+    * @param businessPlaceList
+    */
+    public RetainLogQuery businessPlaceList(List<String> businessPlaceList){
+        this.businessPlaceList = businessPlaceList;
+		return this;
+    }
+
+
+	/**
+    * 设置 许可项目
+    * @param licenseProject
+    */
+    public RetainLogQuery licenseProject(String licenseProject){
+        setLicenseProject(licenseProject);
+		return this;
+    }
+
+    /**
+    * 设置 许可项目
+    * @param licenseProjectList
+    */
+    public RetainLogQuery licenseProjectList(List<String> licenseProjectList){
+        this.licenseProjectList = licenseProjectList;
+		return this;
+    }
+
+
+	/**
+    * 设置 制证机关
+    * @param authority
+    */
+    public RetainLogQuery authority(String authority){
+        setAuthority(authority);
+		return this;
+    }
+
+    /**
+    * 设置 制证机关
+    * @param authorityList
+    */
+    public RetainLogQuery authorityList(List<String> authorityList){
+        this.authorityList = authorityList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList