Skip to content

C
certificate-print
Commit 091a205c authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

申请表增加字段

parent 60fdfe80
Show whitespace changes
Inline Side-by-side
Showing with 1912 additions and 1678 deletions
certificate-manager/doc/api.md
View file @ 091a205c
......@@ -1226,9 +1226,13 @@ data|object|数据对象
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  catalogId|Long|证照目录ID
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
......@@ -1243,9 +1247,14 @@ data|object|数据对象
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriPreview|String|正本预览地址
  oriFormContent|String|证照模板正本表单内容
  oriFormTemplate|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupPreview|String|副本预览地址
  dupFormContent|String|证照模板副本表单内容
  dupFormTemplate|String|证照模板副本表单内容
  generateStatus|Integer|生成状态1未生成2正本3副本4正副本
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1289,6 +1298,7 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 catalogId|Long|证照目录ID
 certificateCode|String|证件编号
 certificateName|String|证件名称
 issueTime|Date|颁发时间
......@@ -1303,9 +1313,14 @@ data|object|数据对象
 validityEnd|Date|有效期截止
 privateID|String|专网ID
 originalUrl|String|正本附件地址
 oriPreview|String|正本预览地址
 oriFormContent|String|证照模板正本表单内容
 oriFormTemplate|String|证照模板正本表单内容
 duplicateUrl|String|副本附件地址
 dupPreview|String|副本预览地址
 dupFormContent|String|证照模板副本表单内容
 dupFormTemplate|String|证照模板副本表单内容
 generateStatus|Integer|生成状态1未生成2正本3副本4正副本
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
......@@ -1317,28 +1332,34 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":2645,
"certificateCode":"9v2lss",
"certificateName":"ec69aa",
"issueTime":"2022-10-14",
"pickerName":"cp098u",
"pickerIDCardNo":"x3gxh4",
"holderType":6745,
"holderIdType":2853,
"holderName":"zdzypz",
"holderIDCardNo":"k20etx",
"enterpriseName":"qey9af",
"validityStart":"2022-10-14",
"validityEnd":"2022-10-14",
"privateID":"s6ysxa",
"originalUrl":"bx2ri0",
"oriFormContent":"795iua",
"duplicateUrl":"lav2ka",
"dupFormContent":"3k23kk",
"createUserId":1518,
"createTime":"2022-10-14",
"updateUserId":3869,
"updateTime":"2022-10-14"
"id":66,
"catalogId":5739,
"certificateCode":"zgflfl",
"certificateName":"u5b0u0",
"issueTime":"2022-10-22",
"pickerName":"hz830a",
"pickerIDCardNo":"u4moff",
"holderType":5494,
"holderIdType":4426,
"holderName":"g01r71",
"holderIDCardNo":"uw99m5",
"enterpriseName":"b2x3hr",
"validityStart":"2022-10-22",
"validityEnd":"2022-10-22",
"privateID":"zvtrfv",
"originalUrl":"g0ftda",
"oriPreview":"3ensip",
"oriFormContent":"vsuqzh",
"oriFormTemplate":"fdgvwo",
"duplicateUrl":"5084vu",
"dupPreview":"kpu0kj",
"dupFormContent":"9gl844",
"dupFormTemplate":"49xc7h",
"generateStatus":1852,
"createUserId":1381,
"createTime":"2022-10-22",
"updateUserId":2138,
"updateTime":"2022-10-22"
}
}
```
......@@ -1374,6 +1395,8 @@ validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
**请求样例:**
```
......@@ -1392,7 +1415,10 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"oriFormTemplate":"xhqyv8",
"dupFormContent":"ewgbh6",
"dupFormTemplate":"06u2zv",
}
```
......@@ -1406,7 +1432,7 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  catalogId|Long|目录ID
  catalogId|Long|证照目录ID
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
......@@ -1421,9 +1447,14 @@ data|object|数据对象
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriPreview|String|正本预览地址
  oriFormContent|String|证照模板正本表单内容
  oriFormTemplate|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupPreview|String|副本预览地址
  dupFormContent|String|证照模板副本表单内容
  dupFormTemplate|String|证照模板副本表单内容
  generateStatus|Integer|生成状态1未生成2正本3副本4正副本
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1488,6 +1519,7 @@ msg|String|消息|-
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
......@@ -1503,7 +1535,7 @@ validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
**请求样例:**
```
......@@ -1522,7 +1554,8 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"oriFormTemplate":"xhqyv8"
}
```
......@@ -1582,6 +1615,7 @@ data|object|数据对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
......@@ -1596,8 +1630,8 @@ enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
**请求样例:**
```
......@@ -1616,7 +1650,8 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"dupFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"dupFormTemplate":"06u2zv",
}
```
......@@ -1677,6 +1712,7 @@ data|object|数据对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
......@@ -1692,7 +1728,7 @@ validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
**请求样例:**
```
......@@ -1711,7 +1747,8 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"oriFormTemplate":"xhqyv8"
}
```
......@@ -1772,6 +1809,7 @@ data|object|数据对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
......@@ -1786,8 +1824,8 @@ enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
**请求样例:**
```
......@@ -1806,7 +1844,8 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"dupFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"dupFormTemplate":"06u2zv",
}
```
......@@ -1867,6 +1906,7 @@ data|object|数据对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
......@@ -1883,6 +1923,8 @@ validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
**请求样例:**
```
......@@ -1901,7 +1943,10 @@ dupFormContent|String|否|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}"
"oriFormContent": "{'i_1_卫':'川','i_2_字':'2022', 'i_3_号':'10','i_4_单位名称':'成都壹糖文化传播有限公司','i_5_法定代表人':'廖至敬','i_6_地址':'成都市武侯区晋吉南路98号','i_7_许可项目':'奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果','i_8_年始':'2021','i_9_月始':'01','i_10_日始':'01','i_11_年止':'2023','i_12_月止':'12','i_13_日止':'31','i_14_年':'2020','i_15_月':'12','i_16_日':'30'}",
"oriFormTemplate":"xhqyv8",
"dupFormContent":"ewgbh6",
"dupFormTemplate":"06u2zv",
}
```
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 091a205c
......@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
/**
* 证照申请实体对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照申请实体对象
*
* @author zxfei
* @date 2022-10-22
*/
public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L;
......@@ -85,6 +85,10 @@ public class ApplyLogEntity extends ApplyLogVo {
* 证照模板正本表单内容
*/
private String oriFormContent;
/**
* 证照模板正本表单内容
*/
private String oriFormTemplate;
/**
* 副本附件地址
*/
......@@ -97,6 +101,10 @@ public class ApplyLogEntity extends ApplyLogVo {
* 证照模板副本表单内容
*/
private String dupFormContent;
/**
* 证照模板副本表单内容
*/
private String dupFormTemplate;
/**
* 生成状态1未生成2正本3副本4正副本
*/
......@@ -343,6 +351,20 @@ public class ApplyLogEntity extends ApplyLogVo {
public void setOriFormContent(String oriFormContent){
this.oriFormContent = oriFormContent;
}
/**
* 获取 证照模板正本表单内容
* @return String
*/
public String getOriFormTemplate(){
return oriFormTemplate;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplate
*/
public void setOriFormTemplate(String oriFormTemplate){
this.oriFormTemplate = oriFormTemplate;
}
/**
* 获取 副本附件地址
* @return String
......@@ -385,6 +407,20 @@ public class ApplyLogEntity extends ApplyLogVo {
public void setDupFormContent(String dupFormContent){
this.dupFormContent = dupFormContent;
}
/**
* 获取 证照模板副本表单内容
* @return String
*/
public String getDupFormTemplate(){
return dupFormTemplate;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplate
*/
public void setDupFormTemplate(String dupFormTemplate){
this.dupFormTemplate = dupFormTemplate;
}
/**
* 获取 生成状态1未生成2正本3副本4正副本
* @return Integer
......@@ -438,9 +474,11 @@ public class ApplyLogEntity extends ApplyLogVo {
sb.append(",originalUrl:").append(getOriginalUrl());
sb.append(",oriPreview:").append(getOriPreview());
sb.append(",oriFormContent:").append(getOriFormContent());
sb.append(",oriFormTemplate:").append(getOriFormTemplate());
sb.append(",duplicateUrl:").append(getDuplicateUrl());
sb.append(",dupPreview:").append(getDupPreview());
sb.append(",dupFormContent:").append(getDupFormContent());
sb.append(",dupFormTemplate:").append(getDupFormTemplate());
sb.append(",generateStatus:").append(getGenerateStatus());
return sb.toString();
}
......@@ -481,12 +519,16 @@ public class ApplyLogEntity extends ApplyLogVo {
this.oriFormContent = "";
this.oriFormTemplate = "";
this.duplicateUrl = "";
this.dupPreview = "";
this.dupFormContent = "";
this.dupFormTemplate = "";
this.generateStatus = 1;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 091a205c
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
/**
* 证照申请查询对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照申请查询对象
*
* @author zxfei
* @date 2022-10-22
*/
public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -109,6 +109,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 证照模板正本表单内容 */
private List<String> oriFormContentList;
/** 证照模板正本表单内容 */
private List<String> oriFormTemplateList;
/** 副本附件地址 */
private List<String> duplicateUrlList;
......@@ -118,6 +121,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 证照模板副本表单内容 */
private List<String> dupFormContentList;
/** 证照模板副本表单内容 */
private List<String> dupFormTemplateList;
/** 开始 生成状态1未生成2正本3副本4正副本 */
private Integer generateStatusStart;
......@@ -691,6 +697,21 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setOriFormContentList(List<String> oriFormContentList){
this.oriFormContentList = oriFormContentList;
}
/**
* 获取 证照模板正本表单内容
* @return oriFormTemplateList
*/
public List<String> getOriFormTemplateList(){
return this.oriFormTemplateList;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplateList
*/
public void setOriFormTemplateList(List<String> oriFormTemplateList){
this.oriFormTemplateList = oriFormTemplateList;
}
/**
* 获取 副本附件地址
* @return duplicateUrlList
......@@ -736,6 +757,21 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setDupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList;
}
/**
* 获取 证照模板副本表单内容
* @return dupFormTemplateList
*/
public List<String> getDupFormTemplateList(){
return this.dupFormTemplateList;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplateList
*/
public void setDupFormTemplateList(List<String> dupFormTemplateList){
this.dupFormTemplateList = dupFormTemplateList;
}
/**
* 获取 开始 生成状态1未生成2正本3副本4正副本
* @return generateStatusStart
......@@ -1385,6 +1421,25 @@ public class ApplyLogQuery extends ApplyLogEntity {
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplate
*/
public ApplyLogQuery oriFormTemplate(String oriFormTemplate){
setOriFormTemplate(oriFormTemplate);
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplateList
*/
public ApplyLogQuery oriFormTemplateList(List<String> oriFormTemplateList){
this.oriFormTemplateList = oriFormTemplateList;
return this;
}
/**
* 设置 副本附件地址
* @param duplicateUrl
......@@ -1441,6 +1496,25 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplate
*/
public ApplyLogQuery dupFormTemplate(String dupFormTemplate){
setDupFormTemplate(dupFormTemplate);
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplateList
*/
public ApplyLogQuery dupFormTemplateList(List<String> dupFormTemplateList){
this.dupFormTemplateList = dupFormTemplateList;
return this;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatus
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java
View file @ 091a205c
......@@ -17,4 +17,9 @@ import java.util.List;
public class ApplyLogVo extends BaseEntityLong {
/** 查询条件 */
private String query;
/**
* 证照目录编号
*/
private String catalogCode;
}
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 091a205c
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl">
<!-- 字段和属性映射 -->
......@@ -23,9 +23,11 @@
<result property="originalUrl" column="originalUrl" />
<result property="oriPreview" column="oriPreview" />
<result property="oriFormContent" column="oriFormContent" />
<result property="oriFormTemplate" column="oriFormTemplate" />
<result property="duplicateUrl" column="duplicateUrl" />
<result property="dupPreview" column="dupPreview" />
<result property="dupFormContent" column="dupFormContent" />
<result property="dupFormTemplate" column="dupFormTemplate" />
<result property="generateStatus" column="generateStatus" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
......@@ -92,6 +94,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormContent') or colPickMode == 1 and data.containsKey('oriFormContent')))">
a.oriFormContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormTemplate') or colPickMode == 1 and data.containsKey('oriFormTemplate')))">
a.oriFormTemplate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duplicateUrl') or colPickMode == 1 and data.containsKey('duplicateUrl')))">
a.duplicateUrl,
</if>
......@@ -101,6 +106,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFormContent') or colPickMode == 1 and data.containsKey('dupFormContent')))">
a.dupFormContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFormTemplate') or colPickMode == 1 and data.containsKey('dupFormTemplate')))">
a.dupFormTemplate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('generateStatus') or colPickMode == 1 and data.containsKey('generateStatus')))">
a.generateStatus,
</if>
......@@ -121,18 +129,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_apply_log
(catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,duplicateUrl,dupPreview,dupFormContent,generateStatus,createUserId,createTime,updateUserId,updateTime)
(catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,oriFormTemplate,duplicateUrl,dupPreview,dupFormContent,dupFormTemplate,generateStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogId},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{originalUrl},#{oriPreview},#{oriFormContent},#{duplicateUrl},#{dupPreview},#{dupFormContent},#{generateStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{catalogId},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{originalUrl},#{oriPreview},#{oriFormContent},#{oriFormTemplate},#{duplicateUrl},#{dupPreview},#{dupFormContent},#{dupFormTemplate},#{generateStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log
(catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,duplicateUrl,dupPreview,dupFormContent,generateStatus,createUserId,createTime,updateUserId,updateTime)
(catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,oriFormTemplate,duplicateUrl,dupPreview,dupFormContent,dupFormTemplate,generateStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.originalUrl},#{item.oriPreview},#{item.oriFormContent},#{item.duplicateUrl},#{item.dupPreview},#{item.dupFormContent},#{item.generateStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.catalogId},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.originalUrl},#{item.oriPreview},#{item.oriFormContent},#{item.oriFormTemplate},#{item.duplicateUrl},#{item.dupPreview},#{item.dupFormContent},#{item.dupFormTemplate},#{item.generateStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -202,6 +210,9 @@
<if test="(colPickMode==0 and data.containsKey('oriFormContent')) or (colPickMode==1 and !data.containsKey('oriFormContent'))">
a.oriFormContent=#{data.oriFormContent},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFormTemplate')) or (colPickMode==1 and !data.containsKey('oriFormTemplate'))">
a.oriFormTemplate=#{data.oriFormTemplate},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))">
a.duplicateUrl=#{data.duplicateUrl},
</if>
......@@ -211,6 +222,9 @@
<if test="(colPickMode==0 and data.containsKey('dupFormContent')) or (colPickMode==1 and !data.containsKey('dupFormContent'))">
a.dupFormContent=#{data.dupFormContent},
</if>
<if test="(colPickMode==0 and data.containsKey('dupFormTemplate')) or (colPickMode==1 and !data.containsKey('dupFormTemplate'))">
a.dupFormTemplate=#{data.dupFormTemplate},
</if>
<if test="(colPickMode==0 and data.containsKey('generateStatus')) or (colPickMode==1 and !data.containsKey('generateStatus'))">
a.generateStatus=#{data.generateStatus},
</if>
......@@ -381,6 +395,13 @@
</if>
</foreach>
</trim>
<trim prefix="oriFormTemplate=(case" suffix="ELSE oriFormTemplate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriFormTemplate')) or (colPickMode==1 and !item.containsKey('oriFormTemplate'))">
when a.id=#{item.id} then #{item.oriFormTemplate}
</if>
</foreach>
</trim>
<trim prefix="duplicateUrl=(case" suffix="ELSE duplicateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('duplicateUrl')) or (colPickMode==1 and !item.containsKey('duplicateUrl'))">
......@@ -402,6 +423,13 @@
</if>
</foreach>
</trim>
<trim prefix="dupFormTemplate=(case" suffix="ELSE dupFormTemplate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupFormTemplate')) or (colPickMode==1 and !item.containsKey('dupFormTemplate'))">
when a.id=#{item.id} then #{item.dupFormTemplate}
</if>
</foreach>
</trim>
<trim prefix="generateStatus=(case" suffix="ELSE generateStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -848,6 +876,21 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriFormTemplate')">
<if test="conditionParamRef.oriFormTemplate != null and conditionParamRef.oriFormTemplate != ''">
${_conditionType_} a.oriFormTemplate like #{${_conditionParam_}.oriFormTemplate}
</if>
<if test="conditionParamRef.oriFormTemplate == null">
${_conditionType_} a.oriFormTemplate is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriFormTemplateList')">
${_conditionType_} a.oriFormTemplate in
<foreach collection="conditionParamRef.oriFormTemplateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('duplicateUrl')">
<if test="conditionParamRef.duplicateUrl != null and conditionParamRef.duplicateUrl != ''">
${_conditionType_} a.duplicateUrl like #{${_conditionParam_}.duplicateUrl}
......@@ -892,6 +935,21 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupFormTemplate')">
<if test="conditionParamRef.dupFormTemplate != null and conditionParamRef.dupFormTemplate != ''">
${_conditionType_} a.dupFormTemplate like #{${_conditionParam_}.dupFormTemplate}
</if>
<if test="conditionParamRef.dupFormTemplate == null">
${_conditionType_} a.dupFormTemplate is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupFormTemplateList')">
${_conditionType_} a.dupFormTemplate in
<foreach collection="conditionParamRef.dupFormTemplateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('generateStatus')">
<if test="conditionParamRef.generateStatus != null ">
${_conditionType_} a.generateStatus = #{${_conditionParam_}.generateStatus}
......@@ -1088,6 +1146,11 @@
<if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFormTemplate')">
a.oriFormTemplate
<if test='orderCol.oriFormTemplate != null and "DESC".equalsIgnoreCase(orderCol.oriFormTemplate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateUrl')">
a.duplicateUrl
<if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if>
......@@ -1103,6 +1166,11 @@
<if test='orderCol.dupFormContent != null and "DESC".equalsIgnoreCase(orderCol.dupFormContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupFormTemplate')">
a.dupFormTemplate
<if test='orderCol.dupFormTemplate != null and "DESC".equalsIgnoreCase(orderCol.dupFormTemplate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('generateStatus')">
a.generateStatus
<if test='orderCol.generateStatus != null and "DESC".equalsIgnoreCase(orderCol.generateStatus)'>DESC</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