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/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/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>