Skip to content

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

添加目录字段

parent 80744fe2
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` ( ...@@ -49,3 +49,36 @@ CREATE TABLE `mortals_xhx_child_license` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '行业许可子证' ROW_FORMAT = Dynamic; ) 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; 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 @@ ...@@ -42,7 +42,7 @@
<id>test</id> <id>test</id>
<properties> <properties>
<profiles.active>test</profiles.active> <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.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <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; ...@@ -15,7 +15,7 @@ import lombok.Data;
* 证照目录实体对象 * 证照目录实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
@Data @Data
public class CertificateCatalogEntity extends CertificateCatalogVo { public class CertificateCatalogEntity extends CertificateCatalogVo {
...@@ -101,6 +101,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -101,6 +101,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 打印机纸盒 * 打印机纸盒
*/ */
private String paperSource; private String paperSource;
/**
* 简称
*/
private String shortName;
/** /**
* 目录子证信息 * 目录子证信息
*/ */
...@@ -149,5 +153,6 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -149,5 +153,6 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.printerName = ""; this.printerName = "";
this.printerIp = ""; this.printerIp = "";
this.paperSource = ""; 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; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
* 证照目录查询对象 * 证照目录查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
public class CertificateCatalogQuery extends CertificateCatalogEntity { public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -267,6 +267,11 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -267,6 +267,11 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; 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) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogQuery> orConditionList; private List<CertificateCatalogQuery> orConditionList;
...@@ -1712,6 +1717,38 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -1712,6 +1717,38 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
this.updateTimeEnd = updateTimeEnd; 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 * @param id
...@@ -2606,6 +2643,25 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @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; ...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateChildVo; import com.mortals.xhx.module.certificate.model.vo.CertificateChildVo;
import lombok.Data; import lombok.Data;
/** /**
* 目录子证实体对象 * 目录子证实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
@Data @Data
public class CertificateChildEntity extends CertificateChildVo { public class CertificateChildEntity extends CertificateChildVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -31,6 +31,14 @@ public class CertificateChildEntity extends CertificateChildVo { ...@@ -31,6 +31,14 @@ public class CertificateChildEntity extends CertificateChildVo {
* 子证id * 子证id
*/ */
private Long documentId; private Long documentId;
/**
* 子证名称
*/
private String documentName;
/**
* 目录名称
*/
private String catalogName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -51,5 +59,7 @@ public class CertificateChildEntity extends CertificateChildVo { ...@@ -51,5 +59,7 @@ public class CertificateChildEntity extends CertificateChildVo {
this.siteId = null; this.siteId = null;
this.catalogId = null; this.catalogId = null;
this.documentId = 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; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateChildEntity; import com.mortals.xhx.module.certificate.model.CertificateChildEntity;
/** /**
* 目录子证查询对象 * 目录子证查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
public class CertificateChildQuery extends CertificateChildEntity { public class CertificateChildQuery extends CertificateChildEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -111,6 +111,16 @@ public class CertificateChildQuery extends CertificateChildEntity { ...@@ -111,6 +111,16 @@ public class CertificateChildQuery extends CertificateChildEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; 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) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateChildQuery> orConditionList; private List<CertificateChildQuery> orConditionList;
...@@ -669,6 +679,70 @@ public class CertificateChildQuery extends CertificateChildEntity { ...@@ -669,6 +679,70 @@ public class CertificateChildQuery extends CertificateChildEntity {
this.updateTimeEnd = updateTimeEnd; 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 * @param id
...@@ -995,6 +1069,44 @@ public class CertificateChildQuery extends CertificateChildEntity { ...@@ -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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @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; ...@@ -13,7 +13,7 @@ import lombok.Data;
* 子证配置实体对象 * 子证配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
@Data @Data
public class CertificateDocumentEntity extends CertificateDocumentVo { public class CertificateDocumentEntity extends CertificateDocumentVo {
...@@ -47,6 +47,10 @@ public class CertificateDocumentEntity extends CertificateDocumentVo { ...@@ -47,6 +47,10 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
* 内容表单 * 内容表单
*/ */
private String formContent; private String formContent;
/**
* 简称
*/
private String shortName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -71,5 +75,6 @@ public class CertificateDocumentEntity extends CertificateDocumentVo { ...@@ -71,5 +75,6 @@ public class CertificateDocumentEntity extends CertificateDocumentVo {
this.status = 1; this.status = 1;
this.templateContent = ""; this.templateContent = "";
this.formContent = ""; 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; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateDocumentEntity;
* 子证配置查询对象 * 子证配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
public class CertificateDocumentQuery extends CertificateDocumentEntity { public class CertificateDocumentQuery extends CertificateDocumentEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -131,6 +131,11 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity { ...@@ -131,6 +131,11 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
/** 内容表单排除列表 */ /** 内容表单排除列表 */
private List <String> formContentNotList; 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) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateDocumentQuery> orConditionList; private List<CertificateDocumentQuery> orConditionList;
...@@ -817,6 +822,38 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity { ...@@ -817,6 +822,38 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
this.formContentNotList = formContentNotList; 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 * @param id
...@@ -1219,6 +1256,25 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity { ...@@ -1219,6 +1256,25 @@ public class CertificateDocumentQuery extends CertificateDocumentEntity {
return this; 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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @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; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 行业许可子证实体对象 * 行业许可子证实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
@Data @Data
public class ChildLicenseEntity extends ChildLicenseVo { public class ChildLicenseEntity extends ChildLicenseVo {
...@@ -148,6 +148,50 @@ public class ChildLicenseEntity extends ChildLicenseVo { ...@@ -148,6 +148,50 @@ public class ChildLicenseEntity extends ChildLicenseVo {
* 更新用户名称 * 更新用户名称
*/ */
private String updateUserName; 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 @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -197,5 +241,16 @@ public class ChildLicenseEntity extends ChildLicenseVo { ...@@ -197,5 +241,16 @@ public class ChildLicenseEntity extends ChildLicenseVo {
this.reportTime = null; this.reportTime = null;
this.createUserName = ""; this.createUserName = "";
this.updateUserName = ""; 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/child/model/ChildLicenseQuery.java
View file @ d5b27230
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.child.model.ChildLicenseEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.child.model.ChildLicenseEntity;
* 行业许可子证查询对象 * 行业许可子证查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-07-28 * @date 2024-07-30
*/ */
public class ChildLicenseQuery extends ChildLicenseEntity { public class ChildLicenseQuery extends ChildLicenseEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -299,6 +299,81 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -299,6 +299,81 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
/** 更新用户名称排除列表 */ /** 更新用户名称排除列表 */
private List <String> updateUserNameNotList; private List <String> updateUserNameNotList;
/** 开始 删除状态(0.未删除,1.已删除) */
private Integer deletedStart;
/** 结束 删除状态(0.未删除,1.已删除) */
private Integer deletedEnd;
/** 增加 删除状态(0.未删除,1.已删除) */
private Integer deletedIncrement;
/** 删除状态(0.未删除,1.已删除)列表 */
private List <Integer> deletedList;
/** 删除状态(0.未删除,1.已删除)排除列表 */
private List <Integer> deletedNotList;
/** 简称 */
private List<String> shortNameList;
/** 简称排除列表 */
private List <String> shortNameNotList;
/** 扩展列1 */
private List<String> ext1List;
/** 扩展列1排除列表 */
private List <String> ext1NotList;
/** 扩展列2 */
private List<String> ext2List;
/** 扩展列2排除列表 */
private List <String> ext2NotList;
/** 扩展列3 */
private List<String> ext3List;
/** 扩展列3排除列表 */
private List <String> ext3NotList;
/** 扩展列4 */
private List<String> ext4List;
/** 扩展列4排除列表 */
private List <String> ext4NotList;
/** 扩展列5 */
private List<String> ext5List;
/** 扩展列5排除列表 */
private List <String> ext5NotList;
/** 扩展列6 */
private List<String> ext6List;
/** 扩展列6排除列表 */
private List <String> ext6NotList;
/** 扩展列7 */
private List<String> ext7List;
/** 扩展列7排除列表 */
private List <String> ext7NotList;
/** 扩展列8 */
private List<String> ext8List;
/** 扩展列8排除列表 */
private List <String> ext8NotList;
/** 开始 子证状态(0.禁用,1.启用) */
private Integer childStatusStart;
/** 结束 子证状态(0.禁用,1.启用) */
private Integer childStatusEnd;
/** 增加 子证状态(0.禁用,1.启用) */
private Integer childStatusIncrement;
/** 子证状态(0.禁用,1.启用)列表 */
private List <Integer> childStatusList;
/** 子证状态(0.禁用,1.启用)排除列表 */
private List <Integer> childStatusNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ChildLicenseQuery> orConditionList; private List<ChildLicenseQuery> orConditionList;
...@@ -1981,6 +2056,456 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -1981,6 +2056,456 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
this.updateUserNameNotList = updateUserNameNotList; this.updateUserNameNotList = updateUserNameNotList;
} }
/**
* 获取 开始 删除状态(0.未删除,1.已删除)
* @return deletedStart
*/
public Integer getDeletedStart(){
return this.deletedStart;
}
/**
* 设置 开始 删除状态(0.未删除,1.已删除)
* @param deletedStart
*/
public void setDeletedStart(Integer deletedStart){
this.deletedStart = deletedStart;
}
/**
* 获取 结束 删除状态(0.未删除,1.已删除)
* @return $deletedEnd
*/
public Integer getDeletedEnd(){
return this.deletedEnd;
}
/**
* 设置 结束 删除状态(0.未删除,1.已删除)
* @param deletedEnd
*/
public void setDeletedEnd(Integer deletedEnd){
this.deletedEnd = deletedEnd;
}
/**
* 获取 增加 删除状态(0.未删除,1.已删除)
* @return deletedIncrement
*/
public Integer getDeletedIncrement(){
return this.deletedIncrement;
}
/**
* 设置 增加 删除状态(0.未删除,1.已删除)
* @param deletedIncrement
*/
public void setDeletedIncrement(Integer deletedIncrement){
this.deletedIncrement = deletedIncrement;
}
/**
* 获取 删除状态(0.未删除,1.已删除)
* @return deletedList
*/
public List<Integer> getDeletedList(){
return this.deletedList;
}
/**
* 设置 删除状态(0.未删除,1.已删除)
* @param deletedList
*/
public void setDeletedList(List<Integer> deletedList){
this.deletedList = deletedList;
}
/**
* 获取 删除状态(0.未删除,1.已删除)
* @return deletedNotList
*/
public List<Integer> getDeletedNotList(){
return this.deletedNotList;
}
/**
* 设置 删除状态(0.未删除,1.已删除)
* @param deletedNotList
*/
public void setDeletedNotList(List<Integer> deletedNotList){
this.deletedNotList = deletedNotList;
}
/**
* 获取 简称
* @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;
}
/**
* 获取 扩展列1
* @return ext1List
*/
public List<String> getExt1List(){
return this.ext1List;
}
/**
* 设置 扩展列1
* @param ext1List
*/
public void setExt1List(List<String> ext1List){
this.ext1List = ext1List;
}
/**
* 获取 扩展列1
* @return ext1NotList
*/
public List<String> getExt1NotList(){
return this.ext1NotList;
}
/**
* 设置 扩展列1
* @param ext1NotList
*/
public void setExt1NotList(List<String> ext1NotList){
this.ext1NotList = ext1NotList;
}
/**
* 获取 扩展列2
* @return ext2List
*/
public List<String> getExt2List(){
return this.ext2List;
}
/**
* 设置 扩展列2
* @param ext2List
*/
public void setExt2List(List<String> ext2List){
this.ext2List = ext2List;
}
/**
* 获取 扩展列2
* @return ext2NotList
*/
public List<String> getExt2NotList(){
return this.ext2NotList;
}
/**
* 设置 扩展列2
* @param ext2NotList
*/
public void setExt2NotList(List<String> ext2NotList){
this.ext2NotList = ext2NotList;
}
/**
* 获取 扩展列3
* @return ext3List
*/
public List<String> getExt3List(){
return this.ext3List;
}
/**
* 设置 扩展列3
* @param ext3List
*/
public void setExt3List(List<String> ext3List){
this.ext3List = ext3List;
}
/**
* 获取 扩展列3
* @return ext3NotList
*/
public List<String> getExt3NotList(){
return this.ext3NotList;
}
/**
* 设置 扩展列3
* @param ext3NotList
*/
public void setExt3NotList(List<String> ext3NotList){
this.ext3NotList = ext3NotList;
}
/**
* 获取 扩展列4
* @return ext4List
*/
public List<String> getExt4List(){
return this.ext4List;
}
/**
* 设置 扩展列4
* @param ext4List
*/
public void setExt4List(List<String> ext4List){
this.ext4List = ext4List;
}
/**
* 获取 扩展列4
* @return ext4NotList
*/
public List<String> getExt4NotList(){
return this.ext4NotList;
}
/**
* 设置 扩展列4
* @param ext4NotList
*/
public void setExt4NotList(List<String> ext4NotList){
this.ext4NotList = ext4NotList;
}
/**
* 获取 扩展列5
* @return ext5List
*/
public List<String> getExt5List(){
return this.ext5List;
}
/**
* 设置 扩展列5
* @param ext5List
*/
public void setExt5List(List<String> ext5List){
this.ext5List = ext5List;
}
/**
* 获取 扩展列5
* @return ext5NotList
*/
public List<String> getExt5NotList(){
return this.ext5NotList;
}
/**
* 设置 扩展列5
* @param ext5NotList
*/
public void setExt5NotList(List<String> ext5NotList){
this.ext5NotList = ext5NotList;
}
/**
* 获取 扩展列6
* @return ext6List
*/
public List<String> getExt6List(){
return this.ext6List;
}
/**
* 设置 扩展列6
* @param ext6List
*/
public void setExt6List(List<String> ext6List){
this.ext6List = ext6List;
}
/**
* 获取 扩展列6
* @return ext6NotList
*/
public List<String> getExt6NotList(){
return this.ext6NotList;
}
/**
* 设置 扩展列6
* @param ext6NotList
*/
public void setExt6NotList(List<String> ext6NotList){
this.ext6NotList = ext6NotList;
}
/**
* 获取 扩展列7
* @return ext7List
*/
public List<String> getExt7List(){
return this.ext7List;
}
/**
* 设置 扩展列7
* @param ext7List
*/
public void setExt7List(List<String> ext7List){
this.ext7List = ext7List;
}
/**
* 获取 扩展列7
* @return ext7NotList
*/
public List<String> getExt7NotList(){
return this.ext7NotList;
}
/**
* 设置 扩展列7
* @param ext7NotList
*/
public void setExt7NotList(List<String> ext7NotList){
this.ext7NotList = ext7NotList;
}
/**
* 获取 扩展列8
* @return ext8List
*/
public List<String> getExt8List(){
return this.ext8List;
}
/**
* 设置 扩展列8
* @param ext8List
*/
public void setExt8List(List<String> ext8List){
this.ext8List = ext8List;
}
/**
* 获取 扩展列8
* @return ext8NotList
*/
public List<String> getExt8NotList(){
return this.ext8NotList;
}
/**
* 设置 扩展列8
* @param ext8NotList
*/
public void setExt8NotList(List<String> ext8NotList){
this.ext8NotList = ext8NotList;
}
/**
* 获取 开始 子证状态(0.禁用,1.启用)
* @return childStatusStart
*/
public Integer getChildStatusStart(){
return this.childStatusStart;
}
/**
* 设置 开始 子证状态(0.禁用,1.启用)
* @param childStatusStart
*/
public void setChildStatusStart(Integer childStatusStart){
this.childStatusStart = childStatusStart;
}
/**
* 获取 结束 子证状态(0.禁用,1.启用)
* @return $childStatusEnd
*/
public Integer getChildStatusEnd(){
return this.childStatusEnd;
}
/**
* 设置 结束 子证状态(0.禁用,1.启用)
* @param childStatusEnd
*/
public void setChildStatusEnd(Integer childStatusEnd){
this.childStatusEnd = childStatusEnd;
}
/**
* 获取 增加 子证状态(0.禁用,1.启用)
* @return childStatusIncrement
*/
public Integer getChildStatusIncrement(){
return this.childStatusIncrement;
}
/**
* 设置 增加 子证状态(0.禁用,1.启用)
* @param childStatusIncrement
*/
public void setChildStatusIncrement(Integer childStatusIncrement){
this.childStatusIncrement = childStatusIncrement;
}
/**
* 获取 子证状态(0.禁用,1.启用)
* @return childStatusList
*/
public List<Integer> getChildStatusList(){
return this.childStatusList;
}
/**
* 设置 子证状态(0.禁用,1.启用)
* @param childStatusList
*/
public void setChildStatusList(List<Integer> childStatusList){
this.childStatusList = childStatusList;
}
/**
* 获取 子证状态(0.禁用,1.启用)
* @return childStatusNotList
*/
public List<Integer> getChildStatusNotList(){
return this.childStatusNotList;
}
/**
* 设置 子证状态(0.禁用,1.启用)
* @param childStatusNotList
*/
public void setChildStatusNotList(List<Integer> childStatusNotList){
this.childStatusNotList = childStatusNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -2962,6 +3487,285 @@ public class ChildLicenseQuery extends ChildLicenseEntity { ...@@ -2962,6 +3487,285 @@ public class ChildLicenseQuery extends ChildLicenseEntity {
return this; return this;
} }
/**
* 设置 删除状态(0.未删除,1.已删除)
* @param deleted
*/
public ChildLicenseQuery deleted(Integer deleted){
setDeleted(deleted);
return this;
}
/**
* 设置 开始 删除状态(0.未删除,1.已删除)
* @param deletedStart
*/
public ChildLicenseQuery deletedStart(Integer deletedStart){
this.deletedStart = deletedStart;
return this;
}
/**
* 设置 结束 删除状态(0.未删除,1.已删除)
* @param deletedEnd
*/
public ChildLicenseQuery deletedEnd(Integer deletedEnd){
this.deletedEnd = deletedEnd;
return this;
}
/**
* 设置 增加 删除状态(0.未删除,1.已删除)
* @param deletedIncrement
*/
public ChildLicenseQuery deletedIncrement(Integer deletedIncrement){
this.deletedIncrement = deletedIncrement;
return this;
}
/**
* 设置 删除状态(0.未删除,1.已删除)
* @param deletedList
*/
public ChildLicenseQuery deletedList(List<Integer> deletedList){
this.deletedList = deletedList;
return this;
}
/**
* 设置 删除状态(0.未删除,1.已删除)
* @param deletedNotList
*/
public ChildLicenseQuery deletedNotList(List<Integer> deletedNotList){
this.deletedNotList = deletedNotList;
return this;
}
/**
* 设置 简称
* @param shortName
*/
public ChildLicenseQuery shortName(String shortName){
setShortName(shortName);
return this;
}
/**
* 设置 简称
* @param shortNameList
*/
public ChildLicenseQuery shortNameList(List<String> shortNameList){
this.shortNameList = shortNameList;
return this;
}
/**
* 设置 扩展列1
* @param ext1
*/
public ChildLicenseQuery ext1(String ext1){
setExt1(ext1);
return this;
}
/**
* 设置 扩展列1
* @param ext1List
*/
public ChildLicenseQuery ext1List(List<String> ext1List){
this.ext1List = ext1List;
return this;
}
/**
* 设置 扩展列2
* @param ext2
*/
public ChildLicenseQuery ext2(String ext2){
setExt2(ext2);
return this;
}
/**
* 设置 扩展列2
* @param ext2List
*/
public ChildLicenseQuery ext2List(List<String> ext2List){
this.ext2List = ext2List;
return this;
}
/**
* 设置 扩展列3
* @param ext3
*/
public ChildLicenseQuery ext3(String ext3){
setExt3(ext3);
return this;
}
/**
* 设置 扩展列3
* @param ext3List
*/
public ChildLicenseQuery ext3List(List<String> ext3List){
this.ext3List = ext3List;
return this;
}
/**
* 设置 扩展列4
* @param ext4
*/
public ChildLicenseQuery ext4(String ext4){
setExt4(ext4);
return this;
}
/**
* 设置 扩展列4
* @param ext4List
*/
public ChildLicenseQuery ext4List(List<String> ext4List){
this.ext4List = ext4List;
return this;
}
/**
* 设置 扩展列5
* @param ext5
*/
public ChildLicenseQuery ext5(String ext5){
setExt5(ext5);
return this;
}
/**
* 设置 扩展列5
* @param ext5List
*/
public ChildLicenseQuery ext5List(List<String> ext5List){
this.ext5List = ext5List;
return this;
}
/**
* 设置 扩展列6
* @param ext6
*/
public ChildLicenseQuery ext6(String ext6){
setExt6(ext6);
return this;
}
/**
* 设置 扩展列6
* @param ext6List
*/
public ChildLicenseQuery ext6List(List<String> ext6List){
this.ext6List = ext6List;
return this;
}
/**
* 设置 扩展列7
* @param ext7
*/
public ChildLicenseQuery ext7(String ext7){
setExt7(ext7);
return this;
}
/**
* 设置 扩展列7
* @param ext7List
*/
public ChildLicenseQuery ext7List(List<String> ext7List){
this.ext7List = ext7List;
return this;
}
/**
* 设置 扩展列8
* @param ext8
*/
public ChildLicenseQuery ext8(String ext8){
setExt8(ext8);
return this;
}
/**
* 设置 扩展列8
* @param ext8List
*/
public ChildLicenseQuery ext8List(List<String> ext8List){
this.ext8List = ext8List;
return this;
}
/**
* 设置 子证状态(0.禁用,1.启用)
* @param childStatus
*/
public ChildLicenseQuery childStatus(Integer childStatus){
setChildStatus(childStatus);
return this;
}
/**
* 设置 开始 子证状态(0.禁用,1.启用)
* @param childStatusStart
*/
public ChildLicenseQuery childStatusStart(Integer childStatusStart){
this.childStatusStart = childStatusStart;
return this;
}
/**
* 设置 结束 子证状态(0.禁用,1.启用)
* @param childStatusEnd
*/
public ChildLicenseQuery childStatusEnd(Integer childStatusEnd){
this.childStatusEnd = childStatusEnd;
return this;
}
/**
* 设置 增加 子证状态(0.禁用,1.启用)
* @param childStatusIncrement
*/
public ChildLicenseQuery childStatusIncrement(Integer childStatusIncrement){
this.childStatusIncrement = childStatusIncrement;
return this;
}
/**
* 设置 子证状态(0.禁用,1.启用)
* @param childStatusList
*/
public ChildLicenseQuery childStatusList(List<Integer> childStatusList){
this.childStatusList = childStatusList;
return this;
}
/**
* 设置 子证状态(0.禁用,1.启用)
* @param childStatusNotList
*/
public ChildLicenseQuery childStatusNotList(List<Integer> childStatusNotList){
this.childStatusNotList = childStatusNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
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 ...@@ -68,8 +68,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private String filePath; private String filePath;
/** 应用公网地址 */ /** 应用公网地址 */
// @Value("${serviceUrl:http://one.scsmile.cn/h5/#?id=}") @Value("${serviceUrl:http://one.scsmile.cn/h5/#?id=}")
private String serviceUrl="http://one.scsmile.cn/h5/#?id="; private String serviceUrl;
@Autowired @Autowired
private UploadService uploadService; private UploadService uploadService;
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml
View file @ d5b27230
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="shortName" column="shortName" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -110,23 +111,32 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_catalog 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -244,6 +254,9 @@ ...@@ -244,6 +254,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
a.shortName=#{data.shortName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -484,6 +497,13 @@ ...@@ -484,6 +497,13 @@
</if> </if>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -544,6 +564,7 @@ ...@@ -544,6 +564,7 @@
</trim> </trim>
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 -->
...@@ -1195,6 +1216,27 @@ ...@@ -1195,6 +1216,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1515,6 +1557,11 @@ ...@@ -1515,6 +1557,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('shortName')">
a.shortName
<if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateChildMapper.xml
View file @ d5b27230
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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"> <mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateChildDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="documentName" column="documentName" />
<result property="catalogName" column="catalogName" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -42,23 +44,29 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateChildEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateChildEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_child insert into mortals_xhx_certificate_child
(siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime) (siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime,documentName,catalogName)
VALUES VALUES
(#{siteId},#{catalogId},#{documentId},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{catalogId},#{documentId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{documentName},#{catalogName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_child insert into mortals_xhx_certificate_child
(siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime) (siteId,catalogId,documentId,createUserId,createTime,updateUserId,updateTime,documentName,catalogName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -104,6 +112,12 @@ ...@@ -104,6 +112,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </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>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -190,6 +204,20 @@ ...@@ -190,6 +204,20 @@
</if> </if>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -502,6 +530,48 @@ ...@@ -502,6 +530,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -639,6 +709,16 @@ ...@@ -639,6 +709,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</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> </trim>
</if> </if>
......
one-certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateDocumentMapper.xml
View file @ d5b27230
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="templateContent" column="templateContent" /> <result property="templateContent" column="templateContent" />
<result property="formContent" column="formContent" /> <result property="formContent" column="formContent" />
<result property="shortName" column="shortName" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -58,23 +59,26 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent, a.formContent,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateDocumentEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateDocumentEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_document 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_document 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -132,6 +136,9 @@ ...@@ -132,6 +136,9 @@
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))"> <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent}, a.formContent=#{data.formContent},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
a.shortName=#{data.shortName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -246,6 +253,13 @@ ...@@ -246,6 +253,13 @@
</if> </if>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -642,6 +656,27 @@ ...@@ -642,6 +656,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -799,6 +834,11 @@ ...@@ -799,6 +834,11 @@
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if> <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('shortName')">
a.shortName
<if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
one-certificate-manager/src/main/resources/sqlmap/module/child/ChildLicenseMapper.xml
View file @ d5b27230
...@@ -42,6 +42,17 @@ ...@@ -42,6 +42,17 @@
<result property="reportTime" column="reportTime" /> <result property="reportTime" column="reportTime" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
<result property="updateUserName" column="updateUserName" /> <result property="updateUserName" column="updateUserName" />
<result property="deleted" column="deleted" />
<result property="shortName" column="shortName" />
<result property="ext1" column="ext1" />
<result property="ext2" column="ext2" />
<result property="ext3" column="ext3" />
<result property="ext4" column="ext4" />
<result property="ext5" column="ext5" />
<result property="ext6" column="ext6" />
<result property="ext7" column="ext7" />
<result property="ext8" column="ext8" />
<result property="childStatus" column="childStatus" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -158,23 +169,56 @@ ...@@ -158,23 +169,56 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserName') or colPickMode == 1 and data.containsKey('updateUserName')))">
a.updateUserName, a.updateUserName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
a.deleted,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext1') or colPickMode == 1 and data.containsKey('ext1')))">
a.ext1,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext2') or colPickMode == 1 and data.containsKey('ext2')))">
a.ext2,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext3') or colPickMode == 1 and data.containsKey('ext3')))">
a.ext3,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext4') or colPickMode == 1 and data.containsKey('ext4')))">
a.ext4,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext5') or colPickMode == 1 and data.containsKey('ext5')))">
a.ext5,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext6') or colPickMode == 1 and data.containsKey('ext6')))">
a.ext6,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext7') or colPickMode == 1 and data.containsKey('ext7')))">
a.ext7,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ext8') or colPickMode == 1 and data.containsKey('ext8')))">
a.ext8,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('childStatus') or colPickMode == 1 and data.containsKey('childStatus')))">
a.childStatus,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ChildLicenseEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ChildLicenseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_child_license insert into mortals_xhx_child_license
(siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName) (siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus)
VALUES VALUES
(#{siteId},#{siteName},#{catalogId},#{catalogName},#{applyId},#{documentId},#{documentName},#{deptId},#{deptName},#{marketEntityName},#{licenseCode},#{legalPersonName},#{creditCode},#{productLicenseTime},#{certQRCode},#{certAuthority},#{businessPlace},#{licensedItems},#{originalFileName},#{originalFilePath},#{copyFileName},#{copyFilePath},#{summary},#{formStyleContent},#{formContent},#{processStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{reportUserId},#{reportUserName},#{reportTime},#{createUserName},#{updateUserName}) (#{siteId},#{siteName},#{catalogId},#{catalogName},#{applyId},#{documentId},#{documentName},#{deptId},#{deptName},#{marketEntityName},#{licenseCode},#{legalPersonName},#{creditCode},#{productLicenseTime},#{certQRCode},#{certAuthority},#{businessPlace},#{licensedItems},#{originalFileName},#{originalFilePath},#{copyFileName},#{copyFilePath},#{summary},#{formStyleContent},#{formContent},#{processStatus},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime},#{reportUserId},#{reportUserName},#{reportTime},#{createUserName},#{updateUserName},#{deleted},#{shortName},#{ext1},#{ext2},#{ext3},#{ext4},#{ext5},#{ext6},#{ext7},#{ext8},#{childStatus})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_child_license insert into mortals_xhx_child_license
(siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName) (siteId,siteName,catalogId,catalogName,applyId,documentId,documentName,deptId,deptName,marketEntityName,licenseCode,legalPersonName,creditCode,productLicenseTime,certQRCode,certAuthority,businessPlace,licensedItems,originalFileName,originalFilePath,copyFileName,copyFilePath,summary,formStyleContent,formContent,processStatus,remark,createTime,createUserId,updateUserId,updateTime,reportUserId,reportUserName,reportTime,createUserName,updateUserName,deleted,shortName,ext1,ext2,ext3,ext4,ext5,ext6,ext7,ext8,childStatus)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.catalogId},#{item.catalogName},#{item.applyId},#{item.documentId},#{item.documentName},#{item.deptId},#{item.deptName},#{item.marketEntityName},#{item.licenseCode},#{item.legalPersonName},#{item.creditCode},#{item.productLicenseTime},#{item.certQRCode},#{item.certAuthority},#{item.businessPlace},#{item.licensedItems},#{item.originalFileName},#{item.originalFilePath},#{item.copyFileName},#{item.copyFilePath},#{item.summary},#{item.formStyleContent},#{item.formContent},#{item.processStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.reportUserId},#{item.reportUserName},#{item.reportTime},#{item.createUserName},#{item.updateUserName}) (#{item.siteId},#{item.siteName},#{item.catalogId},#{item.catalogName},#{item.applyId},#{item.documentId},#{item.documentName},#{item.deptId},#{item.deptName},#{item.marketEntityName},#{item.licenseCode},#{item.legalPersonName},#{item.creditCode},#{item.productLicenseTime},#{item.certQRCode},#{item.certAuthority},#{item.businessPlace},#{item.licensedItems},#{item.originalFileName},#{item.originalFilePath},#{item.copyFileName},#{item.copyFilePath},#{item.summary},#{item.formStyleContent},#{item.formContent},#{item.processStatus},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime},#{item.reportUserId},#{item.reportUserName},#{item.reportTime},#{item.createUserName},#{item.updateUserName},#{item.deleted},#{item.shortName},#{item.ext1},#{item.ext2},#{item.ext3},#{item.ext4},#{item.ext5},#{item.ext6},#{item.ext7},#{item.ext8},#{item.childStatus})
</foreach> </foreach>
</insert> </insert>
...@@ -319,6 +363,45 @@ ...@@ -319,6 +363,45 @@
<if test="(colPickMode==0 and data.containsKey('updateUserName')) or (colPickMode==1 and !data.containsKey('updateUserName'))"> <if test="(colPickMode==0 and data.containsKey('updateUserName')) or (colPickMode==1 and !data.containsKey('updateUserName'))">
a.updateUserName=#{data.updateUserName}, a.updateUserName=#{data.updateUserName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deleted')) or (colPickMode==1 and !data.containsKey('deleted'))">
a.deleted=#{data.deleted},
</if>
<if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
a.shortName=#{data.shortName},
</if>
<if test="(colPickMode==0 and data.containsKey('ext1')) or (colPickMode==1 and !data.containsKey('ext1'))">
a.ext1=#{data.ext1},
</if>
<if test="(colPickMode==0 and data.containsKey('ext2')) or (colPickMode==1 and !data.containsKey('ext2'))">
a.ext2=#{data.ext2},
</if>
<if test="(colPickMode==0 and data.containsKey('ext3')) or (colPickMode==1 and !data.containsKey('ext3'))">
a.ext3=#{data.ext3},
</if>
<if test="(colPickMode==0 and data.containsKey('ext4')) or (colPickMode==1 and !data.containsKey('ext4'))">
a.ext4=#{data.ext4},
</if>
<if test="(colPickMode==0 and data.containsKey('ext5')) or (colPickMode==1 and !data.containsKey('ext5'))">
a.ext5=#{data.ext5},
</if>
<if test="(colPickMode==0 and data.containsKey('ext6')) or (colPickMode==1 and !data.containsKey('ext6'))">
a.ext6=#{data.ext6},
</if>
<if test="(colPickMode==0 and data.containsKey('ext7')) or (colPickMode==1 and !data.containsKey('ext7'))">
a.ext7=#{data.ext7},
</if>
<if test="(colPickMode==0 and data.containsKey('ext8')) or (colPickMode==1 and !data.containsKey('ext8'))">
a.ext8=#{data.ext8},
</if>
<if test="(colPickMode==0 and data.containsKey('childStatus')) or (colPickMode==1 and !data.containsKey('childStatus'))">
a.childStatus=#{data.childStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('childStatusIncrement')) or (colPickMode==1 and !data.containsKey('childStatusIncrement'))">
a.childStatus=ifnull(a.childStatus,0) + #{data.childStatusIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -628,6 +711,93 @@ ...@@ -628,6 +711,93 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deleted=(case" suffix="ELSE deleted end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('deleted')) or (colPickMode==1 and !item.containsKey('deleted'))">
when a.id=#{item.id} then #{item.deleted}
</when>
<when test="(colPickMode==0 and item.containsKey('deletedIncrement')) or (colPickMode==1 and !item.containsKey('deletedIncrement'))">
when a.id=#{item.id} then ifnull(a.deleted,0) + #{item.deletedIncrement}
</when>
</choose>
</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 prefix="ext1=(case" suffix="ELSE ext1 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext1')) or (colPickMode==1 and !item.containsKey('ext1'))">
when a.id=#{item.id} then #{item.ext1}
</if>
</foreach>
</trim>
<trim prefix="ext2=(case" suffix="ELSE ext2 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext2')) or (colPickMode==1 and !item.containsKey('ext2'))">
when a.id=#{item.id} then #{item.ext2}
</if>
</foreach>
</trim>
<trim prefix="ext3=(case" suffix="ELSE ext3 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext3')) or (colPickMode==1 and !item.containsKey('ext3'))">
when a.id=#{item.id} then #{item.ext3}
</if>
</foreach>
</trim>
<trim prefix="ext4=(case" suffix="ELSE ext4 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext4')) or (colPickMode==1 and !item.containsKey('ext4'))">
when a.id=#{item.id} then #{item.ext4}
</if>
</foreach>
</trim>
<trim prefix="ext5=(case" suffix="ELSE ext5 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext5')) or (colPickMode==1 and !item.containsKey('ext5'))">
when a.id=#{item.id} then #{item.ext5}
</if>
</foreach>
</trim>
<trim prefix="ext6=(case" suffix="ELSE ext6 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext6')) or (colPickMode==1 and !item.containsKey('ext6'))">
when a.id=#{item.id} then #{item.ext6}
</if>
</foreach>
</trim>
<trim prefix="ext7=(case" suffix="ELSE ext7 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext7')) or (colPickMode==1 and !item.containsKey('ext7'))">
when a.id=#{item.id} then #{item.ext7}
</if>
</foreach>
</trim>
<trim prefix="ext8=(case" suffix="ELSE ext8 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ext8')) or (colPickMode==1 and !item.containsKey('ext8'))">
when a.id=#{item.id} then #{item.ext8}
</if>
</foreach>
</trim>
<trim prefix="childStatus=(case" suffix="ELSE childStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('childStatus')) or (colPickMode==1 and !item.containsKey('childStatus'))">
when a.id=#{item.id} then #{item.childStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('childStatusIncrement')) or (colPickMode==1 and !item.containsKey('childStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.childStatus,0) + #{item.childStatusIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1561,6 +1731,249 @@ ...@@ -1561,6 +1731,249 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deleted')">
<if test="conditionParamRef.deleted != null ">
${_conditionType_} a.deleted = #{${_conditionParam_}.deleted}
</if>
<if test="conditionParamRef.deleted == null">
${_conditionType_} a.deleted is null
</if>
</if>
<if test="conditionParamRef.containsKey('deletedList') and conditionParamRef.deletedList.size() > 0">
${_conditionType_} a.deleted in
<foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deletedNotList') and conditionParamRef.deletedNotList.size() > 0">
${_conditionType_} a.deleted not in
<foreach collection="conditionParamRef.deletedNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
</if>
<if test="conditionParamRef.containsKey('deletedEnd') and conditionParamRef.deletedEnd != null">
${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
</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>
<if test="conditionParamRef.containsKey('ext1')">
<if test="conditionParamRef.ext1 != null and conditionParamRef.ext1 != ''">
${_conditionType_} a.ext1 like #{${_conditionParam_}.ext1}
</if>
<if test="conditionParamRef.ext1 == null">
${_conditionType_} a.ext1 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext1List') and conditionParamRef.ext1List.size() > 0">
${_conditionType_} a.ext1 in
<foreach collection="conditionParamRef.ext1List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext1NotList') and conditionParamRef.ext1NotList.size() > 0">
${_conditionType_} a.ext1 not in
<foreach collection="conditionParamRef.ext1NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext2')">
<if test="conditionParamRef.ext2 != null and conditionParamRef.ext2 != ''">
${_conditionType_} a.ext2 like #{${_conditionParam_}.ext2}
</if>
<if test="conditionParamRef.ext2 == null">
${_conditionType_} a.ext2 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext2List') and conditionParamRef.ext2List.size() > 0">
${_conditionType_} a.ext2 in
<foreach collection="conditionParamRef.ext2List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext2NotList') and conditionParamRef.ext2NotList.size() > 0">
${_conditionType_} a.ext2 not in
<foreach collection="conditionParamRef.ext2NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext3')">
<if test="conditionParamRef.ext3 != null and conditionParamRef.ext3 != ''">
${_conditionType_} a.ext3 like #{${_conditionParam_}.ext3}
</if>
<if test="conditionParamRef.ext3 == null">
${_conditionType_} a.ext3 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext3List') and conditionParamRef.ext3List.size() > 0">
${_conditionType_} a.ext3 in
<foreach collection="conditionParamRef.ext3List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext3NotList') and conditionParamRef.ext3NotList.size() > 0">
${_conditionType_} a.ext3 not in
<foreach collection="conditionParamRef.ext3NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext4')">
<if test="conditionParamRef.ext4 != null and conditionParamRef.ext4 != ''">
${_conditionType_} a.ext4 like #{${_conditionParam_}.ext4}
</if>
<if test="conditionParamRef.ext4 == null">
${_conditionType_} a.ext4 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext4List') and conditionParamRef.ext4List.size() > 0">
${_conditionType_} a.ext4 in
<foreach collection="conditionParamRef.ext4List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext4NotList') and conditionParamRef.ext4NotList.size() > 0">
${_conditionType_} a.ext4 not in
<foreach collection="conditionParamRef.ext4NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext5')">
<if test="conditionParamRef.ext5 != null and conditionParamRef.ext5 != ''">
${_conditionType_} a.ext5 like #{${_conditionParam_}.ext5}
</if>
<if test="conditionParamRef.ext5 == null">
${_conditionType_} a.ext5 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext5List') and conditionParamRef.ext5List.size() > 0">
${_conditionType_} a.ext5 in
<foreach collection="conditionParamRef.ext5List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext5NotList') and conditionParamRef.ext5NotList.size() > 0">
${_conditionType_} a.ext5 not in
<foreach collection="conditionParamRef.ext5NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext6')">
<if test="conditionParamRef.ext6 != null and conditionParamRef.ext6 != ''">
${_conditionType_} a.ext6 like #{${_conditionParam_}.ext6}
</if>
<if test="conditionParamRef.ext6 == null">
${_conditionType_} a.ext6 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext6List') and conditionParamRef.ext6List.size() > 0">
${_conditionType_} a.ext6 in
<foreach collection="conditionParamRef.ext6List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext6NotList') and conditionParamRef.ext6NotList.size() > 0">
${_conditionType_} a.ext6 not in
<foreach collection="conditionParamRef.ext6NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext7')">
<if test="conditionParamRef.ext7 != null and conditionParamRef.ext7 != ''">
${_conditionType_} a.ext7 like #{${_conditionParam_}.ext7}
</if>
<if test="conditionParamRef.ext7 == null">
${_conditionType_} a.ext7 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext7List') and conditionParamRef.ext7List.size() > 0">
${_conditionType_} a.ext7 in
<foreach collection="conditionParamRef.ext7List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext7NotList') and conditionParamRef.ext7NotList.size() > 0">
${_conditionType_} a.ext7 not in
<foreach collection="conditionParamRef.ext7NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext8')">
<if test="conditionParamRef.ext8 != null and conditionParamRef.ext8 != ''">
${_conditionType_} a.ext8 like #{${_conditionParam_}.ext8}
</if>
<if test="conditionParamRef.ext8 == null">
${_conditionType_} a.ext8 is null
</if>
</if>
<if test="conditionParamRef.containsKey('ext8List') and conditionParamRef.ext8List.size() > 0">
${_conditionType_} a.ext8 in
<foreach collection="conditionParamRef.ext8List" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ext8NotList') and conditionParamRef.ext8NotList.size() > 0">
${_conditionType_} a.ext8 not in
<foreach collection="conditionParamRef.ext8NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('childStatus')">
<if test="conditionParamRef.childStatus != null ">
${_conditionType_} a.childStatus = #{${_conditionParam_}.childStatus}
</if>
<if test="conditionParamRef.childStatus == null">
${_conditionType_} a.childStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('childStatusList') and conditionParamRef.childStatusList.size() > 0">
${_conditionType_} a.childStatus in
<foreach collection="conditionParamRef.childStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('childStatusNotList') and conditionParamRef.childStatusNotList.size() > 0">
${_conditionType_} a.childStatus not in
<foreach collection="conditionParamRef.childStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('childStatusStart') and conditionParamRef.childStatusStart != null">
${_conditionType_} a.childStatus <![CDATA[ >= ]]> #{${_conditionParam_}.childStatusStart}
</if>
<if test="conditionParamRef.containsKey('childStatusEnd') and conditionParamRef.childStatusEnd != null">
${_conditionType_} a.childStatus <![CDATA[ <= ]]> #{${_conditionParam_}.childStatusEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1635,6 +2048,20 @@ ...@@ -1635,6 +2048,20 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('deletedList') and conditionParamRef.deletedList.size() > 0">
field(a.deleted,
<foreach collection="conditionParamRef.deletedList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('childStatusList') and conditionParamRef.childStatusList.size() > 0">
field(a.childStatus,
<foreach collection="conditionParamRef.childStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
...@@ -1713,6 +2140,20 @@ ...@@ -1713,6 +2140,20 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('deletedList') and conditionParamRef.deletedList.size() > 0">
field(a.deleted,
<foreach collection="conditionParamRef.deletedList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('childStatusList') and conditionParamRef.childStatusList.size() > 0">
field(a.childStatus,
<foreach collection="conditionParamRef.childStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1899,6 +2340,61 @@ ...@@ -1899,6 +2340,61 @@
<if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if> <if test='orderCol.updateUserName != null and "DESC".equalsIgnoreCase(orderCol.updateUserName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deleted')">
a.deleted
<if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('shortName')">
a.shortName
<if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext1')">
a.ext1
<if test='orderCol.ext1 != null and "DESC".equalsIgnoreCase(orderCol.ext1)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext2')">
a.ext2
<if test='orderCol.ext2 != null and "DESC".equalsIgnoreCase(orderCol.ext2)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext3')">
a.ext3
<if test='orderCol.ext3 != null and "DESC".equalsIgnoreCase(orderCol.ext3)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext4')">
a.ext4
<if test='orderCol.ext4 != null and "DESC".equalsIgnoreCase(orderCol.ext4)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext5')">
a.ext5
<if test='orderCol.ext5 != null and "DESC".equalsIgnoreCase(orderCol.ext5)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext6')">
a.ext6
<if test='orderCol.ext6 != null and "DESC".equalsIgnoreCase(orderCol.ext6)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext7')">
a.ext7
<if test='orderCol.ext7 != null and "DESC".equalsIgnoreCase(orderCol.ext7)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ext8')">
a.ext8
<if test='orderCol.ext8 != null and "DESC".equalsIgnoreCase(orderCol.ext8)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('childStatus')">
a.childStatus
<if test='orderCol.childStatus != null and "DESC".equalsIgnoreCase(orderCol.childStatus)'>DESC</if>
,
</if>
</trim> </trim>
</if> </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