Skip to content

O
one-certificate-system
Commit d5b27230 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加目录字段

parent 80744fe2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2663 additions and 864 deletions
one-certificate-manager/db/add_db.sql
View file @ d5b27230
......@@ -49,3 +49,36 @@ CREATE TABLE `mortals_xhx_child_license` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '行业许可子证' ROW_FORMAT = Dynamic;
ALTER TABLE mortals_xhx_child_license ADD COLUMN `resolutionValue` varchar(64) DEFAULT '' COMMENT '设备分辨率' AFTER resolution;
-- ----------------------------
-- 2024-07-30
-- ----------------------------
ALTER TABLE mortals_xhx_child_license
ADD COLUMN `shortName` varchar(64) DEFAULT '' COMMENT '简称' ,
ADD COLUMN `ext1` varchar(255) DEFAULT '' COMMENT '扩展列1' ,
ADD COLUMN `ext2` varchar(255) DEFAULT '' COMMENT '扩展列2' ,
ADD COLUMN `ext3` varchar(255) DEFAULT '' COMMENT '扩展列3' ,
ADD COLUMN `ext4` varchar(255) DEFAULT '' COMMENT '扩展列4' ,
ADD COLUMN `ext5` varchar(255) DEFAULT '' COMMENT '扩展列5' ,
ADD COLUMN `ext6` varchar(255) DEFAULT '' COMMENT '扩展列6' ,
ADD COLUMN `ext7` varchar(255) DEFAULT '' COMMENT '扩展列7' ,
ADD COLUMN `ext8` varchar(255) DEFAULT '' COMMENT '扩展列8' ,
ADD COLUMN `childStatus` tinyint(2) DEFAULT '1' COMMENT '子证状态(0.禁用,1.启用)',
ADD COLUMN `deleted` tinyint(2) DEFAULT '0' COMMENT '删除状态(0.未删除,1.已删除)'
AFTER remark;
ALTER TABLE mortals_xhx_certificate_document
ADD COLUMN `shortName` varchar(64) DEFAULT '' COMMENT '简称' AFTER documentName ;
ALTER TABLE mortals_xhx_certificate_catalog
ADD COLUMN `shortName` varchar(64) DEFAULT '' COMMENT '简称' AFTER catalogCode ;
ALTER TABLE mortals_xhx_certificate_child
ADD COLUMN `catalogName` varchar(64) DEFAULT NULL COMMENT '目录名称',
ADD COLUMN `documentName` varchar(64) DEFAULT NULL COMMENT '子证名称'
AFTER catalogId ;
\ No newline at end of file
one-certificate-manager/pom.xml
View file @ d5b27230
......@@ -42,7 +42,7 @@
<id>test</id>
<properties>
<profiles.active>test</profiles.active>
<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15505</profiles.server.debug>
<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15506</profiles.server.debug>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ d5b27230
......@@ -15,7 +15,7 @@ import lombok.Data;
* 证照目录实体对象
*
* @author zxfei
* @date 2024-07-28
* @date 2024-07-30
*/
@Data
public class CertificateCatalogEntity extends CertificateCatalogVo {
......@@ -101,6 +101,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 打印机纸盒
*/
private String paperSource;
/**
* 简称
*/
private String shortName;
/**
* 目录子证信息
*/
......@@ -149,5 +153,6 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.printerName = "";
this.printerIp = "";
this.paperSource = "";
this.shortName = "";
}
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ d5b27230
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
* 证照目录查询对象
*
* @author zxfei
* @date 2024-07-28
* @date 2024-07-30
*/
public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */
......@@ -267,6 +267,11 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 简称 */
private List<String> shortNameList;
/** 简称排除列表 */
private List <String> shortNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogQuery> orConditionList;
......@@ -1712,6 +1717,38 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 简称
* @return shortNameList
*/
public List<String> getShortNameList(){
return this.shortNameList;
}
/**
* 设置 简称
* @param shortNameList
*/
public void setShortNameList(List<String> shortNameList){
this.shortNameList = shortNameList;
}
/**
* 获取 简称
* @return shortNameNotList
*/
public List<String> getShortNameNotList(){
return this.shortNameNotList;
}
/**
* 设置 简称
* @param shortNameNotList
*/
public void setShortNameNotList(List<String> shortNameNotList){
this.shortNameNotList = shortNameNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2606,6 +2643,25 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 设置 简称
* @param shortName
*/
public CertificateCatalogQuery shortName(String shortName){
setShortName(shortName);
return this;
}
/**
* 设置 简称
* @param shortNameList
*/
public CertificateCatalogQuery shortNameList(List<String> shortNameList){
this.shortNameList = shortNameList;
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/CertificateChildEntity.java
View file @ d5b27230
......@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateChildVo;
import lombok.Data;
/**
* 目录子证实体对象
*
* @author zxfei
* @date 2024-07-28
*/
* 目录子证实体对象
*
* @author zxfei
* @date 2024-07-30
*/
@Data
public class CertificateChildEntity extends CertificateChildVo {
private static final long serialVersionUID = 1L;
......@@ -31,6 +31,14 @@ public class CertificateChildEntity extends CertificateChildVo {
* 子证id
*/
private Long documentId;
/**
* 子证名称
*/
private String documentName;
/**
* 目录名称
*/
private String catalogName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -51,5 +59,7 @@ public class CertificateChildEntity extends CertificateChildVo {
this.siteId = null;
this.catalogId = null;
this.documentId = null;
this.documentName = "";
this.catalogName = "";
}
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateChildQuery.java
View file @ d5b27230
......@@ -3,11 +3,11 @@ 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
*/
* 目录子证查询对象
*
* @author zxfei
* @date 2024-07-30
*/
public class CertificateChildQuery extends CertificateChildEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -111,6 +111,16 @@ public class CertificateChildQuery extends CertificateChildEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 子证名称 */
private List<String> documentNameList;
/** 子证名称排除列表 */
private List <String> documentNameNotList;
/** 目录名称 */
private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateChildQuery> orConditionList;
......@@ -669,6 +679,70 @@ public class CertificateChildQuery extends CertificateChildEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 子证名称
* @return documentNameList
*/
public List<String> getDocumentNameList(){
return this.documentNameList;
}
/**
* 设置 子证名称
* @param documentNameList
*/
public void setDocumentNameList(List<String> documentNameList){
this.documentNameList = documentNameList;
}
/**
* 获取 子证名称
* @return documentNameNotList
*/
public List<String> getDocumentNameNotList(){
return this.documentNameNotList;
}
/**
* 设置 子证名称
* @param documentNameNotList
*/
public void setDocumentNameNotList(List<String> documentNameNotList){
this.documentNameNotList = documentNameNotList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -995,6 +1069,44 @@ public class CertificateChildQuery extends CertificateChildEntity {
}
/**
* 设置 子证名称
* @param documentName
*/
public CertificateChildQuery documentName(String documentName){
setDocumentName(documentName);
return this;
}
/**
* 设置 子证名称
* @param documentNameList
*/
public CertificateChildQuery documentNameList(List<String> documentNameList){
this.documentNameList = documentNameList;
return this;
}
/**
* 设置 目录名称
* @param catalogName
*/
public CertificateChildQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public CertificateChildQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
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/CertificateDocumentEntity.java
View file @ d5b27230
......@@ -13,7 +13,7 @@ import lombok.Data;
* 子证配置实体对象
*
* @author zxfei
* @date 2024-07-28
* @date 2024-07-30
*/
@Data
public class CertificateDocumentEntity extends CertificateDocumentVo {
......@@ -47,6 +47,10 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
* 内容表单
*/
private String formContent;
/**
* 简称
*/
private String shortName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -71,5 +75,6 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
this.status = 1;
this.templateContent = "";
this.formContent = "";
this.shortName = "";
}
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateDocumentQuery.java
View file @ d5b27230
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
* 子证配置查询对象
*
* @author zxfei
* @date 2024-07-28
* @date 2024-07-30
*/
public class CertificateDocumentQuery extends CertificateDocumentEntity {
/** 开始 序号，主键，自增长 */
......@@ -131,6 +131,11 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
/** 内容表单排除列表 */
private List <String> formContentNotList;
/** 简称 */
private List<String> shortNameList;
/** 简称排除列表 */
private List <String> shortNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateDocumentQuery> orConditionList;
......@@ -817,6 +822,38 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
this.formContentNotList = formContentNotList;
}
/**
* 获取 简称
* @return shortNameList
*/
public List<String> getShortNameList(){
return this.shortNameList;
}
/**
* 设置 简称
* @param shortNameList
*/
public void setShortNameList(List<String> shortNameList){
this.shortNameList = shortNameList;
}
/**
* 获取 简称
* @return shortNameNotList
*/
public List<String> getShortNameNotList(){
return this.shortNameNotList;
}
/**
* 设置 简称
* @param shortNameNotList
*/
public void setShortNameNotList(List<String> shortNameNotList){
this.shortNameNotList = shortNameNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1219,6 +1256,25 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
return this;
}
/**
* 设置 简称
* @param shortName
*/
public CertificateDocumentQuery shortName(String shortName){
setShortName(shortName);
return this;
}
/**
* 设置 简称
* @param shortNameList
*/
public CertificateDocumentQuery shortNameList(List<String> shortNameList){
this.shortNameList = shortNameList;
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/child/model/ChildLicenseEntity.java
View file @ d5b27230
......@@ -14,7 +14,7 @@ import lombok.Data;
* 行业许可子证实体对象
*
* @author zxfei
* @date 2024-07-28
* @date 2024-07-30
*/
@Data
public class ChildLicenseEntity extends ChildLicenseVo {
......@@ -148,6 +148,50 @@ public class ChildLicenseEntity extends ChildLicenseVo {
* 更新用户名称
*/
private String updateUserName;
/**
* 删除状态(0.未删除,1.已删除)
*/
private Integer deleted;
/**
* 简称
*/
private String shortName;
/**
* 扩展列1
*/
private String ext1;
/**
* 扩展列2
*/
private String ext2;
/**
* 扩展列3
*/
private String ext3;
/**
* 扩展列4
*/
private String ext4;
/**
* 扩展列5
*/
private String ext5;
/**
* 扩展列6
*/
private String ext6;
/**
* 扩展列7
*/
private String ext7;
/**
* 扩展列8
*/
private String ext8;
/**
* 子证状态(0.禁用,1.启用)
*/
private Integer childStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -197,5 +241,16 @@ public class ChildLicenseEntity extends ChildLicenseVo {
this.reportTime = null;
this.createUserName = "";
this.updateUserName = "";
this.deleted = 0;
this.shortName = "";
this.ext1 = "";
this.ext2 = "";
this.ext3 = "";
this.ext4 = "";
this.ext5 = "";
this.ext6 = "";
this.ext7 = "";
this.ext8 = "";
this.childStatus = 1;
}
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ d5b27230
......@@ -68,8 +68,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private String filePath;
/** 应用公网地址 */
// @Value("${serviceUrl:http://one.scsmile.cn/h5/#?id=}")
private String serviceUrl="http://one.scsmile.cn/h5/#?id=";
@Value("${serviceUrl:http://one.scsmile.cn/h5/#?id=}")
private String serviceUrl;
@Autowired
private UploadService uploadService;
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml
View file @ d5b27230
......@@ -30,6 +30,7 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="shortName" column="shortName" />
</resultMap>
<!-- 表所有列 -->
......@@ -110,23 +111,32 @@
<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('shortName') or colPickMode == 1 and data.containsKey('shortName')))">
a.shortName,
</if>
</trim>
</sql>
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.siteId,b.catalogId,b.documentId,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.documentName,b.catalogName,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_catalog
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,templateFileName,templateFileUrl,formContent,exampleFileUrl,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,templateFileName,templateFileUrl,formContent,exampleFileUrl,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,shortName)
VALUES
(#{siteId},#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{status},#{templateFileName},#{templateFileUrl},#{formContent},#{exampleFileUrl},#{excelFile},#{isPdf},#{deviceId},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{siteId},#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{status},#{templateFileName},#{templateFileUrl},#{formContent},#{exampleFileUrl},#{excelFile},#{isPdf},#{deviceId},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{shortName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,templateFileName,templateFileUrl,formContent,exampleFileUrl,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,templateFileName,templateFileUrl,formContent,exampleFileUrl,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,shortName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.status},#{item.templateFileName},#{item.templateFileUrl},#{item.formContent},#{item.exampleFileUrl},#{item.excelFile},#{item.isPdf},#{item.deviceId},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.siteId},#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.status},#{item.templateFileName},#{item.templateFileUrl},#{item.formContent},#{item.exampleFileUrl},#{item.excelFile},#{item.isPdf},#{item.deviceId},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.shortName})
</foreach>
</insert>
......@@ -244,6 +254,9 @@
<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('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
a.shortName=#{data.shortName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -484,6 +497,13 @@
</if>
</foreach>
</trim>
<trim prefix="shortName=(case" suffix="ELSE shortName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('shortName')) or (colPickMode==1 and !item.containsKey('shortName'))">
when a.id=#{item.id} then #{item.shortName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -544,6 +564,7 @@
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取子列表 -->
......@@ -1195,6 +1216,27 @@
<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('shortName')">
<if test="conditionParamRef.shortName != null and conditionParamRef.shortName != ''">
${_conditionType_} a.shortName like #{${_conditionParam_}.shortName}
</if>
<if test="conditionParamRef.shortName == null">
${_conditionType_} a.shortName is null
</if>
</if>
<if test="conditionParamRef.containsKey('shortNameList') and conditionParamRef.shortNameList.size() > 0">
${_conditionType_} a.shortName in
<foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shortNameNotList') and conditionParamRef.shortNameNotList.size() > 0">
${_conditionType_} a.shortName not in
<foreach collection="conditionParamRef.shortNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1515,6 +1557,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('shortName')">
a.shortName
<if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
,
</if>
</trim>
</if>
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateChildMapper.xml
View file @ d5b27230
<?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.CertificateChildDaoImpl">
<!-- 字段和属性映射 -->
......@@ -13,6 +13,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="documentName" column="documentName" />
<result property="catalogName" column="catalogName" />
</resultMap>
<!-- 表所有列 -->
......@@ -42,23 +44,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('documentName') or colPickMode == 1 and data.containsKey('documentName')))">
a.documentName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))">
a.catalogName,
</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)
(siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime,documentName,catalogName)
VALUES
(#{siteId},#{catalogId},#{documentId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{siteId},#{catalogId},#{documentId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{documentName},#{catalogName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_child
(siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime)
(siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime,documentName,catalogName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.catalogId},#{item.documentId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.siteId},#{item.catalogId},#{item.documentId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.documentName},#{item.catalogName})
</foreach>
</insert>
......@@ -104,6 +112,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('documentName')) or (colPickMode==1 and !data.containsKey('documentName'))">
a.documentName=#{data.documentName},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -190,6 +204,20 @@
</if>
</foreach>
</trim>
<trim prefix="documentName=(case" suffix="ELSE documentName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('documentName')) or (colPickMode==1 and !item.containsKey('documentName'))">
when a.id=#{item.id} then #{item.documentName}
</if>
</foreach>
</trim>
<trim prefix="catalogName=(case" suffix="ELSE catalogName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogName')) or (colPickMode==1 and !item.containsKey('catalogName'))">
when a.id=#{item.id} then #{item.catalogName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -502,6 +530,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('documentName')">
<if test="conditionParamRef.documentName != null and conditionParamRef.documentName != ''">
${_conditionType_} a.documentName like #{${_conditionParam_}.documentName}
</if>
<if test="conditionParamRef.documentName == null">
${_conditionType_} a.documentName is null
</if>
</if>
<if test="conditionParamRef.containsKey('documentNameList') and conditionParamRef.documentNameList.size() > 0">
${_conditionType_} a.documentName in
<foreach collection="conditionParamRef.documentNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('documentNameNotList') and conditionParamRef.documentNameNotList.size() > 0">
${_conditionType_} a.documentName not in
<foreach collection="conditionParamRef.documentNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
${_conditionType_} a.catalogName like #{${_conditionParam_}.catalogName}
</if>
<if test="conditionParamRef.catalogName == null">
${_conditionType_} a.catalogName is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -639,6 +709,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('documentName')">
a.documentName
<if test='orderCol.documentName != null and "DESC".equalsIgnoreCase(orderCol.documentName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
</trim>
</if>
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateDocumentMapper.xml
View file @ d5b27230
......@@ -17,6 +17,7 @@
<result property="updateTime" column="updateTime" />
<result property="templateContent" column="templateContent" />
<result property="formContent" column="formContent" />
<result property="shortName" column="shortName" />
</resultMap>
<!-- 表所有列 -->
......@@ -58,23 +59,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shortName') or colPickMode == 1 and data.containsKey('shortName')))">
a.shortName,
</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,templateContent,formContent)
(siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime,templateContent,formContent,shortName)
VALUES
(#{siteId},#{deptId},#{deptName},#{documentName},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{templateContent},#{formContent})
(#{siteId},#{deptId},#{deptName},#{documentName},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{templateContent},#{formContent},#{shortName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_document
(siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime,templateContent,formContent)
(siteId,deptId,deptName,documentName,status,createUserId,createTime,updateUserId,updateTime,templateContent,formContent,shortName)
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.templateContent},#{item.formContent})
(#{item.siteId},#{item.deptId},#{item.deptName},#{item.documentName},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.templateContent},#{item.formContent},#{item.shortName})
</foreach>
</insert>
......@@ -132,6 +136,9 @@
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent},
</if>
<if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
a.shortName=#{data.shortName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -246,6 +253,13 @@
</if>
</foreach>
</trim>
<trim prefix="shortName=(case" suffix="ELSE shortName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('shortName')) or (colPickMode==1 and !item.containsKey('shortName'))">
when a.id=#{item.id} then #{item.shortName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -642,6 +656,27 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shortName')">
<if test="conditionParamRef.shortName != null and conditionParamRef.shortName != ''">
${_conditionType_} a.shortName like #{${_conditionParam_}.shortName}
</if>
<if test="conditionParamRef.shortName == null">
${_conditionType_} a.shortName is null
</if>
</if>
<if test="conditionParamRef.containsKey('shortNameList') and conditionParamRef.shortNameList.size() > 0">
${_conditionType_} a.shortName in
<foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shortNameNotList') and conditionParamRef.shortNameNotList.size() > 0">
${_conditionType_} a.shortName not in
<foreach collection="conditionParamRef.shortNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -799,6 +834,11 @@
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('shortName')">
a.shortName
<if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
,
</if>
</trim>
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment