证件持有增加字段

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

 package com.mortals.xhx.module.record.model;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 import java.math.BigDecimal;
@@ -10,11 +11,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.RetainLogVo;
 import lombok.Data;
 /**
-* 证照持有实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 证照持有实体对象
+ *
+ * @author zxfei
+ * @date 2024-08-01
+ */
 @Data
 public class RetainLogEntity extends RetainLogVo {
     private static final long serialVersionUID = 1L;
@@ -103,6 +104,38 @@ public class RetainLogEntity extends RetainLogVo {
      * 制证机关
      */
     private String authority;
+    /**
+     * 颁发时间
+     */
+    private Date issueTime;
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件地址
+     */
+    private String annexUrl;
+    /**
+     * 有效期起始
+     */
+    private Date validityStart;
+    /**
+     * 有效期截止
+     */
+    private Date validityEnd;
+    /**
+     * 持有者类型，1：自然人，2：法人，3：自然人法人
+     */
+    private Integer holderType;
+    /**
+     * 持有者证件类型，1：身份证，2：组织机构代码等
+     */
+    private Integer holderIdType;
+    /**
+     * 专网ID
+     */
+    private String privateID;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -141,5 +174,13 @@ public class RetainLogEntity extends RetainLogVo {
         this.businessPlace = "";
         this.licenseProject = "";
         this.authority = "";
+        this.issueTime = null;
+        this.annexName = "";
+        this.annexUrl = "";
+        this.validityStart = null;
+        this.validityEnd = null;
+        this.holderType = 1;
+        this.holderIdType = 1;
+        this.privateID = "";
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.record.model;
 
+import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.record.model.RetainLogEntity;
 /**
-* 证照持有查询对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 证照持有查询对象
+ *
+ * @author zxfei
+ * @date 2024-08-01
+ */
 public class RetainLogQuery extends RetainLogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -211,6 +212,69 @@ public class RetainLogQuery extends RetainLogEntity {
 
     /** 制证机关排除列表 */
     private List <String> authorityNotList;
+    /** 开始 颁发时间 */
+    private String issueTimeStart;
+
+    /** 结束 颁发时间 */
+    private String issueTimeEnd;
+
+    /** 附件名称 */
+    private List<String> annexNameList;
+
+    /** 附件名称排除列表 */
+    private List <String> annexNameNotList;
+    /** 附件地址 */
+    private List<String> annexUrlList;
+
+    /** 附件地址排除列表 */
+    private List <String> annexUrlNotList;
+    /** 开始 有效期起始 */
+    private String validityStartStart;
+
+    /** 结束 有效期起始 */
+    private String validityStartEnd;
+
+    /** 开始 有效期截止 */
+    private String validityEndStart;
+
+    /** 结束 有效期截止 */
+    private String validityEndEnd;
+
+    /** 开始 持有者类型，1：自然人，2：法人，3：自然人法人 */
+    private Integer holderTypeStart;
+
+    /** 结束 持有者类型，1：自然人，2：法人，3：自然人法人 */
+    private Integer holderTypeEnd;
+
+    /** 增加 持有者类型，1：自然人，2：法人，3：自然人法人 */
+    private Integer holderTypeIncrement;
+
+    /** 持有者类型，1：自然人，2：法人，3：自然人法人列表 */
+    private List <Integer> holderTypeList;
+
+    /** 持有者类型，1：自然人，2：法人，3：自然人法人排除列表 */
+    private List <Integer> holderTypeNotList;
+
+    /** 开始 持有者证件类型，1：身份证，2：组织机构代码等 */
+    private Integer holderIdTypeStart;
+
+    /** 结束 持有者证件类型，1：身份证，2：组织机构代码等 */
+    private Integer holderIdTypeEnd;
+
+    /** 增加 持有者证件类型，1：身份证，2：组织机构代码等 */
+    private Integer holderIdTypeIncrement;
+
+    /** 持有者证件类型，1：身份证，2：组织机构代码等列表 */
+    private List <Integer> holderIdTypeList;
+
+    /** 持有者证件类型，1：身份证，2：组织机构代码等排除列表 */
+    private List <Integer> holderIdTypeNotList;
+
+    /** 专网ID */
+    private List<String> privateIDList;
+
+    /** 专网ID排除列表 */
+    private List <String> privateIDNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<RetainLogQuery> orConditionList;
 
@@ -1394,6 +1458,360 @@ public class RetainLogQuery extends RetainLogEntity {
         this.authorityNotList = authorityNotList;
     }
 
+    /**
+     * 获取 开始 颁发时间
+     * @return issueTimeStart
+     */
+    public String getIssueTimeStart(){
+        return this.issueTimeStart;
+    }
+
+    /**
+     * 设置 开始 颁发时间
+     * @param issueTimeStart
+     */
+    public void setIssueTimeStart(String issueTimeStart){
+        this.issueTimeStart = issueTimeStart;
+    }
+
+    /**
+     * 获取 结束 颁发时间
+     * @return issueTimeEnd
+     */
+    public String getIssueTimeEnd(){
+        return this.issueTimeEnd;
+    }
+
+    /**
+     * 设置 结束 颁发时间
+     * @param issueTimeEnd
+     */
+    public void setIssueTimeEnd(String issueTimeEnd){
+        this.issueTimeEnd = issueTimeEnd;
+    }
+
+    /**
+     * 获取 附件名称
+     * @return annexNameList
+     */
+    public List<String> getAnnexNameList(){
+        return this.annexNameList;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameList
+     */
+    public void setAnnexNameList(List<String> annexNameList){
+        this.annexNameList = annexNameList;
+    }
+
+    /**
+     * 获取 附件名称
+     * @return annexNameNotList
+     */
+    public List<String> getAnnexNameNotList(){
+        return this.annexNameNotList;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameNotList
+     */
+    public void setAnnexNameNotList(List<String> annexNameNotList){
+        this.annexNameNotList = annexNameNotList;
+    }
+
+    /**
+     * 获取 附件地址
+     * @return annexUrlList
+     */
+    public List<String> getAnnexUrlList(){
+        return this.annexUrlList;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlList
+     */
+    public void setAnnexUrlList(List<String> annexUrlList){
+        this.annexUrlList = annexUrlList;
+    }
+
+    /**
+     * 获取 附件地址
+     * @return annexUrlNotList
+     */
+    public List<String> getAnnexUrlNotList(){
+        return this.annexUrlNotList;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlNotList
+     */
+    public void setAnnexUrlNotList(List<String> annexUrlNotList){
+        this.annexUrlNotList = annexUrlNotList;
+    }
+
+    /**
+     * 获取 开始 有效期起始
+     * @return validityStartStart
+     */
+    public String getValidityStartStart(){
+        return this.validityStartStart;
+    }
+
+    /**
+     * 设置 开始 有效期起始
+     * @param validityStartStart
+     */
+    public void setValidityStartStart(String validityStartStart){
+        this.validityStartStart = validityStartStart;
+    }
+
+    /**
+     * 获取 结束 有效期起始
+     * @return validityStartEnd
+     */
+    public String getValidityStartEnd(){
+        return this.validityStartEnd;
+    }
+
+    /**
+     * 设置 结束 有效期起始
+     * @param validityStartEnd
+     */
+    public void setValidityStartEnd(String validityStartEnd){
+        this.validityStartEnd = validityStartEnd;
+    }
+
+    /**
+     * 获取 开始 有效期截止
+     * @return validityEndStart
+     */
+    public String getValidityEndStart(){
+        return this.validityEndStart;
+    }
+
+    /**
+     * 设置 开始 有效期截止
+     * @param validityEndStart
+     */
+    public void setValidityEndStart(String validityEndStart){
+        this.validityEndStart = validityEndStart;
+    }
+
+    /**
+     * 获取 结束 有效期截止
+     * @return validityEndEnd
+     */
+    public String getValidityEndEnd(){
+        return this.validityEndEnd;
+    }
+
+    /**
+     * 设置 结束 有效期截止
+     * @param validityEndEnd
+     */
+    public void setValidityEndEnd(String validityEndEnd){
+        this.validityEndEnd = validityEndEnd;
+    }
+
+    /**
+     * 获取 开始 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @return holderTypeStart
+     */
+    public Integer getHolderTypeStart(){
+        return this.holderTypeStart;
+    }
+
+    /**
+     * 设置 开始 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeStart
+     */
+    public void setHolderTypeStart(Integer holderTypeStart){
+        this.holderTypeStart = holderTypeStart;
+    }
+
+    /**
+     * 获取 结束 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @return $holderTypeEnd
+     */
+    public Integer getHolderTypeEnd(){
+        return this.holderTypeEnd;
+    }
+
+    /**
+     * 设置 结束 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeEnd
+     */
+    public void setHolderTypeEnd(Integer holderTypeEnd){
+        this.holderTypeEnd = holderTypeEnd;
+    }
+
+    /**
+     * 获取 增加 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @return holderTypeIncrement
+     */
+    public Integer getHolderTypeIncrement(){
+        return this.holderTypeIncrement;
+    }
+
+    /**
+     * 设置 增加 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeIncrement
+     */
+    public void setHolderTypeIncrement(Integer holderTypeIncrement){
+        this.holderTypeIncrement = holderTypeIncrement;
+    }
+
+    /**
+     * 获取 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @return holderTypeList
+     */
+    public List<Integer> getHolderTypeList(){
+        return this.holderTypeList;
+    }
+
+    /**
+     * 设置 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeList
+     */
+    public void setHolderTypeList(List<Integer> holderTypeList){
+        this.holderTypeList = holderTypeList;
+    }
+
+    /**
+     * 获取 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @return holderTypeNotList
+     */
+    public List<Integer> getHolderTypeNotList(){
+        return this.holderTypeNotList;
+    }
+
+    /**
+     * 设置 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeNotList
+     */
+    public void setHolderTypeNotList(List<Integer> holderTypeNotList){
+        this.holderTypeNotList = holderTypeNotList;
+    }
+
+
+    /**
+     * 获取 开始 持有者证件类型，1：身份证，2：组织机构代码等
+     * @return holderIdTypeStart
+     */
+    public Integer getHolderIdTypeStart(){
+        return this.holderIdTypeStart;
+    }
+
+    /**
+     * 设置 开始 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeStart
+     */
+    public void setHolderIdTypeStart(Integer holderIdTypeStart){
+        this.holderIdTypeStart = holderIdTypeStart;
+    }
+
+    /**
+     * 获取 结束 持有者证件类型，1：身份证，2：组织机构代码等
+     * @return $holderIdTypeEnd
+     */
+    public Integer getHolderIdTypeEnd(){
+        return this.holderIdTypeEnd;
+    }
+
+    /**
+     * 设置 结束 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeEnd
+     */
+    public void setHolderIdTypeEnd(Integer holderIdTypeEnd){
+        this.holderIdTypeEnd = holderIdTypeEnd;
+    }
+
+    /**
+     * 获取 增加 持有者证件类型，1：身份证，2：组织机构代码等
+     * @return holderIdTypeIncrement
+     */
+    public Integer getHolderIdTypeIncrement(){
+        return this.holderIdTypeIncrement;
+    }
+
+    /**
+     * 设置 增加 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeIncrement
+     */
+    public void setHolderIdTypeIncrement(Integer holderIdTypeIncrement){
+        this.holderIdTypeIncrement = holderIdTypeIncrement;
+    }
+
+    /**
+     * 获取 持有者证件类型，1：身份证，2：组织机构代码等
+     * @return holderIdTypeList
+     */
+    public List<Integer> getHolderIdTypeList(){
+        return this.holderIdTypeList;
+    }
+
+    /**
+     * 设置 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeList
+     */
+    public void setHolderIdTypeList(List<Integer> holderIdTypeList){
+        this.holderIdTypeList = holderIdTypeList;
+    }
+
+    /**
+     * 获取 持有者证件类型，1：身份证，2：组织机构代码等
+     * @return holderIdTypeNotList
+     */
+    public List<Integer> getHolderIdTypeNotList(){
+        return this.holderIdTypeNotList;
+    }
+
+    /**
+     * 设置 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeNotList
+     */
+    public void setHolderIdTypeNotList(List<Integer> holderIdTypeNotList){
+        this.holderIdTypeNotList = holderIdTypeNotList;
+    }
+
+
+    /**
+     * 获取 专网ID
+     * @return privateIDList
+     */
+    public List<String> getPrivateIDList(){
+        return this.privateIDList;
+    }
+
+    /**
+     * 设置 专网ID
+     * @param privateIDList
+     */
+    public void setPrivateIDList(List<String> privateIDList){
+        this.privateIDList = privateIDList;
+    }
+
+    /**
+     * 获取 专网ID
+     * @return privateIDNotList
+     */
+    public List<String> getPrivateIDNotList(){
+        return this.privateIDNotList;
+    }
+
+    /**
+     * 设置 专网ID
+     * @param privateIDNotList
+     */
+    public void setPrivateIDNotList(List<String> privateIDNotList){
+        this.privateIDNotList = privateIDNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2097,6 +2515,174 @@ public class RetainLogQuery extends RetainLogEntity {
         return this;
     }
 
+
+
+    /**
+     * 设置 附件名称
+     * @param annexName
+     */
+    public RetainLogQuery annexName(String annexName){
+        setAnnexName(annexName);
+        return this;
+    }
+
+    /**
+     * 设置 附件名称
+     * @param annexNameList
+     */
+    public RetainLogQuery annexNameList(List<String> annexNameList){
+        this.annexNameList = annexNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 附件地址
+     * @param annexUrl
+     */
+    public RetainLogQuery annexUrl(String annexUrl){
+        setAnnexUrl(annexUrl);
+        return this;
+    }
+
+    /**
+     * 设置 附件地址
+     * @param annexUrlList
+     */
+    public RetainLogQuery annexUrlList(List<String> annexUrlList){
+        this.annexUrlList = annexUrlList;
+        return this;
+    }
+
+
+
+    /**
+     * 设置  持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderType
+     */
+    public RetainLogQuery holderType(Integer holderType){
+        setHolderType(holderType);
+        return this;
+    }
+
+    /**
+     * 设置 开始 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeStart
+     */
+    public RetainLogQuery holderTypeStart(Integer holderTypeStart){
+        this.holderTypeStart = holderTypeStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeEnd
+     */
+    public RetainLogQuery holderTypeEnd(Integer holderTypeEnd){
+        this.holderTypeEnd = holderTypeEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeIncrement
+     */
+    public RetainLogQuery holderTypeIncrement(Integer holderTypeIncrement){
+        this.holderTypeIncrement = holderTypeIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeList
+     */
+    public RetainLogQuery holderTypeList(List<Integer> holderTypeList){
+        this.holderTypeList = holderTypeList;
+        return this;
+    }
+
+    /**
+     * 设置 持有者类型，1：自然人，2：法人，3：自然人法人
+     * @param holderTypeNotList
+     */
+    public RetainLogQuery holderTypeNotList(List<Integer> holderTypeNotList){
+        this.holderTypeNotList = holderTypeNotList;
+        return this;
+    }
+
+    /**
+     * 设置  持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdType
+     */
+    public RetainLogQuery holderIdType(Integer holderIdType){
+        setHolderIdType(holderIdType);
+        return this;
+    }
+
+    /**
+     * 设置 开始 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeStart
+     */
+    public RetainLogQuery holderIdTypeStart(Integer holderIdTypeStart){
+        this.holderIdTypeStart = holderIdTypeStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeEnd
+     */
+    public RetainLogQuery holderIdTypeEnd(Integer holderIdTypeEnd){
+        this.holderIdTypeEnd = holderIdTypeEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeIncrement
+     */
+    public RetainLogQuery holderIdTypeIncrement(Integer holderIdTypeIncrement){
+        this.holderIdTypeIncrement = holderIdTypeIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeList
+     */
+    public RetainLogQuery holderIdTypeList(List<Integer> holderIdTypeList){
+        this.holderIdTypeList = holderIdTypeList;
+        return this;
+    }
+
+    /**
+     * 设置 持有者证件类型，1：身份证，2：组织机构代码等
+     * @param holderIdTypeNotList
+     */
+    public RetainLogQuery holderIdTypeNotList(List<Integer> holderIdTypeNotList){
+        this.holderIdTypeNotList = holderIdTypeNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 专网ID
+     * @param privateID
+     */
+    public RetainLogQuery privateID(String privateID){
+        setPrivateID(privateID);
+        return this;
+    }
+
+    /**
+     * 设置 专网ID
+     * @param privateIDList
+     */
+    public RetainLogQuery privateIDList(List<String> privateIDList){
+        this.privateIDList = privateIDList;
+        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/service/impl/PrintWaitQueueServiceImpl.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.record.dao.PrintLogDao;
 import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
 import com.mortals.xhx.module.record.dao.RetainLogDao;
 import com.mortals.xhx.module.record.model.*;
+import com.mortals.xhx.module.record.service.ApplyLogService;
 import com.mortals.xhx.module.record.service.PrintWaitQueueService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
     private CertificateClassifyService certificateClassifyService;
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ApplyLogService applyLogService;
 
     @Override
     protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
@@ -154,8 +157,9 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
 
     private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
         RetainLogEntity retainLogEntity = new RetainLogEntity();
+        ApplyLogEntity applyLogEntity = applyLogService.get(waitQueueEntity.getApplyId());
         Date now = new Date();
-        BeanUtils.copyProperties(waitQueueEntity, retainLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
+        BeanUtils.copyProperties(applyLogEntity, retainLogEntity, BeanUtil.getNullPropertyNames(applyLogEntity));
         retainLogEntity.setId(null);
         retainLogEntity.setUpdateUserId(null);
         retainLogEntity.setUpdateTime(null);
@@ -183,7 +187,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
         query.setTotalIncrement(1);
         query.setUpdateTime(now);
         certificateClassifyService.update(query);
-
-
+        ApplyLogEntity updateApply = new ApplyLogEntity();
+        updateApply.setId(applyLogEntity.getId());
+        updateApply.setRecordStatus(YesNoEnum.YES.getValue());
+        updateApply.setUpdateTime(new Date());
+        applyLogService.update(updateApply);
     }
 }
\ No newline at end of file

one-certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -31,6 +31,14 @@
         <result property="businessPlace" column="businessPlace" />
         <result property="licenseProject" column="licenseProject" />
         <result property="authority" column="authority" />
+        <result property="issueTime" column="issueTime" />
+        <result property="annexName" column="annexName" />
+        <result property="annexUrl" column="annexUrl" />
+        <result property="validityStart" column="validityStart" />
+        <result property="validityEnd" column="validityEnd" />
+        <result property="holderType" column="holderType" />
+        <result property="holderIdType" column="holderIdType" />
+        <result property="privateID" column="privateID" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -114,23 +122,47 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authority') or colPickMode == 1 and data.containsKey('authority')))">
                 a.authority,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('issueTime') or colPickMode == 1 and data.containsKey('issueTime')))">
+                a.issueTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexName') or colPickMode == 1 and data.containsKey('annexName')))">
+                a.annexName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('annexUrl') or colPickMode == 1 and data.containsKey('annexUrl')))">
+                a.annexUrl,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityStart') or colPickMode == 1 and data.containsKey('validityStart')))">
+                a.validityStart,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityEnd') or colPickMode == 1 and data.containsKey('validityEnd')))">
+                a.validityEnd,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderType') or colPickMode == 1 and data.containsKey('holderType')))">
+                a.holderType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIdType') or colPickMode == 1 and data.containsKey('holderIdType')))">
+                a.holderIdType,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('privateID') or colPickMode == 1 and data.containsKey('privateID')))">
+                a.privateID,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="RetainLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_retain_log
-        (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority)
+        (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,issueTime,annexName,annexUrl,validityStart,validityEnd,holderType,holderIdType,privateID)
         VALUES
-        (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{legalPerson},#{socialCode},#{qRCode},#{holderName},#{holderIDCardNo},#{mobile},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority})
+        (#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{legalPerson},#{socialCode},#{qRCode},#{holderName},#{holderIDCardNo},#{mobile},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{industryName},#{businessPlace},#{licenseProject},#{authority},#{issueTime},#{annexName},#{annexUrl},#{validityStart},#{validityEnd},#{holderType},#{holderIdType},#{privateID})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_retain_log
-        (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority)
+        (siteId,recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,legalPerson,socialCode,qRCode,holderName,holderIDCardNo,mobile,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,industryName,businessPlace,licenseProject,authority,issueTime,annexName,annexUrl,validityStart,validityEnd,holderType,holderIdType,privateID)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.qRCode},#{item.holderName},#{item.holderIDCardNo},#{item.mobile},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority})
+            (#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.legalPerson},#{item.socialCode},#{item.qRCode},#{item.holderName},#{item.holderIDCardNo},#{item.mobile},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.industryName},#{item.businessPlace},#{item.licenseProject},#{item.authority},#{item.issueTime},#{item.annexName},#{item.annexUrl},#{item.validityStart},#{item.validityEnd},#{item.holderType},#{item.holderIdType},#{item.privateID})
         </foreach>
     </insert>
 
@@ -233,6 +265,36 @@
             <if test="(colPickMode==0 and data.containsKey('authority')) or (colPickMode==1 and !data.containsKey('authority'))">
                 a.authority=#{data.authority},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('issueTime')) or (colPickMode==1 and !data.containsKey('issueTime'))">
+                a.issueTime=#{data.issueTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('annexName')) or (colPickMode==1 and !data.containsKey('annexName'))">
+                a.annexName=#{data.annexName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('annexUrl')) or (colPickMode==1 and !data.containsKey('annexUrl'))">
+                a.annexUrl=#{data.annexUrl},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('validityStart')) or (colPickMode==1 and !data.containsKey('validityStart'))">
+                a.validityStart=#{data.validityStart},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('validityEnd')) or (colPickMode==1 and !data.containsKey('validityEnd'))">
+                a.validityEnd=#{data.validityEnd},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('holderType')) or (colPickMode==1 and !data.containsKey('holderType'))">
+                a.holderType=#{data.holderType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('holderTypeIncrement')) or (colPickMode==1 and !data.containsKey('holderTypeIncrement'))">
+                a.holderType=ifnull(a.holderType,0) + #{data.holderTypeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('holderIdType')) or (colPickMode==1 and !data.containsKey('holderIdType'))">
+                a.holderIdType=#{data.holderIdType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('holderIdTypeIncrement')) or (colPickMode==1 and !data.containsKey('holderIdTypeIncrement'))">
+                a.holderIdType=ifnull(a.holderIdType,0) + #{data.holderIdTypeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('privateID')) or (colPickMode==1 and !data.containsKey('privateID'))">
+                a.privateID=#{data.privateID},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -450,6 +512,72 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="issueTime=(case" suffix="ELSE issueTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('issueTime')) or (colPickMode==1 and !item.containsKey('issueTime'))">
+                        when a.id=#{item.id} then #{item.issueTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="annexName=(case" suffix="ELSE annexName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('annexName')) or (colPickMode==1 and !item.containsKey('annexName'))">
+                        when a.id=#{item.id} then #{item.annexName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="annexUrl=(case" suffix="ELSE annexUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('annexUrl')) or (colPickMode==1 and !item.containsKey('annexUrl'))">
+                        when a.id=#{item.id} then #{item.annexUrl}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="validityStart=(case" suffix="ELSE validityStart end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('validityStart')) or (colPickMode==1 and !item.containsKey('validityStart'))">
+                        when a.id=#{item.id} then #{item.validityStart}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="validityEnd=(case" suffix="ELSE validityEnd end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('validityEnd')) or (colPickMode==1 and !item.containsKey('validityEnd'))">
+                        when a.id=#{item.id} then #{item.validityEnd}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="holderType=(case" suffix="ELSE holderType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('holderType')) or (colPickMode==1 and !item.containsKey('holderType'))">
+                            when a.id=#{item.id} then #{item.holderType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('holderTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.holderType,0) + #{item.holderTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="holderIdType=(case" suffix="ELSE holderIdType end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('holderIdType')) or (colPickMode==1 and !item.containsKey('holderIdType'))">
+                            when a.id=#{item.id} then #{item.holderIdType}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('holderIdTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderIdTypeIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.holderIdType,0) + #{item.holderIdTypeIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="privateID=(case" suffix="ELSE privateID end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('privateID')) or (colPickMode==1 and !item.containsKey('privateID'))">
+                        when a.id=#{item.id} then #{item.privateID}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1146,6 +1274,168 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('issueTime')">
+            <if test="conditionParamRef.issueTime != null ">
+                ${_conditionType_} a.issueTime = #{${_conditionParam_}.issueTime}
+            </if>
+            <if test="conditionParamRef.issueTime == null">
+                ${_conditionType_} a.issueTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('issueTimeStart') and conditionParamRef.issueTimeStart != null and conditionParamRef.issueTimeStart!=''">
+            ${_conditionType_} a.issueTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.issueTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('issueTimeEnd') and conditionParamRef.issueTimeEnd != null and conditionParamRef.issueTimeEnd!=''">
+            ${_conditionType_} a.issueTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.issueTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('annexName')">
+            <if test="conditionParamRef.annexName != null and conditionParamRef.annexName != ''">
+                ${_conditionType_} a.annexName like #{${_conditionParam_}.annexName}
+            </if>
+            <if test="conditionParamRef.annexName == null">
+                ${_conditionType_} a.annexName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('annexNameList') and conditionParamRef.annexNameList.size() > 0">
+            ${_conditionType_} a.annexName in
+            <foreach collection="conditionParamRef.annexNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('annexNameNotList') and conditionParamRef.annexNameNotList.size() > 0">
+            ${_conditionType_} a.annexName not in
+            <foreach collection="conditionParamRef.annexNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('annexUrl')">
+            <if test="conditionParamRef.annexUrl != null and conditionParamRef.annexUrl != ''">
+                ${_conditionType_} a.annexUrl like #{${_conditionParam_}.annexUrl}
+            </if>
+            <if test="conditionParamRef.annexUrl == null">
+                ${_conditionType_} a.annexUrl is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('annexUrlList') and conditionParamRef.annexUrlList.size() > 0">
+            ${_conditionType_} a.annexUrl in
+            <foreach collection="conditionParamRef.annexUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('annexUrlNotList') and conditionParamRef.annexUrlNotList.size() > 0">
+            ${_conditionType_} a.annexUrl not in
+            <foreach collection="conditionParamRef.annexUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('validityStart')">
+            <if test="conditionParamRef.validityStart != null ">
+                ${_conditionType_} a.validityStart = #{${_conditionParam_}.validityStart}
+            </if>
+            <if test="conditionParamRef.validityStart == null">
+                ${_conditionType_} a.validityStart is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('validityStartStart') and conditionParamRef.validityStartStart != null and conditionParamRef.validityStartStart!=''">
+            ${_conditionType_} a.validityStart <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityStartStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('validityStartEnd') and conditionParamRef.validityStartEnd != null and conditionParamRef.validityStartEnd!=''">
+            ${_conditionType_} a.validityStart <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityStartEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+
+        <if test="conditionParamRef.containsKey('validityEnd')">
+            <if test="conditionParamRef.validityEnd != null ">
+                ${_conditionType_} a.validityEnd = #{${_conditionParam_}.validityEnd}
+            </if>
+            <if test="conditionParamRef.validityEnd == null">
+                ${_conditionType_} a.validityEnd is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('validityEndStart') and conditionParamRef.validityEndStart != null and conditionParamRef.validityEndStart!=''">
+            ${_conditionType_} a.validityEnd <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityEndStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('validityEndEnd') and conditionParamRef.validityEndEnd != null and conditionParamRef.validityEndEnd!=''">
+            ${_conditionType_} a.validityEnd <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.validityEndEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('holderType')">
+            <if test="conditionParamRef.holderType != null ">
+                ${_conditionType_} a.holderType = #{${_conditionParam_}.holderType}
+            </if>
+            <if test="conditionParamRef.holderType == null">
+                ${_conditionType_} a.holderType is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
+            ${_conditionType_} a.holderType in
+            <foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('holderTypeNotList') and conditionParamRef.holderTypeNotList.size() > 0">
+            ${_conditionType_} a.holderType not in
+            <foreach collection="conditionParamRef.holderTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null">
+            ${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('holderTypeEnd') and conditionParamRef.holderTypeEnd != null">
+            ${_conditionType_} a.holderType <![CDATA[ <= ]]> #{${_conditionParam_}.holderTypeEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('holderIdType')">
+            <if test="conditionParamRef.holderIdType != null ">
+                ${_conditionType_} a.holderIdType = #{${_conditionParam_}.holderIdType}
+            </if>
+            <if test="conditionParamRef.holderIdType == null">
+                ${_conditionType_} a.holderIdType is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
+            ${_conditionType_} a.holderIdType in
+            <foreach collection="conditionParamRef.holderIdTypeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('holderIdTypeNotList') and conditionParamRef.holderIdTypeNotList.size() > 0">
+            ${_conditionType_} a.holderIdType not in
+            <foreach collection="conditionParamRef.holderIdTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('holderIdTypeStart') and conditionParamRef.holderIdTypeStart != null">
+            ${_conditionType_} a.holderIdType <![CDATA[ >= ]]> #{${_conditionParam_}.holderIdTypeStart}
+        </if>
+        <if test="conditionParamRef.containsKey('holderIdTypeEnd') and conditionParamRef.holderIdTypeEnd != null">
+            ${_conditionType_} a.holderIdType <![CDATA[ <= ]]> #{${_conditionParam_}.holderIdTypeEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('privateID')">
+            <if test="conditionParamRef.privateID != null and conditionParamRef.privateID != ''">
+                ${_conditionType_} a.privateID like #{${_conditionParam_}.privateID}
+            </if>
+            <if test="conditionParamRef.privateID == null">
+                ${_conditionType_} a.privateID is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('privateIDList') and conditionParamRef.privateIDList.size() > 0">
+            ${_conditionType_} a.privateID in
+            <foreach collection="conditionParamRef.privateIDList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('privateIDNotList') and conditionParamRef.privateIDNotList.size() > 0">
+            ${_conditionType_} a.privateID not in
+            <foreach collection="conditionParamRef.privateIDNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1199,6 +1489,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
+                field(a.holderType,
+                <foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
+                field(a.holderIdType,
+                <foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     a.${item.colName} ${item.sortKind}
@@ -1256,6 +1560,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
+                field(a.holderType,
+                <foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
+                field(a.holderIdType,
+                <foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1387,6 +1705,46 @@
                     <if test='orderCol.authority != null and "DESC".equalsIgnoreCase(orderCol.authority)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('issueTime')">
+                    a.issueTime
+                    <if test='orderCol.issueTime != null and "DESC".equalsIgnoreCase(orderCol.issueTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('annexName')">
+                    a.annexName
+                    <if test='orderCol.annexName != null and "DESC".equalsIgnoreCase(orderCol.annexName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('annexUrl')">
+                    a.annexUrl
+                    <if test='orderCol.annexUrl != null and "DESC".equalsIgnoreCase(orderCol.annexUrl)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('validityStart')">
+                    a.validityStart
+                    <if test='orderCol.validityStart != null and "DESC".equalsIgnoreCase(orderCol.validityStart)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('validityEnd')">
+                    a.validityEnd
+                    <if test='orderCol.validityEnd != null and "DESC".equalsIgnoreCase(orderCol.validityEnd)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('holderType')">
+                    a.holderType
+                    <if test='orderCol.holderType != null and "DESC".equalsIgnoreCase(orderCol.holderType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('holderIdType')">
+                    a.holderIdType
+                    <if test='orderCol.holderIdType != null and "DESC".equalsIgnoreCase(orderCol.holderIdType)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('privateID')">
+                    a.privateID
+                    <if test='orderCol.privateID != null and "DESC".equalsIgnoreCase(orderCol.privateID)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>