Merge remote-tracking branch 'origin/master'

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/CertificateChildDao.java

+package com.mortals.xhx.module.certificate.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.List;
+/**
+* 目录子证Dao
+* 目录子证 DAO接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+
+public interface  CertificateChildDao extends ICRUDDao<CertificateChildEntity,Long>{
+
+
+}

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/ibatis/CertificateChildDaoImpl.java

+package com.mortals.xhx.module.certificate.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 目录子证DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Repository("certificateChildDao")
+public class CertificateChildDaoImpl extends BaseCRUDDaoMybatis<CertificateChildEntity,Long> implements CertificateChildDao {
+
+
+
+}

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

+package com.mortals.xhx.module.certificate.model;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.vo.CertificateChildVo;
+import lombok.Data;
+/**
+* 目录子证实体对象
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Data
+public class CertificateChildEntity extends CertificateChildVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点id
+    */
+    private Long siteId;
+    /**
+    * 证照目录id
+    */
+    private Long catalogId;
+    /**
+    * 子证id
+    */
+    private Long documentId;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof CertificateChildEntity) {
+            CertificateChildEntity tmp = (CertificateChildEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.siteId = null;
+            this.catalogId = null;
+            this.documentId = null;
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.certificate.model;
+
+import java.util.List;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+/**
+* 目录子证查询对象
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+public class CertificateChildQuery extends CertificateChildEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 开始 证照目录id */
+    private Long catalogIdStart;
+
+    /** 结束 证照目录id */
+    private Long catalogIdEnd;
+
+    /** 增加 证照目录id */
+    private Long catalogIdIncrement;
+
+    /** 证照目录id列表 */
+    private List <Long> catalogIdList;
+
+    /** 证照目录id排除列表 */
+    private List <Long> catalogIdNotList;
+
+    /** 开始 子证id */
+    private Long documentIdStart;
+
+    /** 结束 子证id */
+    private Long documentIdEnd;
+
+    /** 增加 子证id */
+    private Long documentIdIncrement;
+
+    /** 子证id列表 */
+    private List <Long> documentIdList;
+
+    /** 子证id排除列表 */
+    private List <Long> documentIdNotList;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<CertificateChildQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<CertificateChildQuery> andConditionList;
+
+    public CertificateChildQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 站点id
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点id
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点id
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点id
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点id
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点id
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点id
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点id
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 站点id
+    * @return siteIdNotList
+    */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+    * 设置 站点id
+    * @param siteIdNotList
+    */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 证照目录id
+    * @return catalogIdStart
+    */
+    public Long getCatalogIdStart(){
+        return this.catalogIdStart;
+    }
+
+    /**
+    * 设置 开始 证照目录id
+    * @param catalogIdStart
+    */
+    public void setCatalogIdStart(Long catalogIdStart){
+        this.catalogIdStart = catalogIdStart;
+    }
+
+    /**
+    * 获取 结束 证照目录id
+    * @return $catalogIdEnd
+    */
+    public Long getCatalogIdEnd(){
+        return this.catalogIdEnd;
+    }
+
+    /**
+    * 设置 结束 证照目录id
+    * @param catalogIdEnd
+    */
+    public void setCatalogIdEnd(Long catalogIdEnd){
+        this.catalogIdEnd = catalogIdEnd;
+    }
+
+    /**
+    * 获取 增加 证照目录id
+    * @return catalogIdIncrement
+    */
+    public Long getCatalogIdIncrement(){
+        return this.catalogIdIncrement;
+    }
+
+    /**
+    * 设置 增加 证照目录id
+    * @param catalogIdIncrement
+    */
+    public void setCatalogIdIncrement(Long catalogIdIncrement){
+        this.catalogIdIncrement = catalogIdIncrement;
+    }
+
+    /**
+    * 获取 证照目录id
+    * @return catalogIdList
+    */
+    public List<Long> getCatalogIdList(){
+        return this.catalogIdList;
+    }
+
+    /**
+    * 设置 证照目录id
+    * @param catalogIdList
+    */
+    public void setCatalogIdList(List<Long> catalogIdList){
+        this.catalogIdList = catalogIdList;
+    }
+
+    /**
+    * 获取 证照目录id
+    * @return catalogIdNotList
+    */
+    public List<Long> getCatalogIdNotList(){
+        return this.catalogIdNotList;
+    }
+
+    /**
+    * 设置 证照目录id
+    * @param catalogIdNotList
+    */
+    public void setCatalogIdNotList(List<Long> catalogIdNotList){
+        this.catalogIdNotList = catalogIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 子证id
+    * @return documentIdStart
+    */
+    public Long getDocumentIdStart(){
+        return this.documentIdStart;
+    }
+
+    /**
+    * 设置 开始 子证id
+    * @param documentIdStart
+    */
+    public void setDocumentIdStart(Long documentIdStart){
+        this.documentIdStart = documentIdStart;
+    }
+
+    /**
+    * 获取 结束 子证id
+    * @return $documentIdEnd
+    */
+    public Long getDocumentIdEnd(){
+        return this.documentIdEnd;
+    }
+
+    /**
+    * 设置 结束 子证id
+    * @param documentIdEnd
+    */
+    public void setDocumentIdEnd(Long documentIdEnd){
+        this.documentIdEnd = documentIdEnd;
+    }
+
+    /**
+    * 获取 增加 子证id
+    * @return documentIdIncrement
+    */
+    public Long getDocumentIdIncrement(){
+        return this.documentIdIncrement;
+    }
+
+    /**
+    * 设置 增加 子证id
+    * @param documentIdIncrement
+    */
+    public void setDocumentIdIncrement(Long documentIdIncrement){
+        this.documentIdIncrement = documentIdIncrement;
+    }
+
+    /**
+    * 获取 子证id
+    * @return documentIdList
+    */
+    public List<Long> getDocumentIdList(){
+        return this.documentIdList;
+    }
+
+    /**
+    * 设置 子证id
+    * @param documentIdList
+    */
+    public void setDocumentIdList(List<Long> documentIdList){
+        this.documentIdList = documentIdList;
+    }
+
+    /**
+    * 获取 子证id
+    * @return documentIdNotList
+    */
+    public List<Long> getDocumentIdNotList(){
+        return this.documentIdNotList;
+    }
+
+    /**
+    * 设置 子证id
+    * @param documentIdNotList
+    */
+    public void setDocumentIdNotList(List<Long> documentIdNotList){
+        this.documentIdNotList = documentIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public CertificateChildQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public CertificateChildQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public CertificateChildQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public CertificateChildQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public CertificateChildQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public CertificateChildQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  站点id
+    * @param siteId
+    */
+    public CertificateChildQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点id
+    * @param siteIdStart
+    */
+    public CertificateChildQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点id
+    * @param siteIdEnd
+    */
+    public CertificateChildQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点id
+    * @param siteIdIncrement
+    */
+    public CertificateChildQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点id
+    * @param siteIdList
+    */
+    public CertificateChildQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点id
+        * @param siteIdNotList
+        */
+        public CertificateChildQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  证照目录id
+    * @param catalogId
+    */
+    public CertificateChildQuery catalogId(Long catalogId){
+	    setCatalogId(catalogId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 证照目录id
+    * @param catalogIdStart
+    */
+    public CertificateChildQuery catalogIdStart(Long catalogIdStart){
+		this.catalogIdStart = catalogIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 证照目录id
+    * @param catalogIdEnd
+    */
+    public CertificateChildQuery catalogIdEnd(Long catalogIdEnd){
+		this.catalogIdEnd = catalogIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 证照目录id
+    * @param catalogIdIncrement
+    */
+    public CertificateChildQuery catalogIdIncrement(Long catalogIdIncrement){
+		this.catalogIdIncrement = catalogIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 证照目录id
+    * @param catalogIdList
+    */
+    public CertificateChildQuery catalogIdList(List<Long> catalogIdList){
+        this.catalogIdList = catalogIdList;
+		return this;
+        }
+
+        /**
+        * 设置 证照目录id
+        * @param catalogIdNotList
+        */
+        public CertificateChildQuery catalogIdNotList(List<Long> catalogIdNotList){
+        this.catalogIdNotList = catalogIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  子证id
+    * @param documentId
+    */
+    public CertificateChildQuery documentId(Long documentId){
+	    setDocumentId(documentId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 子证id
+    * @param documentIdStart
+    */
+    public CertificateChildQuery documentIdStart(Long documentIdStart){
+		this.documentIdStart = documentIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 子证id
+    * @param documentIdEnd
+    */
+    public CertificateChildQuery documentIdEnd(Long documentIdEnd){
+		this.documentIdEnd = documentIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 子证id
+    * @param documentIdIncrement
+    */
+    public CertificateChildQuery documentIdIncrement(Long documentIdIncrement){
+		this.documentIdIncrement = documentIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 子证id
+    * @param documentIdList
+    */
+    public CertificateChildQuery documentIdList(List<Long> documentIdList){
+        this.documentIdList = documentIdList;
+		return this;
+        }
+
+        /**
+        * 设置 子证id
+        * @param documentIdNotList
+        */
+        public CertificateChildQuery documentIdNotList(List<Long> documentIdNotList){
+        this.documentIdNotList = documentIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public CertificateChildQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public CertificateChildQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public CertificateChildQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public CertificateChildQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public CertificateChildQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public CertificateChildQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public CertificateChildQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public CertificateChildQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public CertificateChildQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public CertificateChildQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public CertificateChildQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public CertificateChildQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<CertificateChildQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<CertificateChildQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<CertificateChildQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<CertificateChildQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentVo;
 import lombok.Data;
 /**
-* 子证配置实体对象
-*
-* @author zxfei
-* @date 2024-07-27
-*/
+ * 子证配置实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-28
+ */
 @Data
 public class CertificateDocumentEntity extends CertificateDocumentVo {
     private static final long serialVersionUID = 1L;
@@ -39,6 +39,14 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
      * 状态，0：禁用1：启用
      */
     private Integer status;
+    /**
+     * 照面内容模板
+     */
+    private String templateContent;
+    /**
+     * 内容表单
+     */
+    private String formContent;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -61,5 +69,7 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
         this.deptName = "";
         this.documentName = "";
         this.status = 1;
+        this.templateContent = "";
+        this.formContent = "";
     }
 }
\ No newline at end of file

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

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
 import java.util.List;
 import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
 /**
-* 子证配置查询对象
-*
-* @author zxfei
-* @date 2024-07-27
-*/
+ * 子证配置查询对象
+ *
+ * @author zxfei
+ * @date 2024-07-28
+ */
 public class CertificateDocumentQuery extends CertificateDocumentEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -121,6 +121,16 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 照面内容模板 */
+    private List<String> templateContentList;
+
+    /** 照面内容模板排除列表 */
+    private List <String> templateContentNotList;
+    /** 内容表单 */
+    private List<String> formContentList;
+
+    /** 内容表单排除列表 */
+    private List <String> formContentNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CertificateDocumentQuery> orConditionList;
 
@@ -743,6 +753,70 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 照面内容模板
+     * @return templateContentList
+     */
+    public List<String> getTemplateContentList(){
+        return this.templateContentList;
+    }
+
+    /**
+     * 设置 照面内容模板
+     * @param templateContentList
+     */
+    public void setTemplateContentList(List<String> templateContentList){
+        this.templateContentList = templateContentList;
+    }
+
+    /**
+     * 获取 照面内容模板
+     * @return templateContentNotList
+     */
+    public List<String> getTemplateContentNotList(){
+        return this.templateContentNotList;
+    }
+
+    /**
+     * 设置 照面内容模板
+     * @param templateContentNotList
+     */
+    public void setTemplateContentNotList(List<String> templateContentNotList){
+        this.templateContentNotList = templateContentNotList;
+    }
+
+    /**
+     * 获取 内容表单
+     * @return formContentList
+     */
+    public List<String> getFormContentList(){
+        return this.formContentList;
+    }
+
+    /**
+     * 设置 内容表单
+     * @param formContentList
+     */
+    public void setFormContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+    }
+
+    /**
+     * 获取 内容表单
+     * @return formContentNotList
+     */
+    public List<String> getFormContentNotList(){
+        return this.formContentNotList;
+    }
+
+    /**
+     * 设置 内容表单
+     * @param formContentNotList
+     */
+    public void setFormContentNotList(List<String> formContentNotList){
+        this.formContentNotList = formContentNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1107,6 +1181,44 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
     }
 
 
+
+    /**
+     * 设置 照面内容模板
+     * @param templateContent
+     */
+    public CertificateDocumentQuery templateContent(String templateContent){
+        setTemplateContent(templateContent);
+        return this;
+    }
+
+    /**
+     * 设置 照面内容模板
+     * @param templateContentList
+     */
+    public CertificateDocumentQuery templateContentList(List<String> templateContentList){
+        this.templateContentList = templateContentList;
+        return this;
+    }
+
+
+    /**
+     * 设置 内容表单
+     * @param formContent
+     */
+    public CertificateDocumentQuery formContent(String formContent){
+        setFormContent(formContent);
+        return this;
+    }
+
+    /**
+     * 设置 内容表单
+     * @param formContentList
+     */
+    public CertificateDocumentQuery formContentList(List<String> formContentList){
+        this.formContentList = formContentList;
+        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/certificate/model/vo/CertificateChildVo.java

+package com.mortals.xhx.module.certificate.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 目录子证视图对象
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Data
+public class CertificateChildVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/CertificateChildService.java

+package com.mortals.xhx.module.certificate.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+/**
+* CertificateChildService
+*
+* 目录子证 service接口
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+public interface CertificateChildService extends ICRUDService<CertificateChildEntity,Long>{
+
+    CertificateChildDao getDao();
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateChildServiceImpl.java

+package com.mortals.xhx.module.certificate.service.impl;
+import org.springframework.beans.BeanUtils;
+import java.util.function.Function;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.certificate.dao.CertificateChildDao;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.service.CertificateChildService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* CertificateChildService
+* 目录子证 service实现
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@Service("certificateChildService")
+@Slf4j
+public class CertificateChildServiceImpl extends AbstractCRUDServiceImpl<CertificateChildDao, CertificateChildEntity, Long> implements CertificateChildService {
+    
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateChildController.java

+package com.mortals.xhx.module.certificate.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
+import com.mortals.xhx.module.certificate.service.CertificateChildService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+import com.mortals.xhx.common.code.*;
+/**
+*
+* 目录子证
+*
+* @author zxfei
+* @date 2024-07-28
+*/
+@RestController
+@RequestMapping("certificate/child")
+public class CertificateChildController extends BaseCRUDJsonBodyMappingController<CertificateChildService,CertificateChildEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public CertificateChildController(){
+        super.setModuleDesc( "目录子证");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateChildDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="CertificateChildEntity" id="CertificateChildEntity-Map">
+            <id  property="id" column="id" />
+            <result property="siteId" column="siteId" />
+            <result property="catalogId" column="catalogId" />
+            <result property="documentId" column="documentId" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+    </resultMap>
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.siteId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
+                    a.catalogId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('documentId') or colPickMode == 1 and data.containsKey('documentId')))">
+                    a.documentId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="CertificateChildEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_certificate_child
+        (siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{siteId},#{catalogId},#{documentId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_certificate_child
+        (siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.catalogId},#{item.documentId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_certificate_child as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
+                a.catalogId=#{data.catalogId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
+                a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('documentId')) or (colPickMode==1 and !data.containsKey('documentId'))">
+                a.documentId=#{data.documentId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('documentIdIncrement')) or (colPickMode==1 and !data.containsKey('documentIdIncrement'))">
+                a.documentId=ifnull(a.documentId,0) + #{data.documentIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_certificate_child as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                                        when a.id=#{item.id} then #{item.siteId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
+                                        when a.id=#{item.id} then #{item.catalogId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="documentId=(case" suffix="ELSE documentId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('documentId')) or (colPickMode==1 and !item.containsKey('documentId'))">
+                                        when a.id=#{item.id} then #{item.documentId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('documentIdIncrement')) or (colPickMode==1 and !item.containsKey('documentIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.documentId,0) + #{item.documentIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="CertificateChildEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_certificate_child as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_certificate_child as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_certificate_child where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_certificate_child where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_certificate_child where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_certificate_child as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="CertificateChildEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_certificate_child as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_certificate_child as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.siteId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.siteId in
+                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+                ${_conditionType_} a.siteId not in
+                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('catalogId')">
+                <if test="conditionParamRef.catalogId != null ">
+                    ${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
+                </if>
+                <if test="conditionParamRef.catalogId == null">
+                    ${_conditionType_} a.catalogId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
+                ${_conditionType_} a.catalogId in
+                <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
+                ${_conditionType_} a.catalogId not in
+                <foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
+                ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
+                ${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('documentId')">
+                <if test="conditionParamRef.documentId != null ">
+                    ${_conditionType_} a.documentId = #{${_conditionParam_}.documentId}
+                </if>
+                <if test="conditionParamRef.documentId == null">
+                    ${_conditionType_} a.documentId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('documentIdList') and conditionParamRef.documentIdList.size() > 0">
+                ${_conditionType_} a.documentId in
+                <foreach collection="conditionParamRef.documentIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('documentIdNotList') and conditionParamRef.documentIdNotList.size() > 0">
+                ${_conditionType_} a.documentId not in
+                <foreach collection="conditionParamRef.documentIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('documentIdStart') and conditionParamRef.documentIdStart != null">
+                ${_conditionType_} a.documentId <![CDATA[ >= ]]> #{${_conditionParam_}.documentIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('documentIdEnd') and conditionParamRef.documentIdEnd != null">
+                ${_conditionType_} a.documentId <![CDATA[ <= ]]> #{${_conditionParam_}.documentIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
+                        field(a.catalogId,
+                        <foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('documentIdList') and conditionParamRef.documentIdList.size() > 0">
+                        field(a.documentId,
+                        <foreach collection="conditionParamRef.documentIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" 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}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+                    <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                        field(a.id,
+                        <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                        field(a.siteId,
+                        <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
+                        field(a.catalogId,
+                        <foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('documentIdList') and conditionParamRef.documentIdList.size() > 0">
+                        field(a.documentId,
+                        <foreach collection="conditionParamRef.documentIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                        field(a.createUserId,
+                        <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+                    <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                        field(a.updateUserId,
+                        <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
+                            #{item}
+                        </foreach>
+                        ,
+                    </if>
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.siteId
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('catalogId')">
+                        a.catalogId
+                        <if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('documentId')">
+                        a.documentId
+                        <if test='orderCol.documentId != null and "DESC".equalsIgnoreCase(orderCol.documentId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+
+
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateDocumentMapper.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.certificate.dao.ibatis.CertificateDocumentDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -15,6 +15,8 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="templateContent" column="templateContent" />
+        <result property="formContent" column="formContent" />
     </resultMap>
 
     <!-- 表所有列 -->
@@ -50,23 +52,29 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateContent') or colPickMode == 1 and data.containsKey('templateContent')))">
+                a.templateContent,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
+                a.formContent,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CertificateDocumentEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_certificate_document
-        (siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime)
+        (siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime,templateContent,formContent)
         VALUES
-        (#{siteId},#{deptId},#{deptName},#{documentName},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{deptId},#{deptName},#{documentName},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{templateContent},#{formContent})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_certificate_document
-        (siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime)
+        (siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime,templateContent,formContent)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.deptId},#{item.deptName},#{item.documentName},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.deptId},#{item.deptName},#{item.documentName},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.templateContent},#{item.formContent})
         </foreach>
     </insert>
 
@@ -118,6 +126,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('templateContent')) or (colPickMode==1 and !data.containsKey('templateContent'))">
+                a.templateContent=#{data.templateContent},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
+                a.formContent=#{data.formContent},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -218,6 +232,20 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="templateContent=(case" suffix="ELSE templateContent end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('templateContent')) or (colPickMode==1 and !item.containsKey('templateContent'))">
+                        when a.id=#{item.id} then #{item.templateContent}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="formContent=(case" suffix="ELSE formContent end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
+                        when a.id=#{item.id} then #{item.formContent}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -572,6 +600,48 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('templateContent')">
+            <if test="conditionParamRef.templateContent != null and conditionParamRef.templateContent != ''">
+                ${_conditionType_} a.templateContent like #{${_conditionParam_}.templateContent}
+            </if>
+            <if test="conditionParamRef.templateContent == null">
+                ${_conditionType_} a.templateContent is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('templateContentList') and conditionParamRef.templateContentList.size() > 0">
+            ${_conditionType_} a.templateContent in
+            <foreach collection="conditionParamRef.templateContentList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('templateContentNotList') and conditionParamRef.templateContentNotList.size() > 0">
+            ${_conditionType_} a.templateContent not in
+            <foreach collection="conditionParamRef.templateContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('formContent')">
+            <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
+                ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
+            </if>
+            <if test="conditionParamRef.formContent == null">
+                ${_conditionType_} a.formContent is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
+            ${_conditionType_} a.formContent in
+            <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
+            ${_conditionType_} a.formContent not in
+            <foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -719,6 +789,16 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('templateContent')">
+                    a.templateContent
+                    <if test='orderCol.templateContent != null and "DESC".equalsIgnoreCase(orderCol.templateContent)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('formContent')">
+                    a.formContent
+                    <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>