Skip to content

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

修改目录表结构

parent aac088b9
Show whitespace changes
Inline Side-by-side
Showing with 9006 additions and 7385 deletions
certificate-manager/doc/api.md
View file @ 4aa851e7
......@@ -310,13 +310,13 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":1958,
"parentId":4813,
"industryName":"ec10et",
"createUserId":8488,
"createTime":"2022-10-14",
"updateUserId":2911,
"updateTime":"2022-10-14"
"id":28,
"parentId":447,
"industryName":"z28x9s",
"createUserId":4279,
"createTime":"2022-11-04",
"updateUserId":7800,
"updateTime":"2022-11-04"
}
}
```
......@@ -346,8 +346,8 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"parentId":6814,
"industryName":"stp8da",
"parentId":3139,
"industryName":"xm07az",
}
```
......@@ -518,16 +518,16 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":5530,
"classifyName":"703nul",
"sort":4710,
"total":7396,
"showFront":3661,
"classifyType":6516,
"createUserId":62,
"createTime":"2022-10-14",
"updateUserId":4515,
"updateTime":"2022-10-14"
"id":4157,
"classifyName":"ot0iwl",
"sort":3174,
"total":7830,
"showFront":3789,
"classifyType":898,
"createUserId":4085,
"createTime":"2022-11-04",
"updateUserId":5493,
"updateTime":"2022-11-04"
}
}
```
......@@ -556,11 +556,11 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"classifyName":"195q87",
"sort":6734,
"total":9720,
"showFront":1912,
"classifyType":3543,
"classifyName":"nkbgui",
"sort":9446,
"total":386,
"showFront":489,
"classifyType":7466,
}
```
......@@ -678,21 +678,19 @@ data|object|数据对象
  transverse|Integer|横向尺寸(单位mm)
  portrait|Integer|纵向尺寸(单位mm)
  inspect|Integer|是否需要年检，0：否1：是
  oriFileName|String|证照模板正本文件名称
  originalUrl|String|证照模板正本文件地址
  oriFormContent|String|证照模板正本表单内容
  dupFileName|String|证照模板副本文件名称
  duplicateUrl|String|证照模板副本文件地址
  dupFormContent|String|证照模板副本表单内容
  templateName|String|证照模板文件名称
  templateUrl|String|证照模板文件地址
  formContent|String|证照模板表单内容
  exampleUrl|String|证照示例图地址
  status|Integer|证照状态，0：禁用1：启用
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
  deviceId|Long|打印设备Id
dict|object|字典对象
**响应消息样例:**
......@@ -740,21 +738,19 @@ data|object|数据对象
 transverse|Integer|横向尺寸(单位mm)
 portrait|Integer|纵向尺寸(单位mm)
 inspect|Integer|是否需要年检，0：否1：是
 oriFileName|String|证照模板正本文件名称
 originalUrl|String|证照模板正本文件地址
 oriFormContent|String|证照模板正本表单内容
 dupFileName|String|证照模板副本文件名称
 duplicateUrl|String|证照模板副本文件地址
 dupFormContent|String|证照模板副本表单内容
 templateName|String|证照模板文件名称
 templateUrl|String|证照模板文件地址
 formContent|String|证照模板表单内容
 exampleUrl|String|证照示例图地址
 status|Integer|证照状态，0：禁用1：启用
 printerName|String|打印机名称
 printerIp|String|打印机网络地址
 paperSource|String|打印机纸盒
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
 deviceId|Long|打印设备Id
dict|object|字典对象
**响应消息样例:**
......@@ -762,30 +758,28 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":6672,
"catalogName":"tn0ocm",
"catalogCode":"ck4h3r",
"holderType":7336,
"industryId":8422,
"classifyId":885,
"transverse":2507,
"portrait":8544,
"inspect":8716,
"oriFileName":"1c7e64",
"originalUrl":"gx4x4m",
"oriFormContent":"zbon1g",
"dupFileName":"5zupd6",
"duplicateUrl":"i5z4qg",
"dupFormContent":"7ypaqf",
"exampleUrl":"wk1x7k",
"status":4020,
"createUserId":31,
"createTime":"2022-10-14",
"updateUserId":8897,
"updateTime":"2022-10-14",
"printerName":"aa0y0y",
"printerIp":"cqvvc9",
"paperSource":"55io9h"
"id":7288,
"catalogName":"rb9g5x",
"catalogCode":"pvoi9x",
"holderType":5814,
"industryId":1111,
"classifyId":6403,
"transverse":1061,
"portrait":1544,
"inspect":1023,
"templateName":"kjf6df",
"templateUrl":"jt16cv",
"formContent":"1ksurq",
"exampleUrl":"0nn1np",
"status":2653,
"printerName":"p6nl6t",
"printerIp":"jb0ogn",
"paperSource":"z22j18",
"createUserId":5889,
"createTime":"2022-11-04",
"updateUserId":7711,
"updateTime":"2022-11-04",
"deviceId":4920
}
}
```
......@@ -817,32 +811,27 @@ createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
updateTime|Date|否|更新时间
printerName|String|否|打印机名称
printerIp|String|否|打印机网络地址
paperSource|String|否|打印机纸盒
**请求样例:**
```
{
"catalogName":"0keu8j",
"catalogCode":"ze4s5n",
"holderType":4199,
"industryId":7484,
"classifyId":6098,
"transverse":504,
"portrait":9442,
"inspect":340,
"oriFileName":"xcj9om",
"originalUrl":"fdujv4",
"oriFormContent":"5bbmq3",
"dupFileName":"o7cyq4",
"duplicateUrl":"xzxsix",
"dupFormContent":"ye4wm8",
"exampleUrl":"mgv8im",
"status":1567,
"printerName":"q2bm5t",
"printerIp":"x8xb4l",
"paperSource":"4nccil"
"catalogName":"visn3w",
"catalogCode":"te92ps",
"holderType":4057,
"industryId":9158,
"classifyId":4779,
"transverse":5601,
"portrait":9677,
"inspect":6666,
"templateName":"nyjbzi",
"templateUrl":"dahik4",
"formContent":"xxfsti",
"exampleUrl":"l4bw9a",
"status":9985,
"printerName":"581i8m",
"printerIp":"ai7c5u",
"paperSource":"rrjszg",
"deviceId":3369
}
```
......@@ -864,21 +853,19 @@ data|object|数据对象
  transverse|Integer|横向尺寸(单位mm)
  portrait|Integer|纵向尺寸(单位mm)
  inspect|Integer|是否需要年检，0：否1：是
  oriFileName|String|证照模板正本文件名称
  originalUrl|String|证照模板正本文件地址
  oriFormContent|String|证照模板正本表单内容
  dupFileName|String|证照模板副本文件名称
  duplicateUrl|String|证照模板副本文件地址
  dupFormContent|String|证照模板副本表单内容
  templateName|String|证照模板文件名称
  templateUrl|String|证照模板文件地址
  formContent|String|证照模板表单内容
  exampleUrl|String|证照示例图地址
  status|Integer|证照状态，0：禁用1：启用
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
  deviceId|Long|打印设备Id
**响应消息样例:**
```
......@@ -1056,29 +1043,29 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":5480,
"deviceName":"2cp6a7",
"deviceCode":"wirjj6",
"deviceType":7879,
"deviceMac":"wh455p",
"deviceFirmname":"6eq60a",
"ip":"iux9gd",
"port":"k8fs88",
"resolution":"rtxlgt",
"leadingOfficial":"h2jsfw",
"telephone":"dsesxa",
"longitude":"tb0l8y",
"latitude":"i1xzes",
"building":1584,
"floor":4320,
"managePWD":"51pr4f",
"remark":"rckqs1",
"status":8877,
"enabled":865,
"createUserId":5775,
"createTime":"2022-10-14",
"updateUserId":7338,
"updateTime":"2022-10-14"
"id":135,
"deviceName":"7us91b",
"deviceCode":"rt6fsz",
"deviceType":712,
"deviceMac":"js6fgt",
"deviceFirmname":"hlw3p5",
"ip":"e5z6ui",
"port":"giwloi",
"resolution":"0wc6ga",
"leadingOfficial":"hfsj4j",
"telephone":"agsdk3",
"longitude":"08o1it",
"latitude":"vyljha",
"building":4530,
"floor":1587,
"managePWD":"o4imor",
"remark":"c5gdn0",
"status":8114,
"enabled":910,
"createUserId":5548,
"createTime":"2022-11-04",
"updateUserId":6196,
"updateTime":"2022-11-04"
}
}
```
......@@ -1107,24 +1094,24 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"deviceName":"n9l8ca",
"deviceCode":"s408e5",
"deviceType":4264,
"deviceMac":"cwxbrj",
"deviceFirmname":"rr4a10",
"ip":"ivjnnr",
"port":"noxbhn",
"resolution":"jrivdw",
"leadingOfficial":"melaoa",
"telephone":"2c4idr",
"longitude":"d6vt1x",
"latitude":"1apomx",
"building":6539,
"floor":4333,
"managePWD":"zr8s6w",
"remark":"ettsc6",
"status":714,
"enabled":670,
"deviceName":"kmu1dd",
"deviceCode":"fwk1xz",
"deviceType":88,
"deviceMac":"xb3ow5",
"deviceFirmname":"bpjlqv",
"ip":"isn1vq",
"port":"jltnku",
"resolution":"dfr8lm",
"leadingOfficial":"ohtnif",
"telephone":"7zb5eb",
"longitude":"if74q1",
"latitude":"kaza8w",
"building":8833,
"floor":846,
"managePWD":"2u9e6v",
"remark":"73pnvx",
"status":3422,
"enabled":8225,
}
```
......@@ -1207,8 +1194,9 @@ msg|String|消息|-
}
```
## 证照柜设备
### 查询证照柜设备模块列表
### 查询证照柜设备列表
**请求URL:** device/module/list
......@@ -1216,7 +1204,7 @@ msg|String|消息|-
**内容类型:** application/json;charset=utf-8
**简要描述:** 查询证照柜设备模块
**简要描述:** 查询证照柜设备
**请求参数:**
......@@ -1267,7 +1255,7 @@ dict|object|字典对象
}
```
### 查看证照柜设备模块
### 查看证照柜设备
**请求URL:** device/module/info
......@@ -1275,7 +1263,7 @@ dict|object|字典对象
**内容类型:** application/json;charset=utf-8
**简要描述:** 查看证照柜设备模块，返回实例详细信息
**简要描述:** 查看证照柜设备，返回实例详细信息
**请求参数:**
......@@ -1312,22 +1300,22 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":1223,
"deviceId":9452,
"deviceName":"2p4d5m",
"moduleName":"natbvq",
"productName":"7h9dq2",
"networkAddress":"s2a58c",
"cartonType":"h35dsu",
"createUserId":8676,
"createTime":"2022-10-26",
"updateUserId":845,
"updateTime":"2022-10-26"
"id":9354,
"deviceId":6091,
"deviceName":"zvrpwm",
"moduleName":"dpm80o",
"productName":"kashg5",
"networkAddress":"joawtq",
"cartonType":"yipf04",
"createUserId":9015,
"createTime":"2022-11-04",
"updateUserId":2663,
"updateTime":"2022-11-04"
}
}
```
### 保存更新证照柜设备模块
### 保存更新证照柜设备
**请求URL:** device/module/save
......@@ -1335,7 +1323,7 @@ dict|object|字典对象
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新证照柜设备模块：id为空时为新增保存，否则为更新提交
**简要描述:** 保存或更新证照柜设备：id为空时为新增保存，否则为更新提交
**请求参数:**
......@@ -1355,12 +1343,12 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"deviceId":4045,
"deviceName":"9bqrsn",
"moduleName":"awiz1g",
"productName":"xub2jg",
"networkAddress":"bhkrd2",
"cartonType":"6f0co4",
"deviceId":7615,
"deviceName":"zbwoqg",
"moduleName":"xe97g6",
"productName":"76e90x",
"networkAddress":"mu9r45",
"cartonType":"gqs0u5",
}
```
......@@ -1396,7 +1384,7 @@ data|object|数据对象
```
### 删除证照柜设备模块
### 删除证照柜设备
**请求URL:** device/module/delete
......@@ -1404,7 +1392,7 @@ data|object|数据对象
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除证照柜设备模块
**简要描述:** 删除证照柜设备
**请求参数:**
......@@ -1431,13 +1419,11 @@ msg|String|消息|-
}
```
## 证照申请
### 查询证照申请列表
**请求URL:** apply/log/list
**请求URL:** record/list
**请求方式:** POST
......@@ -1470,13 +1456,226 @@ data|object|数据对象
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  catalogId|Long|证照目录ID
  catalogName|String|目录名称
  catalogCode|String|目录编号
  recordStatus|Integer|档案状态
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code":1,
"data":{
}
}
```
### 查看证照申请
**请求URL:** record/info
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 查看证照申请，返回实例详细信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|Long|是|ID
**请求样例:**
```
http://localhost/record/info?id=549
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:-------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 catalogId|Long|证照目录ID
 catalogName|String|目录名称
 catalogCode|String|目录编号
 recordStatus|Integer|档案状态
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"code": 1,
"data": {
"id":173,
"catalogId":3710,
"catalogName":"uiufi9",
"catalogCode":"rp723v",
"recordStatus":7804,
"createUserId":6469,
"createTime":"2022-11-04",
"updateUserId":9812,
"updateTime":"2022-11-04"
}
}
```
### 保存更新证照申请
**请求URL:** record/save
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存或更新证照申请：id为空时为新增保存，否则为更新提交
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogName|String|是|目录名称
catalogCode|String|是|目录编号
recordStatus|Integer|是|档案状态
createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
updateTime|Date|否|更新时间
**请求样例:**
```
{
"catalogId":5208,
"catalogName":"azrqck",
"catalogCode":"t32v0y",
"recordStatus":1385,
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  catalogId|Long|证照目录ID
  catalogName|String|目录名称
  catalogCode|String|目录编号
  recordStatus|Integer|档案状态
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
**响应消息样例:**
```
{
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
### 删除证照申请
**请求URL:** record/delete
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除证照申请
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|String|是|数组
**请求样例:**
```
http://localhost:8080/record/delete?id=1&id=2'
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
## 证照申请
### 查询证照申请列表
**请求URL:** apply/log/list
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 查询证照申请
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
**请求样例:**
```
{
"page":1,
"size":10
}
```
**响应参数:**
参数名称|参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  recordId|Long|证照档案ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
......@@ -1490,15 +1689,12 @@ data|object|数据对象
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriPreview|String|正本预览地址
  oriFormContent|String|证照模板正本表单内容
  oriFormTemplate|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupPreview|String|副本预览地址
  dupFormContent|String|证照模板副本表单内容
  dupFormTemplate|String|证照模板副本表单内容
  generateStatus|Integer|生成状态0未生成1正本2副本3正副本
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  formContent|String|证照模板正本表单内容
  formTemplate|String|证照模板正本表单内容
  generateStatus|Integer|生成状态1未生成2已生成
  operType|Integer|档案操作类型1新增2变更
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1542,7 +1738,10 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 recordId|Long|证照档案ID
 catalogId|Long|证照目录ID
 catalogCode|String|证照目录编号
 catalogName|String|目录名称
 certificateCode|String|证件编号
 certificateName|String|证件名称
 issueTime|Date|颁发时间
......@@ -1556,15 +1755,12 @@ data|object|数据对象
 validityStart|Date|有效期起始
 validityEnd|Date|有效期截止
 privateID|String|专网ID
 originalUrl|String|正本附件地址
 oriPreview|String|正本预览地址
 oriFormContent|String|证照模板正本表单内容
 oriFormTemplate|String|证照模板正本表单内容
 duplicateUrl|String|副本附件地址
 dupPreview|String|副本预览地址
 dupFormContent|String|证照模板副本表单内容
 dupFormTemplate|String|证照模板副本表单内容
 generateStatus|Integer|生成状态0未生成1正本2副本3正副本
 certificateUrl|String|证件附件地址
 previewUrl|String|证件预览地址
 formContent|String|证照模板正本表单内容
 formTemplate|String|证照模板正本表单内容
 generateStatus|Integer|生成状态1未生成2已生成
 operType|Integer|档案操作类型1新增2变更
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
......@@ -1576,34 +1772,34 @@ dict|object|字典对象
{
"code": 1,
"data": {
"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"
"id":9435,
"recordId":7178,
"catalogId":4524,
"catalogCode":"im7ssk",
"catalogName":"19a1m4",
"certificateCode":"nad0pe",
"certificateName":"e3ts5u",
"issueTime":"2022-11-04",
"pickerName":"e1d9sy",
"pickerIDCardNo":"lhd5cw",
"holderType":7149,
"holderIdType":6225,
"holderName":"im5i03",
"holderIDCardNo":"yzqxyc",
"enterpriseName":"cc5c6n",
"validityStart":"2022-11-04",
"validityEnd":"2022-11-04",
"privateID":"w32dw3",
"certificateUrl":"3tfowk",
"previewUrl":"x8l3ep",
"formContent":"v2n9z6",
"formTemplate":"ewm6rt",
"generateStatus":4044,
"operType":5743,
"createUserId":8960,
"createTime":"2022-11-04",
"updateUserId":4410,
"updateTime":"2022-11-04"
}
}
```
......@@ -1623,46 +1819,47 @@ dict|object|字典对象
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
issueTime|Date|是|颁发时间
pickerName|String|是|取件人姓名
pickerIDCardNo|String|是|取件人证件号码
catalogCode|String|是|证照目录编号
catalogName|String|是|目录名称
holderType|Integer|是|持有者类型，1：自然人，2：法人，3：自然人法人
holderIdType|Integer|是|持有者证件类型，1：身份证，2：组织机构代码等
holderName|String|是|持有者名称
holderIDCardNo|String|是|持有者证件号码
enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
formContent|String|是|证照模板正本表单内容
formTemplate|String|是|证照模板正本表单内容
generateStatus|Integer|是|生成状态1未生成2已生成
operType|Integer|是|档案操作类型1新增2变更
createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
updateTime|Date|否|更新时间
**请求样例:**
```
{
"catalogId": 1,
"certificateCode": "cxuyh4",
"certificateName": "卫生许可证",
"issueTime": "2022-10-14 12:11:11",
"pickerName": "张三",
"pickerIDCardNo": "12345678",
"holderType": 1,
"holderIdType": 1,
"holderName": "张三",
"holderIDCardNo": "12334569086765",
"enterpriseName": "成都壹糖文化传播有限公司",
"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'}",
"oriFormTemplate":"xhqyv8",
"dupFormContent":"ewgbh6",
"dupFormTemplate":"06u2zv",
"recordId":5270,
"catalogId":7899,
"catalogCode":"fknt80",
"catalogName":"2vwx00",
"certificateCode":"o0rt3c",
"certificateName":"gxog9w",
"issueTime":"2022-11-04",
"pickerName":"evn5gw",
"pickerIDCardNo":"uj89s3",
"holderType":6099,
"holderIdType":2142,
"holderName":"1mbv96",
"holderIDCardNo":"063nj1",
"enterpriseName":"yl41sc",
"validityStart":"2022-11-04",
"validityEnd":"2022-11-04",
"privateID":"8d50xu",
"certificateUrl":"uuksya",
"previewUrl":"dhm3u9",
"formContent":"y9gz4j",
"formTemplate":"vqwf3r",
"generateStatus":6162,
"operType":2446,
}
```
......@@ -1676,7 +1873,10 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  recordId|Long|证照档案ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
......@@ -1690,15 +1890,12 @@ data|object|数据对象
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriPreview|String|正本预览地址
  oriFormContent|String|证照模板正本表单内容
  oriFormTemplate|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupPreview|String|副本预览地址
  dupFormContent|String|证照模板副本表单内容
  dupFormTemplate|String|证照模板副本表单内容
  generateStatus|Integer|生成状态0未生成1正本2副本3正副本
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  formContent|String|证照模板正本表单内容
  formTemplate|String|证照模板正本表单内容
  generateStatus|Integer|生成状态1未生成2已生成
  operType|Integer|档案操作类型1新增2变更
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1710,6 +1907,7 @@ data|object|数据对象
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
......@@ -1747,6 +1945,7 @@ msg|String|消息|-
"code":1,
"msg":"成功"
}
```
### 预览正本
......@@ -1778,8 +1977,7 @@ enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
formContent|String|是|证照模板正本表单内容
**请求样例:**
```
......@@ -1798,8 +1996,7 @@ oriFormTemplate|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'}",
"oriFormTemplate":"xhqyv8"
"formContent": "{'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'}"
}
```
......@@ -1827,10 +2024,12 @@ data|object|数据对象
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriFormContent|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupFormContent|String|证照模板副本表单内容
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  formContent|String|证照模板正本表单内容
  formTemplate|String|证照模板正本表单内容
  generateStatus|Integer|生成状态1未生成2已生成
  operType|Integer|档案操作类型1新增2变更
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1845,15 +2044,16 @@ data|object|数据对象
}
```
### 预览副本
**请求URL:** apply/log/preview/duplicate
### 生成正本
**请求URL:** apply/log/generate/original
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 预览副本
**简要描述:** 预览正本
**请求参数:**
......@@ -1874,8 +2074,7 @@ enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
dupFormContent|String|否|证照模板副本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
formContent|String|是|证照模板正本表单内容
**请求样例:**
```
......@@ -1894,8 +2093,7 @@ dupFormTemplate|String|是|证照模板副本表单内容
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"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",
"formContent": "{'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'}"
}
```
......@@ -1923,10 +2121,12 @@ data|object|数据对象
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriFormContent|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupFormContent|String|证照模板副本表单内容
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  formContent|String|证照模板正本表单内容
  formTemplate|String|证照模板正本表单内容
  generateStatus|Integer|生成状态1未生成2已生成
  operType|Integer|档案操作类型1新增2变更
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -1942,255 +2142,203 @@ data|object|数据对象
```
### 生成正本
## 证照打印记录
**请求URL:** apply/log/generate/original
### 查询证照打印记录列表
**请求URL:** print/wait/queue/list
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 生成正本
**简要描述:** 查询证照打印记录
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
issueTime|Date|是|颁发时间
pickerName|String|是|取件人姓名
pickerIDCardNo|String|是|取件人证件号码
holderType|Integer|是|持有者类型，1：自然人，2：法人，3：自然人法人
holderIdType|Integer|是|持有者证件类型，1：身份证，2：组织机构代码等
holderName|String|是|持有者名称
holderIDCardNo|String|是|持有者证件号码
enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
:---|:---|:---|:------
page|Integer|否|当前页
size|Integer|否|每页条数，值为-1，查询所有记录
**请求样例:**
```
{
"catalogId": 1,
"certificateCode": "cxuyh4",
"certificateName": "卫生许可证",
"issueTime": "2022-10-14 12:11:11",
"pickerName": "张三",
"pickerIDCardNo": "12345678",
"holderType": 1,
"holderIdType": 1,
"holderName": "张三",
"holderIDCardNo": "12334569086765",
"enterpriseName": "成都壹糖文化传播有限公司",
"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'}",
"oriFormTemplate":"xhqyv8"
}
{
"page":1,
"size":10
}
```
**响应参数:**
参数名称 |参数类型|描述
参数名称|参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
 per_page|Integer|每页条数
 total|Integer|总条数
 last_page|Integer|总页数
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  catalogId|Long|目录ID
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
  recordId|Long|证照档案ID
  applyId|Long|申请ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
  holderName|String|持有者姓名
  holderIDCardNo|String|持有者证件号码
  pickerName|String|取件人姓名
  pickerIDCardNo|String|取件人证件号码
  holderType|Integer|持有者类型，1：自然人，2：法人，3：自然人法人
  holderIdType|Integer|持有者证件类型，1：身份证，2：组织机构代码等
  holderName|String|持有者名称
  holderIDCardNo|String|持有者证件号码
  enterpriseName|String|企业名称
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriFormContent|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupFormContent|String|证照模板副本表单内容
  previewUrl|String|证件预览地址
  certificateUrl|String|证件附件地址
  printStatus|Integer|是否完成打印0否1是
  total|Integer|允许打印次数
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"msg":"生成成功",
"code":1,
"data":{}
"data":{
}
}
```
### 生成副本
### 查看证照打印记录
**请求URL:** apply/log/generate/duplicate
**请求URL:** print/wait/queue/info
**请求方式:** POST
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 生成副本
**简要描述:** 查看证照打印记录，返回实例详细信息
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
issueTime|Date|是|颁发时间
pickerName|String|是|取件人姓名
pickerIDCardNo|String|是|取件人证件号码
holderType|Integer|是|持有者类型，1：自然人，2：法人，3：自然人法人
holderIdType|Integer|是|持有者证件类型，1：身份证，2：组织机构代码等
holderName|String|是|持有者名称
holderIDCardNo|String|是|持有者证件号码
enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
dupFormContent|String|否|证照模板副本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
:---|:---|:---|:------
id|Long|是|ID
**请求样例:**
```
{
"catalogId": 1,
"certificateCode": "cxuyh4",
"certificateName": "卫生许可证",
"issueTime": "2022-10-14 12:11:11",
"pickerName": "张三",
"pickerIDCardNo": "12345678",
"holderType": 1,
"holderIdType": 1,
"holderName": "张三",
"holderIDCardNo": "12334569086765",
"enterpriseName": "成都壹糖文化传播有限公司",
"validityStart": "2022-10-14 12:11:11",
"validityEnd": "2022-10-14 12:11:11",
"privateID": "f45vg6",
"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",
}
http://localhost/print/wait/queue/info?id=549
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
:---|:---|:-------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  catalogId|Long|目录ID
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
  pickerName|String|取件人姓名
  pickerIDCardNo|String|取件人证件号码
  holderType|Integer|持有者类型，1：自然人，2：法人，3：自然人法人
  holderIdType|Integer|持有者证件类型，1：身份证，2：组织机构代码等
  holderName|String|持有者名称
  holderIDCardNo|String|持有者证件号码
  enterpriseName|String|企业名称
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriFormContent|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupFormContent|String|证照模板副本表单内容
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
 id|Long|序号，主键，自增长
 recordId|Long|证照档案ID
 applyId|Long|申请ID
 catalogId|Long|证照目录ID
 catalogCode|String|证照目录编号
 catalogName|String|目录名称
 certificateName|String|证照名称
 certificateCode|String|证照编号
 enterpriseName|String|企业名称
 holderName|String|持有者姓名
 holderIDCardNo|String|持有者证件号码
 pickerName|String|取件人姓名
 pickerIDCardNo|String|取件人证件号码
 previewUrl|String|证件预览地址
 certificateUrl|String|证件附件地址
 printStatus|Integer|是否完成打印0否1是
 total|Integer|允许打印次数
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
dict|object|字典对象
**响应消息样例:**
```
{
"msg":"生成成功",
"code":1,
"data":{}
"code": 1,
"data": {
"id":9244,
"recordId":2826,
"applyId":4280,
"catalogId":47,
"catalogCode":"5xfe43",
"catalogName":"gf0a47",
"certificateName":"tmtp8i",
"certificateCode":"7kvgcr",
"enterpriseName":"qwkgkw",
"holderName":"61h3zf",
"holderIDCardNo":"0ts14s",
"pickerName":"p10esg",
"pickerIDCardNo":"4blbld",
"previewUrl":"lwzwxw",
"certificateUrl":"19kaj9",
"printStatus":1757,
"total":4230,
"createUserId":6013,
"createTime":"2022-11-04",
"updateUserId":8962,
"updateTime":"2022-11-04"
}
}
```
### 全部生成
### 保存更新证照打印记录
**请求URL:** apply/log/generate/all
**请求URL:** print/wait/queue/save
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 全部生成
**简要描述:** 保存或更新证照打印记录：id为空时为新增保存，否则为更新提交
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogId|Long|否|目录Id
certificateCode|String|是|证件编号
certificateName|String|是|证件名称
issueTime|Date|是|颁发时间
pickerName|String|是|取件人姓名
pickerIDCardNo|String|是|取件人证件号码
holderType|Integer|是|持有者类型，1：自然人，2：法人，3：自然人法人
holderIdType|Integer|是|持有者证件类型，1：身份证，2：组织机构代码等
holderName|String|是|持有者名称
holderIDCardNo|String|是|持有者证件号码
catalogCode|String|是|证照目录编号
catalogName|String|是|目录名称
certificateName|String|是|证照名称
certificateCode|String|是|证照编号
enterpriseName|String|是|企业名称
validityStart|Date|是|有效期起始
validityEnd|Date|是|有效期截止
privateID|String|是|专网ID
oriFormContent|String|是|证照模板正本表单内容
dupFormContent|String|否|证照模板副本表单内容
oriFormTemplate|String|是|证照模板正本表单内容
dupFormTemplate|String|是|证照模板副本表单内容
holderName|String|是|持有者姓名
printStatus|Integer|是|是否完成打印0否1是
createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
updateTime|Date|否|更新时间
**请求样例:**
```
{
"catalogId": 1,
"certificateCode": "cxuyh4",
"certificateName": "卫生许可证",
"issueTime": "2022-10-14 12:11:11",
"pickerName": "张三",
"pickerIDCardNo": "12345678",
"holderType": 1,
"holderIdType": 1,
"holderName": "张三",
"holderIDCardNo": "12334569086765",
"enterpriseName": "成都壹糖文化传播有限公司",
"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'}",
"oriFormTemplate":"xhqyv8",
"dupFormContent":"ewgbh6",
"dupFormTemplate":"06u2zv",
"recordId":730,
"applyId":7341,
"catalogId":949,
"catalogCode":"64qeeq",
"catalogName":"perv46",
"certificateName":"9opeoi",
"certificateCode":"m9mjel",
"enterpriseName":"42bdgb",
"holderName":"6rphd3",
"holderIDCardNo":"svtv72",
"pickerName":"236ir0",
"pickerIDCardNo":"f88vfw",
"previewUrl":"cqe7kj",
"certificateUrl":"yk4o61",
"printStatus":4012,
"total":9343,
}
```
......@@ -2204,24 +2352,22 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  catalogId|Long|目录ID
  certificateCode|String|证件编号
  certificateName|String|证件名称
  issueTime|Date|颁发时间
  recordId|Long|证照档案ID
  applyId|Long|申请ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
  holderName|String|持有者姓名
  holderIDCardNo|String|持有者证件号码
  pickerName|String|取件人姓名
  pickerIDCardNo|String|取件人证件号码
  holderType|Integer|持有者类型，1：自然人，2：法人，3：自然人法人
  holderIdType|Integer|持有者证件类型，1：身份证，2：组织机构代码等
  holderName|String|持有者名称
  holderIDCardNo|String|持有者证件号码
  enterpriseName|String|企业名称
  validityStart|Date|有效期起始
  validityEnd|Date|有效期截止
  privateID|String|专网ID
  originalUrl|String|正本附件地址
  oriFormContent|String|证照模板正本表单内容
  duplicateUrl|String|副本附件地址
  dupFormContent|String|证照模板副本表单内容
  previewUrl|String|证件预览地址
  certificateUrl|String|证件附件地址
  printStatus|Integer|是否完成打印0否1是
  total|Integer|允许打印次数
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -2230,13 +2376,49 @@ data|object|数据对象
**响应消息样例:**
```
{
"msg":"生成成功",
"msg":"新增模块成功",
"code":1,
"data":{}
}
}
```
### 删除证照打印记录
**请求URL:** print/wait/queue/delete
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 删除证照打印记录
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:------
id|String|是|数组
**请求样例:**
```
http://localhost:8080/print/wait/queue/delete?id=1&id=2'
```
**响应参数:**
参数名称 |参数类型|备注|其它
---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|-
msg|String|消息|-
**响应消息样例:**
```
{
"code":1,
"msg":"成功"
}
```
## 证照持有
### 查询证照持有列表
......@@ -2277,17 +2459,18 @@ data|object|数据对象
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  recordId|Long|证照档案ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
  holderName|String|持有者姓名
  holderIDCardNo|String|持有者证件号码
  certificateStatus|Integer|证照状态，1正常2注销
  originalCount|Integer|正本数
  duplicateCount|Integer|副本数
  originalUrl|String|正本附件地址
  duplicateUrl|String|副本附件地址
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -2331,17 +2514,18 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 recordId|Long|证照档案ID
 catalogId|Long|证照目录ID
 catalogCode|String|证照目录编号
 catalogName|String|目录名称
 certificateName|String|证照名称
 certificateCode|String|证照编号
 enterpriseName|String|企业名称
 holderName|String|持有者姓名
 holderIDCardNo|String|持有者证件号码
 certificateStatus|Integer|证照状态，1正常2注销
 originalCount|Integer|正本数
 duplicateCount|Integer|副本数
 originalUrl|String|正本附件地址
 duplicateUrl|String|副本附件地址
 certificateUrl|String|证件附件地址
 previewUrl|String|证件预览地址
 createUserId|Long|创建用户
 createTime|Date|创建时间
 updateUserId|Long|更新用户
......@@ -2353,22 +2537,23 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":2864,
"catalogCode":"u499zx",
"certificateName":"o8h01o",
"certificateCode":"l0aq2d",
"enterpriseName":"pc5eco",
"holderName":"vnk93s",
"holderIDCardNo":"i0xik4",
"certificateStatus":2357,
"originalCount":8449,
"duplicateCount":6947,
"originalUrl":"e6sbfn",
"duplicateUrl":"8ui00u",
"createUserId":5121,
"createTime":"2022-10-14",
"updateUserId":7735,
"updateTime":"2022-10-14"
"id":7822,
"recordId":1762,
"catalogId":1555,
"catalogCode":"tm10d8",
"catalogName":"xnonzc",
"certificateName":"b3tqgl",
"certificateCode":"v4dq5u",
"enterpriseName":"xfig50",
"holderName":"itga4d",
"holderIDCardNo":"aggjto",
"certificateStatus":9813,
"certificateUrl":"qyd161",
"previewUrl":"n64c14",
"createUserId":187,
"createTime":"2022-11-04",
"updateUserId":1377,
"updateTime":"2022-11-04"
}
}
```
......@@ -2389,13 +2574,12 @@ dict|object|字典对象
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogCode|String|是|证照目录编号
catalogName|String|是|目录名称
certificateName|String|是|证照名称
certificateCode|String|是|证照编号
enterpriseName|String|是|企业名称
holderName|String|是|持有者姓名
certificateStatus|Integer|是|证照状态，1正常2注销
originalCount|Integer|是|正本数
duplicateCount|Integer|是|副本数
createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
......@@ -2404,17 +2588,18 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"catalogCode":"q40g7t",
"certificateName":"uicqe9",
"certificateCode":"rcyz0z",
"enterpriseName":"mdk0ps",
"holderName":"dc827t",
"holderIDCardNo":"ja2u6c",
"certificateStatus":8457,
"originalCount":7325,
"duplicateCount":1439,
"originalUrl":"el6kdk",
"duplicateUrl":"caqi3u",
"recordId":6512,
"catalogId":3059,
"catalogCode":"bgbez0",
"catalogName":"kdceri",
"certificateName":"fbmbi2",
"certificateCode":"3u5bc2",
"enterpriseName":"59jn8w",
"holderName":"kq28mr",
"holderIDCardNo":"kca46i",
"certificateStatus":8320,
"certificateUrl":"w8d7nj",
"previewUrl":"aj6cjj",
}
```
......@@ -2428,17 +2613,18 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  recordId|Long|证照档案ID
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
  holderName|String|持有者姓名
  holderIDCardNo|String|持有者证件号码
  certificateStatus|Integer|证照状态，1正常2注销
  originalCount|Integer|正本数
  duplicateCount|Integer|副本数
  originalUrl|String|正本附件地址
  duplicateUrl|String|副本附件地址
  certificateUrl|String|证件附件地址
  previewUrl|String|证件预览地址
  createUserId|Long|创建用户
  createTime|Date|创建时间
  updateUserId|Long|更新用户
......@@ -2530,7 +2716,9 @@ data|object|数据对象
 current_page|Integer|当前页
 data|array|结果集列表|数组
  id|Long|序号，主键，自增长
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
......@@ -2538,10 +2726,9 @@ data|object|数据对象
  holderIDCardNo|String|持有者证件号码
  pickerName|String|取件人姓名
  pickerIDCardNo|String|取件人证件号码
  originalCount|Integer|正本数
  duplicateCount|Integer|副本数
  printStatus|Integer|打印状态1打印成功2失败
  printDate|Date|打印时间
  statusRemark|String|打印结果描述
  deviceId|Long|打印设备
  createUserId|Long|创建用户
  createTime|Date|创建时间
......@@ -2586,7 +2773,9 @@ code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
 id|Long|序号，主键，自增长
 catalogId|Long|证照目录ID
 catalogCode|String|证照目录编号
 catalogName|String|目录名称
 certificateName|String|证照名称
 certificateCode|String|证照编号
 enterpriseName|String|企业名称
......@@ -2594,10 +2783,9 @@ data|object|数据对象
 holderIDCardNo|String|持有者证件号码
 pickerName|String|取件人姓名
 pickerIDCardNo|String|取件人证件号码
 originalCount|Integer|正本数
 duplicateCount|Integer|副本数
 printStatus|Integer|打印状态1打印成功2失败
 printDate|Date|打印时间
 statusRemark|String|打印结果描述
 deviceId|Long|打印设备
 createUserId|Long|创建用户
 createTime|Date|创建时间
......@@ -2610,24 +2798,25 @@ dict|object|字典对象
{
"code": 1,
"data": {
"id":7330,
"catalogCode":"y93jay",
"certificateName":"ub93s1",
"certificateCode":"zkio4h",
"enterpriseName":"r5tyg1",
"holderName":"z584oo",
"holderIDCardNo":"8mwqzb",
"pickerName":"8tobju",
"pickerIDCardNo":"xzei4r",
"originalCount":4568,
"duplicateCount":8910,
"printStatus":7012,
"printDate":"2022-10-14",
"deviceId":7526,
"createUserId":4108,
"createTime":"2022-10-14",
"updateUserId":405,
"updateTime":"2022-10-14"
"id":9267,
"catalogId":8167,
"catalogCode":"hbv0ug",
"catalogName":"x48ev3",
"certificateName":"v3vjth",
"certificateCode":"locyby",
"enterpriseName":"pjpgd1",
"holderName":"43dhhl",
"holderIDCardNo":"oc33xx",
"pickerName":"0mb1ie",
"pickerIDCardNo":"zvtkj2",
"printStatus":1034,
"printDate":"2022-11-04",
"statusRemark":"67sfnv",
"deviceId":1715,
"createUserId":3016,
"createTime":"2022-11-04",
"updateUserId":5538,
"updateTime":"2022-11-04"
}
}
```
......@@ -2648,12 +2837,11 @@ dict|object|字典对象
:---|:---|:---|:-------
id|Long|否|序号，主键，自增长
catalogCode|String|是|证照目录编号
catalogName|String|是|目录名称
certificateName|String|是|证照名称
certificateCode|String|是|证照编号
enterpriseName|String|是|企业名称
holderName|String|是|持有者姓名
originalCount|Integer|是|正本数
duplicateCount|Integer|是|副本数
printStatus|Integer|是|打印状态1打印成功2失败
printDate|Date|是|打印时间
createUserId|Long|否|创建用户
......@@ -2664,19 +2852,20 @@ updateTime|Date|否|更新时间
**请求样例:**
```
{
"catalogCode":"wj31ez",
"certificateName":"b876m0",
"certificateCode":"kqiuy6",
"enterpriseName":"deufmo",
"holderName":"xs2dmm",
"holderIDCardNo":"e5jer9",
"pickerName":"ter5ps",
"pickerIDCardNo":"e38my9",
"originalCount":8570,
"duplicateCount":7880,
"printStatus":8295,
"printDate":"2022-10-14",
"deviceId":6290,
"catalogId":9927,
"catalogCode":"65nqlh",
"catalogName":"vocybl",
"certificateName":"uzvvz5",
"certificateCode":"31xcx1",
"enterpriseName":"o1x0bd",
"holderName":"bfgvmy",
"holderIDCardNo":"6ext45",
"pickerName":"gpde69",
"pickerIDCardNo":"8rq5u3",
"printStatus":8937,
"printDate":"2022-11-04",
"statusRemark":"14u5eh",
"deviceId":4314,
}
```
......@@ -2690,7 +2879,9 @@ data|object|数据对象
 id|Long|保存后主键id
 entity|object|保存更新实体
  id|Long|序号，主键，自增长
  catalogId|Long|证照目录ID
  catalogCode|String|证照目录编号
  catalogName|String|目录名称
  certificateName|String|证照名称
  certificateCode|String|证照编号
  enterpriseName|String|企业名称
......@@ -2698,10 +2889,9 @@ data|object|数据对象
  holderIDCardNo|String|持有者证件号码
  pickerName|String|取件人姓名
  pickerIDCardNo|String|取件人证件号码
  originalCount|Integer|正本数
  duplicateCount|Integer|副本数
  printStatus|Integer|打印状态1打印成功2失败
  printDate|Date|打印时间
  statusRemark|String|打印结果描述
  deviceId|Long|打印设备
  createUserId|Long|创建用户
  createTime|Date|创建时间
......@@ -2755,7 +2945,7 @@ msg|String|消息|-
```
## 证照打印记录设置
## 证照打印设置
### 查询打印设置信息
......@@ -2942,5 +3132,4 @@ dict|object|字典对象
"dict": null
}
```
## 字典附录
certificate-manager/src/main/java/com/mortals/xhx/common/code/OperTypeEnum.java
View file @ 4aa851e7
......@@ -8,8 +8,8 @@ import java.util.Map;
*/
public enum OperTypeEnum {
SAVE(0,"添加"),
UPDATE(1,"更新"),
SAVE(0,"新增"),
UPDATE(1,"修改"),
DELETE(2,"删除"),
OTHER(-1,"其它");
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ 4aa851e7
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
/**
* 证照目录实体对象
*
* @author zxfei
* @date 2022-10-26
*/
* 证照目录实体对象
*
* @author zxfei
* @date 2022-11-04
*/
public class CertificateCatalogEntity extends CertificateCatalogVo {
private static final long serialVersionUID = 1L;
......@@ -49,29 +49,17 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
*/
private Integer inspect;
/**
* 证照模板正本文件名称
*/
private String oriFileName;
/**
* 证照模板正本文件地址
* 证照模板文件名称
*/
private String originalUrl;
private String templateName;
/**
* 证照模板正本表单内容
* 证照模板文件地址
*/
private String oriFormContent;
private String templateUrl;
/**
* 证照模板副本文件名称
* 证照模板表单内容
*/
private String dupFileName;
/**
* 证照模板副本文件地址
*/
private String duplicateUrl;
/**
* 证照模板副本表单内容
*/
private String dupFormContent;
private String formContent;
/**
* 证照示例图地址
*/
......@@ -92,6 +80,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 打印机纸盒
*/
private String paperSource;
/**
* 打印设备Id
*/
private Long deviceId;
......@@ -209,88 +201,46 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.inspect = inspect;
}
/**
* 获取 证照模板正本文件名称
* 获取 证照模板文件名称
* @return String
*/
public String getOriFileName(){
return oriFileName;
public String getTemplateName(){
return templateName;
}
/**
* 设置 证照模板正本文件名称
* @param oriFileName
* 设置 证照模板文件名称
* @param templateName
*/
public void setOriFileName(String oriFileName){
this.oriFileName = oriFileName;
public void setTemplateName(String templateName){
this.templateName = templateName;
}
/**
* 获取 证照模板正本文件地址
* 获取 证照模板文件地址
* @return String
*/
public String getOriginalUrl(){
return originalUrl;
public String getTemplateUrl(){
return templateUrl;
}
/**
* 设置 证照模板正本文件地址
* @param originalUrl
* 设置 证照模板文件地址
* @param templateUrl
*/
public void setOriginalUrl(String originalUrl){
this.originalUrl = originalUrl;
public void setTemplateUrl(String templateUrl){
this.templateUrl = templateUrl;
}
/**
* 获取 证照模板正本表单内容
* 获取 证照模板表单内容
* @return String
*/
public String getOriFormContent(){
return oriFormContent;
public String getFormContent(){
return formContent;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContent
* 设置 证照模板表单内容
* @param formContent
*/
public void setOriFormContent(String oriFormContent){
this.oriFormContent = oriFormContent;
}
/**
* 获取 证照模板副本文件名称
* @return String
*/
public String getDupFileName(){
return dupFileName;
}
/**
* 设置 证照模板副本文件名称
* @param dupFileName
*/
public void setDupFileName(String dupFileName){
this.dupFileName = dupFileName;
}
/**
* 获取 证照模板副本文件地址
* @return String
*/
public String getDuplicateUrl(){
return duplicateUrl;
}
/**
* 设置 证照模板副本文件地址
* @param duplicateUrl
*/
public void setDuplicateUrl(String duplicateUrl){
this.duplicateUrl = duplicateUrl;
}
/**
* 获取 证照模板副本表单内容
* @return String
*/
public String getDupFormContent(){
return dupFormContent;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContent
*/
public void setDupFormContent(String dupFormContent){
this.dupFormContent = dupFormContent;
public void setFormContent(String formContent){
this.formContent = formContent;
}
/**
* 获取 证照示例图地址
......@@ -362,6 +312,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
public void setPaperSource(String paperSource){
this.paperSource = paperSource;
}
/**
* 获取 打印设备Id
* @return Long
*/
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 打印设备Id
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
......@@ -392,17 +356,15 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
sb.append(",transverse:").append(getTransverse());
sb.append(",portrait:").append(getPortrait());
sb.append(",inspect:").append(getInspect());
sb.append(",oriFileName:").append(getOriFileName());
sb.append(",originalUrl:").append(getOriginalUrl());
sb.append(",oriFormContent:").append(getOriFormContent());
sb.append(",dupFileName:").append(getDupFileName());
sb.append(",duplicateUrl:").append(getDuplicateUrl());
sb.append(",dupFormContent:").append(getDupFormContent());
sb.append(",templateName:").append(getTemplateName());
sb.append(",templateUrl:").append(getTemplateUrl());
sb.append(",formContent:").append(getFormContent());
sb.append(",exampleUrl:").append(getExampleUrl());
sb.append(",status:").append(getStatus());
sb.append(",printerName:").append(getPrinterName());
sb.append(",printerIp:").append(getPrinterIp());
sb.append(",paperSource:").append(getPaperSource());
sb.append(",deviceId:").append(getDeviceId());
return sb.toString();
}
......@@ -424,17 +386,11 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.inspect = 0;
this.oriFileName = "";
this.originalUrl = "";
this.oriFormContent = "";
this.templateName = "";
this.dupFileName = "";
this.templateUrl = "";
this.duplicateUrl = "";
this.dupFormContent = "";
this.formContent = "";
this.exampleUrl = "";
......@@ -445,5 +401,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.printerIp = "";
this.paperSource = "";
this.deviceId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ 4aa851e7
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
/**
* 证照目录查询对象
*
* @author zxfei
* @date 2022-10-26
*/
* 证照目录查询对象
*
* @author zxfei
* @date 2022-11-04
*/
public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -99,23 +99,14 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 是否需要年检，0：否1：是列表 */
private List <Integer> inspectList;
/** 证照模板正本文件名称 */
private List<String> oriFileNameList;
/** 证照模板正本文件地址 */
private List<String> originalUrlList;
/** 证照模板正本表单内容 */
private List<String> oriFormContentList;
/** 证照模板副本文件名称 */
private List<String> dupFileNameList;
/** 证照模板文件名称 */
private List<String> templateNameList;
/** 证照模板副本文件地址 */
private List<String> duplicateUrlList;
/** 证照模板文件地址 */
private List<String> templateUrlList;
/** 证照模板副本表单内容 */
private List<String> dupFormContentList;
/** 证照模板表单内容 */
private List<String> formContentList;
/** 证照示例图地址 */
private List<String> exampleUrlList;
......@@ -132,6 +123,15 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 证照状态，0：禁用1：启用列表 */
private List <Integer> statusList;
/** 打印机名称 */
private List<String> printerNameList;
/** 打印机网络地址 */
private List<String> printerIpList;
/** 打印机纸盒 */
private List<String> paperSourceList;
/** 开始 创建用户 */
private Long createUserIdStart;
......@@ -168,14 +168,17 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 打印机名称 */
private List<String> printerNameList;
/** 开始 打印设备Id */
private Long deviceIdStart;
/** 打印机网络地址 */
private List<String> printerIpList;
/** 结束 打印设备Id */
private Long deviceIdEnd;
/** 打印机纸盒 */
private List<String> paperSourceList;
/** 增加 打印设备Id */
private Long deviceIdIncrement;
/** 打印设备Id列表 */
private List <Long> deviceIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogQuery> orConditionList;
......@@ -664,94 +667,49 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 证照模板正本文件名称
* @return oriFileNameList
*/
public List<String> getOriFileNameList(){
return this.oriFileNameList;
}
/**
* 设置 证照模板正本文件名称
* @param oriFileNameList
*/
public void setOriFileNameList(List<String> oriFileNameList){
this.oriFileNameList = oriFileNameList;
}
/**
* 获取 证照模板正本文件地址
* @return originalUrlList
*/
public List<String> getOriginalUrlList(){
return this.originalUrlList;
}
/**
* 设置 证照模板正本文件地址
* @param originalUrlList
*/
public void setOriginalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
}
/**
* 获取 证照模板正本表单内容
* @return oriFormContentList
* 获取 证照模板文件名称
* @return templateNameList
*/
public List<String> getOriFormContentList(){
return this.oriFormContentList;
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContentList
* 设置 证照模板文件名称
* @param templateNameList
*/
public void setOriFormContentList(List<String> oriFormContentList){
this.oriFormContentList = oriFormContentList;
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板副本文件名称
* @return dupFileNameList
* 获取 证照模板文件地址
* @return templateUrlList
*/
public List<String> getDupFileNameList(){
return this.dupFileNameList;
public List<String> getTemplateUrlList(){
return this.templateUrlList;
}
/**
* 设置 证照模板副本文件名称
* @param dupFileNameList
* 设置 证照模板文件地址
* @param templateUrlList
*/
public void setDupFileNameList(List<String> dupFileNameList){
this.dupFileNameList = dupFileNameList;
public void setTemplateUrlList(List<String> templateUrlList){
this.templateUrlList = templateUrlList;
}
/**
* 获取 证照模板副本文件地址
* @return duplicateUrlList
* 获取 证照模板表单内容
* @return formContentList
*/
public List<String> getDuplicateUrlList(){
return this.duplicateUrlList;
public List<String> getFormContentList(){
return this.formContentList;
}
/**
* 设置 证照模板副本文件地址
* @param duplicateUrlList
* 设置 证照模板表单内容
* @param formContentList
*/
public void setDuplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
}
/**
* 获取 证照模板副本表单内容
* @return dupFormContentList
*/
public List<String> getDupFormContentList(){
return this.dupFormContentList;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContentList
*/
public void setDupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList;
public void setFormContentList(List<String> formContentList){
this.formContentList = formContentList;
}
/**
* 获取 证照示例图地址
......@@ -832,6 +790,51 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
this.statusList = statusList;
}
/**
* 获取 打印机名称
* @return printerNameList
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
}
/**
* 获取 打印机网络地址
* @return printerIpList
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
}
/**
* 获取 打印机纸盒
* @return paperSourceList
*/
public List<String> getPaperSourceList(){
return this.paperSourceList;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
......@@ -1025,50 +1028,69 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 打印机名称
* @return printerNameList
* 获取 开始 打印设备Id
* @return deviceIdStart
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
public Long getDeviceIdStart(){
return this.deviceIdStart;
}
/**
* 设置 打印机名称
* @param printerNameList
* 设置 开始 打印设备Id
* @param deviceIdStart
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
}
/**
* 获取 打印机网络地址
* @return printerIpList
* 获取 结束 打印设备Id
* @return $deviceIdEnd
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
public Long getDeviceIdEnd(){
return this.deviceIdEnd;
}
/**
* 设置 打印机网络地址
* @param printerIpList
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
}
/**
* 获取 打印机纸盒
* @return paperSourceList
* 获取 增加 打印设备Id
* @return deviceIdIncrement
*/
public List<String> getPaperSourceList(){
return this.paperSourceList;
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
}
/**
* 获取 打印设备Id
* @return deviceIdList
*/
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 打印设备Id
* @param deviceIdList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1424,179 +1446,179 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/**
* 设置 证照模板正本文件名称
* @param oriFileName
* 设置 证照模板文件名称
* @param templateName
*/
public CertificateCatalogQuery oriFileName(String oriFileName){
setOriFileName(oriFileName);
public CertificateCatalogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板正本文件名称
* @param oriFileNameList
* 设置 证照模板文件名称
* @param templateNameList
*/
public CertificateCatalogQuery oriFileNameList(List<String> oriFileNameList){
this.oriFileNameList = oriFileNameList;
public CertificateCatalogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 证照模板正本文件地址
* @param originalUrl
* 设置 证照模板文件地址
* @param templateUrl
*/
public CertificateCatalogQuery originalUrl(String originalUrl){
setOriginalUrl(originalUrl);
public CertificateCatalogQuery templateUrl(String templateUrl){
setTemplateUrl(templateUrl);
return this;
}
/**
* 设置 证照模板正本文件地址
* @param originalUrlList
* 设置 证照模板文件地址
* @param templateUrlList
*/
public CertificateCatalogQuery originalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
public CertificateCatalogQuery templateUrlList(List<String> templateUrlList){
this.templateUrlList = templateUrlList;
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContent
* 设置 证照模板表单内容
* @param formContent
*/
public CertificateCatalogQuery oriFormContent(String oriFormContent){
setOriFormContent(oriFormContent);
public CertificateCatalogQuery formContent(String formContent){
setFormContent(formContent);
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContentList
* 设置 证照模板表单内容
* @param formContentList
*/
public CertificateCatalogQuery oriFormContentList(List<String> oriFormContentList){
this.oriFormContentList = oriFormContentList;
public CertificateCatalogQuery formContentList(List<String> formContentList){
this.formContentList = formContentList;
return this;
}
/**
* 设置 证照模板副本文件名称
* @param dupFileName
* 设置 证照示例图地址
* @param exampleUrl
*/
public CertificateCatalogQuery dupFileName(String dupFileName){
setDupFileName(dupFileName);
public CertificateCatalogQuery exampleUrl(String exampleUrl){
setExampleUrl(exampleUrl);
return this;
}
/**
* 设置 证照模板副本文件名称
* @param dupFileNameList
* 设置 证照示例图地址
* @param exampleUrlList
*/
public CertificateCatalogQuery dupFileNameList(List<String> dupFileNameList){
this.dupFileNameList = dupFileNameList;
public CertificateCatalogQuery exampleUrlList(List<String> exampleUrlList){
this.exampleUrlList = exampleUrlList;
return this;
}
/**
* 设置 证照模板副本文件地址
* @param duplicateUrl
* 设置 证照状态，0：禁用1：启用
* @param status
*/
public CertificateCatalogQuery duplicateUrl(String duplicateUrl){
setDuplicateUrl(duplicateUrl);
public CertificateCatalogQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 证照模板副本文件地址
* @param duplicateUrlList
* 设置 开始 证照状态，0：禁用1：启用
* @param statusStart
*/
public CertificateCatalogQuery duplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
public CertificateCatalogQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContent
* 设置 结束 证照状态，0：禁用1：启用
* @param statusEnd
*/
public CertificateCatalogQuery dupFormContent(String dupFormContent){
setDupFormContent(dupFormContent);
public CertificateCatalogQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContentList
* 设置 增加 证照状态，0：禁用1：启用
* @param statusIncrement
*/
public CertificateCatalogQuery dupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList;
public CertificateCatalogQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 证照示例图地址
* @param exampleUrl
* 设置 证照状态，0：禁用1：启用
* @param statusList
*/
public CertificateCatalogQuery exampleUrl(String exampleUrl){
setExampleUrl(exampleUrl);
public CertificateCatalogQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 证照示例图地址
* @param exampleUrlList
* 设置 打印机名称
* @param printerName
*/
public CertificateCatalogQuery exampleUrlList(List<String> exampleUrlList){
this.exampleUrlList = exampleUrlList;
public CertificateCatalogQuery printerName(String printerName){
setPrinterName(printerName);
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param status
* 设置 打印机名称
* @param printerNameList
*/
public CertificateCatalogQuery status(Integer status){
setStatus(status);
public CertificateCatalogQuery printerNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
return this;
}
/**
* 设置 开始 证照状态，0：禁用1：启用
* @param statusStart
* 设置 打印机网络地址
* @param printerIp
*/
public CertificateCatalogQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
public CertificateCatalogQuery printerIp(String printerIp){
setPrinterIp(printerIp);
return this;
}
/**
* 设置 结束 证照状态，0：禁用1：启用
* @param statusEnd
* 设置 打印机网络地址
* @param printerIpList
*/
public CertificateCatalogQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
public CertificateCatalogQuery printerIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
return this;
}
/**
* 设置 增加 证照状态，0：禁用1：启用
* @param statusIncrement
* 设置 打印机纸盒
* @param paperSource
*/
public CertificateCatalogQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
public CertificateCatalogQuery paperSource(String paperSource){
setPaperSource(paperSource);
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param statusList
* 设置 打印机纸盒
* @param paperSourceList
*/
public CertificateCatalogQuery statusList(List<Integer> statusList){
this.statusList = statusList;
public CertificateCatalogQuery paperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
return this;
}
......@@ -1692,60 +1714,48 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 设置 打印机名称
* @param printerName
* 设置 打印设备Id
* @param deviceId
*/
public CertificateCatalogQuery printerName(String printerName){
setPrinterName(printerName);
public CertificateCatalogQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 打印机名称
* @param printerNameList
* 设置 开始 打印设备Id
* @param deviceIdStart
*/
public CertificateCatalogQuery printerNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
public CertificateCatalogQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
return this;
}
/**
* 设置 打印机网络地址
* @param printerIp
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public CertificateCatalogQuery printerIp(String printerIp){
setPrinterIp(printerIp);
public CertificateCatalogQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/**
* 设置 打印机网络地址
* @param printerIpList
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public CertificateCatalogQuery printerIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
return this;
}
/**
* 设置 打印机纸盒
* @param paperSource
*/
public CertificateCatalogQuery paperSource(String paperSource){
setPaperSource(paperSource);
public CertificateCatalogQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
return this;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
* 设置 打印设备Id
* @param deviceIdList
*/
public CertificateCatalogQuery paperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
public CertificateCatalogQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
return this;
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyEntity.java
View file @ 4aa851e7
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo;
* 证照分类实体对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class CertificateClassifyEntity extends CertificateClassifyVo {
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
* 证照分类查询对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryEntity.java
View file @ 4aa851e7
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo;
* 行业目录实体对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class CertificateIndustryEntity extends CertificateIndustryVo {
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
* 行业目录查询对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogServiceImpl.java
View file @ 4aa851e7
......@@ -68,12 +68,10 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
throw new AppException("所属行业不能为空");
}
entity.setStatus(StatusEnum.ENABLE.getValue());
if(StringUtils.isNotEmpty(entity.getOriginalUrl())){
entity.setOriFormContent(parseDocxToJson(entity.getOriginalUrl()));
}
if(StringUtils.isNotEmpty(entity.getDuplicateUrl())){
entity.setDupFormContent(parseDocxToJson(entity.getDuplicateUrl()));
if(StringUtils.isNotEmpty(entity.getTemplateUrl())){
entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
}
}
// @Override
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 4aa851e7
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceVo;
* 证照柜设备实体对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class DeviceEntity extends DeviceVo {
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleEntity.java
View file @ 4aa851e7
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
* 证照柜设备实体对象
*
* @author zxfei
* @date 2022-10-26
* @date 2022-11-04
*/
public class DeviceModuleEntity extends DeviceModuleVo {
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleEntity;
* 证照柜设备查询对象
*
* @author zxfei
* @date 2022-10-26
* @date 2022-11-04
*/
public class DeviceModuleQuery extends DeviceModuleEntity {
/** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
* 证照柜设备查询对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class DeviceQuery extends DeviceEntity {
/** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/RecordDao.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.record.model.RecordEntity;
import java.util.List;
/**
* 证照申请Dao
* 证照申请 DAO接口
*
* @author zxfei
* @date 2022-11-04
*/
public interface RecordDao extends ICRUDDao<RecordEntity,Long>{
}
certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/ibatis/RecordDaoImpl.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.record.dao.RecordDao;
import com.mortals.xhx.module.record.model.RecordEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 证照申请DaoImpl DAO接口
*
* @author zxfei
* @date 2022-11-04
*/
@Repository("recordDao")
public class RecordDaoImpl extends BaseCRUDDaoMybatis<RecordEntity,Long> implements RecordDao {
}
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 4aa851e7
......@@ -8,20 +8,32 @@ 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-11-04
*/
public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L;
/**
* 证照档案ID
*/
private Long recordId;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
private String catalogName;
/**
* 证件编号
*/
private String certificateCode;
......@@ -74,46 +86,48 @@ public class ApplyLogEntity extends ApplyLogVo {
*/
private String privateID;
/**
* 正本附件地址
* 证件附件地址
*/
private String originalUrl;
private String certificateUrl;
/**
* 正本预览地址
* 证件预览地址
*/
private String oriPreview;
private String previewUrl;
/**
* 证照模板正本表单内容
*/
private String oriFormContent;
private String formContent;
/**
* 证照模板正本表单内容
*/
private String oriFormTemplate;
/**
* 副本附件地址
*/
private String duplicateUrl;
/**
* 副本预览地址
*/
private String dupPreview;
/**
* 证照模板副本表单内容
*/
private String dupFormContent;
private String formTemplate;
/**
* 证照模板副本表单内容
* 生成状态1未生成2已生成
*/
private String dupFormTemplate;
private Integer generateStatus;
/**
* 生成状态1未生成2正本3副本4正副本
* 档案操作类型1新增2变更
*/
private Integer generateStatus;
private Integer operType;
public ApplyLogEntity(){}
/**
* 获取 证照档案ID
* @return Long
*/
public Long getRecordId(){
return recordId;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 获取 证照目录ID
* @return Long
*/
......@@ -128,6 +142,34 @@ public class ApplyLogEntity extends ApplyLogVo {
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证件编号
* @return String
*/
......@@ -310,130 +352,88 @@ public class ApplyLogEntity extends ApplyLogVo {
this.privateID = privateID;
}
/**
* 获取 正本附件地址
* 获取 证件附件地址
* @return String
*/
public String getOriginalUrl(){
return originalUrl;
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 正本附件地址
* @param originalUrl
* 设置 证件附件地址
* @param certificateUrl
*/
public void setOriginalUrl(String originalUrl){
this.originalUrl = originalUrl;
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 正本预览地址
* 获取 证件预览地址
* @return String
*/
public String getOriPreview(){
return oriPreview;
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 正本预览地址
* @param oriPreview
* 设置 证件预览地址
* @param previewUrl
*/
public void setOriPreview(String oriPreview){
this.oriPreview = oriPreview;
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 证照模板正本表单内容
* @return String
*/
public String getOriFormContent(){
return oriFormContent;
public String getFormContent(){
return formContent;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContent
* @param formContent
*/
public void setOriFormContent(String oriFormContent){
this.oriFormContent = oriFormContent;
public void setFormContent(String formContent){
this.formContent = formContent;
}
/**
* 获取 证照模板正本表单内容
* @return String
*/
public String getOriFormTemplate(){
return oriFormTemplate;
public String getFormTemplate(){
return formTemplate;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplate
* @param formTemplate
*/
public void setOriFormTemplate(String oriFormTemplate){
this.oriFormTemplate = oriFormTemplate;
public void setFormTemplate(String formTemplate){
this.formTemplate = formTemplate;
}
/**
* 获取 副本附件地址
* @return String
*/
public String getDuplicateUrl(){
return duplicateUrl;
}
/**
* 设置 副本附件地址
* @param duplicateUrl
*/
public void setDuplicateUrl(String duplicateUrl){
this.duplicateUrl = duplicateUrl;
}
/**
* 获取 副本预览地址
* @return String
*/
public String getDupPreview(){
return dupPreview;
}
/**
* 设置 副本预览地址
* @param dupPreview
*/
public void setDupPreview(String dupPreview){
this.dupPreview = dupPreview;
}
/**
* 获取 证照模板副本表单内容
* @return String
*/
public String getDupFormContent(){
return dupFormContent;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContent
*/
public void setDupFormContent(String dupFormContent){
this.dupFormContent = dupFormContent;
}
/**
* 获取 证照模板副本表单内容
* @return String
* 获取 生成状态1未生成2已生成
* @return Integer
*/
public String getDupFormTemplate(){
return dupFormTemplate;
public Integer getGenerateStatus(){
return generateStatus;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplate
* 设置 生成状态1未生成2已生成
* @param generateStatus
*/
public void setDupFormTemplate(String dupFormTemplate){
this.dupFormTemplate = dupFormTemplate;
public void setGenerateStatus(Integer generateStatus){
this.generateStatus = generateStatus;
}
/**
* 获取 生成状态1未生成2正本3副本4正副本
* 获取 档案操作类型1新增2变更
* @return Integer
*/
public Integer getGenerateStatus(){
return generateStatus;
public Integer getOperType(){
return operType;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatus
* 设置 档案操作类型1新增2变更
* @param operType
*/
public void setGenerateStatus(Integer generateStatus){
this.generateStatus = generateStatus;
public void setOperType(Integer operType){
this.operType = operType;
}
......@@ -457,7 +457,10 @@ public class ApplyLogEntity extends ApplyLogVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",issueTime:").append(getIssueTime());
......@@ -471,22 +474,25 @@ public class ApplyLogEntity extends ApplyLogVo {
sb.append(",validityStart:").append(getValidityStart());
sb.append(",validityEnd:").append(getValidityEnd());
sb.append(",privateID:").append(getPrivateID());
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(",certificateUrl:").append(getCertificateUrl());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",formContent:").append(getFormContent());
sb.append(",formTemplate:").append(getFormTemplate());
sb.append(",generateStatus:").append(getGenerateStatus());
sb.append(",operType:").append(getOperType());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.catalogId = null;
this.catalogCode = "";
this.catalogName = "";
this.certificateCode = "";
this.certificateName = "";
......@@ -513,22 +519,16 @@ public class ApplyLogEntity extends ApplyLogVo {
this.privateID = "";
this.originalUrl = "";
this.oriPreview = "";
this.certificateUrl = "";
this.oriFormContent = "";
this.previewUrl = "";
this.oriFormTemplate = "";
this.formContent = "";
this.duplicateUrl = "";
this.dupPreview = "";
this.dupFormContent = "";
this.dupFormTemplate = "";
this.formTemplate = "";
this.generateStatus = 1;
this.operType = 1;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 4aa851e7
......@@ -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-11-04
*/
public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -22,6 +22,18 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 证照档案ID */
private Long recordIdStart;
/** 结束 证照档案ID */
private Long recordIdEnd;
/** 增加 证照档案ID */
private Long recordIdIncrement;
/** 证照档案ID列表 */
private List <Long> recordIdList;
/** 开始 证照目录ID */
private Long catalogIdStart;
......@@ -34,6 +46,12 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 证照目录编号 */
private List<String> catalogCodeList;
/** 目录名称 */
private List<String> catalogNameList;
/** 证件编号 */
private List<String> certificateCodeList;
......@@ -100,42 +118,42 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 专网ID */
private List<String> privateIDList;
/** 正本附件地址 */
private List<String> originalUrlList;
/** 证件附件地址 */
private List<String> certificateUrlList;
/** 正本预览地址 */
private List<String> oriPreviewList;
/** 证件预览地址 */
private List<String> previewUrlList;
/** 证照模板正本表单内容 */
private List<String> oriFormContentList;
private List<String> formContentList;
/** 证照模板正本表单内容 */
private List<String> oriFormTemplateList;
private List<String> formTemplateList;
/** 副本附件地址 */
private List<String> duplicateUrlList;
/** 副本预览地址 */
private List<String> dupPreviewList;
/** 证照模板副本表单内容 */
private List<String> dupFormContentList;
/** 证照模板副本表单内容 */
private List<String> dupFormTemplateList;
/** 开始 生成状态1未生成2正本3副本4正副本 */
/** 开始 生成状态1未生成2已生成 */
private Integer generateStatusStart;
/** 结束 生成状态1未生成2正本3副本4正副本 */
/** 结束 生成状态1未生成2已生成 */
private Integer generateStatusEnd;
/** 增加 生成状态1未生成2正本3副本4正副本 */
/** 增加 生成状态1未生成2已生成 */
private Integer generateStatusIncrement;
/** 生成状态1未生成2正本3副本4正副本列表 */
/** 生成状态1未生成2已生成列表 */
private List <Integer> generateStatusList;
/** 开始 档案操作类型1新增2变更 */
private Integer operTypeStart;
/** 结束 档案操作类型1新增2变更 */
private Integer operTypeEnd;
/** 增加 档案操作类型1新增2变更 */
private Integer operTypeIncrement;
/** 档案操作类型1新增2变更列表 */
private List <Integer> operTypeList;
/** 开始 创建用户 */
private Long createUserIdStart;
......@@ -244,6 +262,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.idList = idList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
*/
public Long getRecordIdStart(){
return this.recordIdStart;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
}
/**
* 获取 结束 证照档案ID
* @return $recordIdEnd
*/
public Long getRecordIdEnd(){
return this.recordIdEnd;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
}
/**
* 获取 增加 证照档案ID
* @return recordIdIncrement
*/
public Long getRecordIdIncrement(){
return this.recordIdIncrement;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
}
/**
* 获取 证照档案ID
* @return recordIdList
*/
public List<Long> getRecordIdList(){
return this.recordIdList;
}
/**
* 设置 证照档案ID
* @param recordIdList
*/
public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
......@@ -308,6 +390,36 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.catalogIdList = catalogIdList;
}
/**
* 获取 证照目录编号
* @return catalogCodeList
*/
public List<String> getCatalogCodeList(){
return this.catalogCodeList;
}
/**
* 设置 证照目录编号
* @param catalogCodeList
*/
public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 证件编号
* @return certificateCodeList
......@@ -653,187 +765,191 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.privateIDList = privateIDList;
}
/**
* 获取 正本附件地址
* @return originalUrlList
* 获取 证件附件地址
* @return certificateUrlList
*/
public List<String> getOriginalUrlList(){
return this.originalUrlList;
public List<String> getCertificateUrlList(){
return this.certificateUrlList;
}
/**
* 设置 正本附件地址
* @param originalUrlList
* 设置 证件附件地址
* @param certificateUrlList
*/
public void setOriginalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
}
/**
* 获取 正本预览地址
* @return oriPreviewList
* 获取 证件预览地址
* @return previewUrlList
*/
public List<String> getOriPreviewList(){
return this.oriPreviewList;
public List<String> getPreviewUrlList(){
return this.previewUrlList;
}
/**
* 设置 正本预览地址
* @param oriPreviewList
* 设置 证件预览地址
* @param previewUrlList
*/
public void setOriPreviewList(List<String> oriPreviewList){
this.oriPreviewList = oriPreviewList;
public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
}
/**
* 获取 证照模板正本表单内容
* @return oriFormContentList
* @return formContentList
*/
public List<String> getOriFormContentList(){
return this.oriFormContentList;
public List<String> getFormContentList(){
return this.formContentList;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContentList
* @param formContentList
*/
public void setOriFormContentList(List<String> oriFormContentList){
this.oriFormContentList = oriFormContentList;
public void setFormContentList(List<String> formContentList){
this.formContentList = formContentList;
}
/**
* 获取 证照模板正本表单内容
* @return oriFormTemplateList
* @return formTemplateList
*/
public List<String> getOriFormTemplateList(){
return this.oriFormTemplateList;
public List<String> getFormTemplateList(){
return this.formTemplateList;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplateList
* @param formTemplateList
*/
public void setOriFormTemplateList(List<String> oriFormTemplateList){
this.oriFormTemplateList = oriFormTemplateList;
public void setFormTemplateList(List<String> formTemplateList){
this.formTemplateList = formTemplateList;
}
/**
* 获取 副本附件地址
* @return duplicateUrlList
* 获取 开始 生成状态1未生成2已生成
* @return generateStatusStart
*/
public List<String> getDuplicateUrlList(){
return this.duplicateUrlList;
public Integer getGenerateStatusStart(){
return this.generateStatusStart;
}
/**
* 设置 副本附件地址
* @param duplicateUrlList
* 设置 开始 生成状态1未生成2已生成
* @param generateStatusStart
*/
public void setDuplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
public void setGenerateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
}
/**
* 获取 副本预览地址
* @return dupPreviewList
* 获取 结束 生成状态1未生成2已生成
* @return $generateStatusEnd
*/
public List<String> getDupPreviewList(){
return this.dupPreviewList;
public Integer getGenerateStatusEnd(){
return this.generateStatusEnd;
}
/**
* 设置 副本预览地址
* @param dupPreviewList
* 设置 结束 生成状态1未生成2已生成
* @param generateStatusEnd
*/
public void setDupPreviewList(List<String> dupPreviewList){
this.dupPreviewList = dupPreviewList;
public void setGenerateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
}
/**
* 获取 证照模板副本表单内容
* @return dupFormContentList
* 获取 增加 生成状态1未生成2已生成
* @return generateStatusIncrement
*/
public List<String> getDupFormContentList(){
return this.dupFormContentList;
public Integer getGenerateStatusIncrement(){
return this.generateStatusIncrement;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContentList
* 设置 增加 生成状态1未生成2已生成
* @param generateStatusIncrement
*/
public void setDupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList;
public void setGenerateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
}
/**
* 获取 证照模板副本表单内容
* @return dupFormTemplateList
* 获取 生成状态1未生成2已生成
* @return generateStatusList
*/
public List<String> getDupFormTemplateList(){
return this.dupFormTemplateList;
public List<Integer> getGenerateStatusList(){
return this.generateStatusList;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplateList
* 设置 生成状态1未生成2已生成
* @param generateStatusList
*/
public void setDupFormTemplateList(List<String> dupFormTemplateList){
this.dupFormTemplateList = dupFormTemplateList;
public void setGenerateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
}
/**
* 获取 开始 生成状态1未生成2正本3副本4正副本
* @return generateStatusStart
* 获取 开始 档案操作类型1新增2变更
* @return operTypeStart
*/
public Integer getGenerateStatusStart(){
return this.generateStatusStart;
public Integer getOperTypeStart(){
return this.operTypeStart;
}
/**
* 设置 开始 生成状态1未生成2正本3副本4正副本
* @param generateStatusStart
* 设置 开始 档案操作类型1新增2变更
* @param operTypeStart
*/
public void setGenerateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
public void setOperTypeStart(Integer operTypeStart){
this.operTypeStart = operTypeStart;
}
/**
* 获取 结束 生成状态1未生成2正本3副本4正副本
* @return $generateStatusEnd
* 获取 结束 档案操作类型1新增2变更
* @return $operTypeEnd
*/
public Integer getGenerateStatusEnd(){
return this.generateStatusEnd;
public Integer getOperTypeEnd(){
return this.operTypeEnd;
}
/**
* 设置 结束 生成状态1未生成2正本3副本4正副本
* @param generateStatusEnd
* 设置 结束 档案操作类型1新增2变更
* @param operTypeEnd
*/
public void setGenerateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
public void setOperTypeEnd(Integer operTypeEnd){
this.operTypeEnd = operTypeEnd;
}
/**
* 获取 增加 生成状态1未生成2正本3副本4正副本
* @return generateStatusIncrement
* 获取 增加 档案操作类型1新增2变更
* @return operTypeIncrement
*/
public Integer getGenerateStatusIncrement(){
return this.generateStatusIncrement;
public Integer getOperTypeIncrement(){
return this.operTypeIncrement;
}
/**
* 设置 增加 生成状态1未生成2正本3副本4正副本
* @param generateStatusIncrement
* 设置 增加 档案操作类型1新增2变更
* @param operTypeIncrement
*/
public void setGenerateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
public void setOperTypeIncrement(Integer operTypeIncrement){
this.operTypeIncrement = operTypeIncrement;
}
/**
* 获取 生成状态1未生成2正本3副本4正副本
* @return generateStatusList
* 获取 档案操作类型1新增2变更
* @return operTypeList
*/
public List<Integer> getGenerateStatusList(){
return this.generateStatusList;
public List<Integer> getOperTypeList(){
return this.operTypeList;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatusList
* 设置 档案操作类型1新增2变更
* @param operTypeList
*/
public void setGenerateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
public void setOperTypeList(List<Integer> operTypeList){
this.operTypeList = operTypeList;
}
/**
......@@ -1073,6 +1189,51 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public ApplyLogQuery recordId(Long recordId){
setRecordId(recordId);
return this;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public ApplyLogQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
return this;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public ApplyLogQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
return this;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public ApplyLogQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
return this;
}
/**
* 设置 证照档案ID
* @param recordIdList
*/
public ApplyLogQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
return this;
}
/**
* 设置 证照目录ID
* @param catalogId
......@@ -1119,6 +1280,44 @@ public class ApplyLogQuery extends ApplyLogEntity {
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public ApplyLogQuery catalogCode(String catalogCode){
setCatalogCode(catalogCode);
return this;
}
/**
* 设置 证照目录编号
* @param catalogCodeList
*/
public ApplyLogQuery catalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
return this;
}
/**
* 设置 目录名称
* @param catalogName
*/
public ApplyLogQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public ApplyLogQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
return this;
}
/**
* 设置 证件编号
* @param certificateCode
......@@ -1365,198 +1564,167 @@ public class ApplyLogQuery extends ApplyLogEntity {
/**
* 设置 正本附件地址
* @param originalUrl
* 设置 证件附件地址
* @param certificateUrl
*/
public ApplyLogQuery originalUrl(String originalUrl){
setOriginalUrl(originalUrl);
public ApplyLogQuery certificateUrl(String certificateUrl){
setCertificateUrl(certificateUrl);
return this;
}
/**
* 设置 正本附件地址
* @param originalUrlList
* 设置 证件附件地址
* @param certificateUrlList
*/
public ApplyLogQuery originalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
public ApplyLogQuery certificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
return this;
}
/**
* 设置 正本预览地址
* @param oriPreview
* 设置 证件预览地址
* @param previewUrl
*/
public ApplyLogQuery oriPreview(String oriPreview){
setOriPreview(oriPreview);
public ApplyLogQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 正本预览地址
* @param oriPreviewList
* 设置 证件预览地址
* @param previewUrlList
*/
public ApplyLogQuery oriPreviewList(List<String> oriPreviewList){
this.oriPreviewList = oriPreviewList;
public ApplyLogQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContent
* @param formContent
*/
public ApplyLogQuery oriFormContent(String oriFormContent){
setOriFormContent(oriFormContent);
public ApplyLogQuery formContent(String formContent){
setFormContent(formContent);
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormContentList
* @param formContentList
*/
public ApplyLogQuery oriFormContentList(List<String> oriFormContentList){
this.oriFormContentList = oriFormContentList;
public ApplyLogQuery formContentList(List<String> formContentList){
this.formContentList = formContentList;
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplate
* @param formTemplate
*/
public ApplyLogQuery oriFormTemplate(String oriFormTemplate){
setOriFormTemplate(oriFormTemplate);
public ApplyLogQuery formTemplate(String formTemplate){
setFormTemplate(formTemplate);
return this;
}
/**
* 设置 证照模板正本表单内容
* @param oriFormTemplateList
*/
public ApplyLogQuery oriFormTemplateList(List<String> oriFormTemplateList){
this.oriFormTemplateList = oriFormTemplateList;
return this;
}
/**
* 设置 副本附件地址
* @param duplicateUrl
*/
public ApplyLogQuery duplicateUrl(String duplicateUrl){
setDuplicateUrl(duplicateUrl);
return this;
}
/**
* 设置 副本附件地址
* @param duplicateUrlList
*/
public ApplyLogQuery duplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
return this;
}
/**
* 设置 副本预览地址
* @param dupPreview
* @param formTemplateList
*/
public ApplyLogQuery dupPreview(String dupPreview){
setDupPreview(dupPreview);
public ApplyLogQuery formTemplateList(List<String> formTemplateList){
this.formTemplateList = formTemplateList;
return this;
}
/**
* 设置 副本预览地址
* @param dupPreviewList
* 设置 生成状态1未生成2已生成
* @param generateStatus
*/
public ApplyLogQuery dupPreviewList(List<String> dupPreviewList){
this.dupPreviewList = dupPreviewList;
public ApplyLogQuery generateStatus(Integer generateStatus){
setGenerateStatus(generateStatus);
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContent
* 设置 开始 生成状态1未生成2已生成
* @param generateStatusStart
*/
public ApplyLogQuery dupFormContent(String dupFormContent){
setDupFormContent(dupFormContent);
public ApplyLogQuery generateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormContentList
* 设置 结束 生成状态1未生成2已生成
* @param generateStatusEnd
*/
public ApplyLogQuery dupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList;
public ApplyLogQuery generateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplate
* 设置 增加 生成状态1未生成2已生成
* @param generateStatusIncrement
*/
public ApplyLogQuery dupFormTemplate(String dupFormTemplate){
setDupFormTemplate(dupFormTemplate);
public ApplyLogQuery generateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
return this;
}
/**
* 设置 证照模板副本表单内容
* @param dupFormTemplateList
* 设置 生成状态1未生成2已生成
* @param generateStatusList
*/
public ApplyLogQuery dupFormTemplateList(List<String> dupFormTemplateList){
this.dupFormTemplateList = dupFormTemplateList;
public ApplyLogQuery generateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
return this;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatus
* 设置 档案操作类型1新增2变更
* @param operType
*/
public ApplyLogQuery generateStatus(Integer generateStatus){
setGenerateStatus(generateStatus);
public ApplyLogQuery operType(Integer operType){
setOperType(operType);
return this;
}
/**
* 设置 开始 生成状态1未生成2正本3副本4正副本
* @param generateStatusStart
* 设置 开始 档案操作类型1新增2变更
* @param operTypeStart
*/
public ApplyLogQuery generateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
public ApplyLogQuery operTypeStart(Integer operTypeStart){
this.operTypeStart = operTypeStart;
return this;
}
/**
* 设置 结束 生成状态1未生成2正本3副本4正副本
* @param generateStatusEnd
* 设置 结束 档案操作类型1新增2变更
* @param operTypeEnd
*/
public ApplyLogQuery generateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
public ApplyLogQuery operTypeEnd(Integer operTypeEnd){
this.operTypeEnd = operTypeEnd;
return this;
}
/**
* 设置 增加 生成状态1未生成2正本3副本4正副本
* @param generateStatusIncrement
* 设置 增加 档案操作类型1新增2变更
* @param operTypeIncrement
*/
public ApplyLogQuery generateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
public ApplyLogQuery operTypeIncrement(Integer operTypeIncrement){
this.operTypeIncrement = operTypeIncrement;
return this;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatusList
* 设置 档案操作类型1新增2变更
* @param operTypeList
*/
public ApplyLogQuery generateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
public ApplyLogQuery operTypeList(List<Integer> operTypeList){
this.operTypeList = operTypeList;
return this;
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 4aa851e7
......@@ -8,20 +8,28 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-10-26
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-11-04
*/
public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
private String catalogName;
/**
* 证照名称
*/
private String certificateName;
......@@ -49,14 +57,6 @@ public class PrintLogEntity extends PrintLogVo {
* 取件人证件号码
*/
private String pickerIDCardNo;
/**
* 正本数
*/
private Integer originalCount;
/**
* 副本数
*/
private Integer duplicateCount;
/**
* 打印状态1打印成功2失败
*/
......@@ -65,23 +65,33 @@ public class PrintLogEntity extends PrintLogVo {
* 打印时间
*/
private Date printDate;
/**
* 打印设备
*/
private Long deviceId;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 打印结果描述
*/
private String statusRemark;
/**
* 打印设备
*/
private Long deviceId;
public PrintLogEntity(){}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
......@@ -96,6 +106,20 @@ public class PrintLogEntity extends PrintLogVo {
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
......@@ -193,34 +217,6 @@ public class PrintLogEntity extends PrintLogVo {
public void setPickerIDCardNo(String pickerIDCardNo){
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 正本数
* @return Integer
*/
public Integer getOriginalCount(){
return originalCount;
}
/**
* 设置 正本数
* @param originalCount
*/
public void setOriginalCount(Integer originalCount){
this.originalCount = originalCount;
}
/**
* 获取 副本数
* @return Integer
*/
public Integer getDuplicateCount(){
return duplicateCount;
}
/**
* 设置 副本数
* @param duplicateCount
*/
public void setDuplicateCount(Integer duplicateCount){
this.duplicateCount = duplicateCount;
}
/**
* 获取 打印状态1打印成功2失败
* @return Integer
......@@ -249,34 +245,6 @@ public class PrintLogEntity extends PrintLogVo {
public void setPrintDate(Date printDate){
this.printDate = printDate;
}
/**
* 获取 打印设备
* @return Long
*/
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 打印设备
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 打印结果描述
* @return String
......@@ -291,6 +259,20 @@ public class PrintLogEntity extends PrintLogVo {
public void setStatusRemark(String statusRemark){
this.statusRemark = statusRemark;
}
/**
* 获取 打印设备
* @return Long
*/
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 打印设备
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
......@@ -313,7 +295,9 @@ public class PrintLogEntity extends PrintLogVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
......@@ -321,20 +305,21 @@ public class PrintLogEntity extends PrintLogVo {
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",originalCount:").append(getOriginalCount());
sb.append(",duplicateCount:").append(getDuplicateCount());
sb.append(",printStatus:").append(getPrintStatus());
sb.append(",printDate:").append(getPrintDate());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",statusRemark:").append(getStatusRemark());
sb.append(",deviceId:").append(getDeviceId());
return sb.toString();
}
public void initAttrValue(){
this.catalogId = null;
this.catalogCode = "";
this.catalogName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -349,18 +334,12 @@ public class PrintLogEntity extends PrintLogVo {
this.pickerIDCardNo = "";
this.originalCount = 0;
this.duplicateCount = 0;
this.printStatus = 1;
this.printDate = null;
this.deviceId = null;
this.catalogId = null;
this.statusRemark = "";
this.deviceId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 4aa851e7
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.record.model.PrintLogEntity;
/**
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-10-26
*/
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-11-04
*/
public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -22,9 +22,24 @@ public class PrintLogQuery extends PrintLogEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 证照目录编号 */
private List<String> catalogCodeList;
/** 目录名称 */
private List<String> catalogNameList;
/** 证照名称 */
private List<String> certificateNameList;
......@@ -46,30 +61,6 @@ public class PrintLogQuery extends PrintLogEntity {
/** 取件人证件号码 */
private List<String> pickerIDCardNoList;
/** 开始 正本数 */
private Integer originalCountStart;
/** 结束 正本数 */
private Integer originalCountEnd;
/** 增加 正本数 */
private Integer originalCountIncrement;
/** 正本数列表 */
private List <Integer> originalCountList;
/** 开始 副本数 */
private Integer duplicateCountStart;
/** 结束 副本数 */
private Integer duplicateCountEnd;
/** 增加 副本数 */
private Integer duplicateCountIncrement;
/** 副本数列表 */
private List <Integer> duplicateCountList;
/** 开始 打印状态1打印成功2失败 */
private Integer printStatusStart;
......@@ -88,6 +79,9 @@ public class PrintLogQuery extends PrintLogEntity {
/** 结束 打印时间 */
private String printDateEnd;
/** 打印结果描述 */
private List<String> statusRemarkList;
/** 开始 打印设备 */
private Long deviceIdStart;
......@@ -136,21 +130,6 @@ public class PrintLogQuery extends PrintLogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 打印结果描述 */
private List<String> statusRemarkList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintLogQuery> orConditionList;
......@@ -223,6 +202,70 @@ public class PrintLogQuery extends PrintLogEntity {
this.idList = idList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 证照目录编号
* @return catalogCodeList
......@@ -239,6 +282,21 @@ public class PrintLogQuery extends PrintLogEntity {
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 证照名称
* @return certificateNameList
*/
......@@ -343,134 +401,6 @@ public class PrintLogQuery extends PrintLogEntity {
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList;
}
/**
* 获取 开始 正本数
* @return originalCountStart
*/
public Integer getOriginalCountStart(){
return this.originalCountStart;
}
/**
* 设置 开始 正本数
* @param originalCountStart
*/
public void setOriginalCountStart(Integer originalCountStart){
this.originalCountStart = originalCountStart;
}
/**
* 获取 结束 正本数
* @return $originalCountEnd
*/
public Integer getOriginalCountEnd(){
return this.originalCountEnd;
}
/**
* 设置 结束 正本数
* @param originalCountEnd
*/
public void setOriginalCountEnd(Integer originalCountEnd){
this.originalCountEnd = originalCountEnd;
}
/**
* 获取 增加 正本数
* @return originalCountIncrement
*/
public Integer getOriginalCountIncrement(){
return this.originalCountIncrement;
}
/**
* 设置 增加 正本数
* @param originalCountIncrement
*/
public void setOriginalCountIncrement(Integer originalCountIncrement){
this.originalCountIncrement = originalCountIncrement;
}
/**
* 获取 正本数
* @return originalCountList
*/
public List<Integer> getOriginalCountList(){
return this.originalCountList;
}
/**
* 设置 正本数
* @param originalCountList
*/
public void setOriginalCountList(List<Integer> originalCountList){
this.originalCountList = originalCountList;
}
/**
* 获取 开始 副本数
* @return duplicateCountStart
*/
public Integer getDuplicateCountStart(){
return this.duplicateCountStart;
}
/**
* 设置 开始 副本数
* @param duplicateCountStart
*/
public void setDuplicateCountStart(Integer duplicateCountStart){
this.duplicateCountStart = duplicateCountStart;
}
/**
* 获取 结束 副本数
* @return $duplicateCountEnd
*/
public Integer getDuplicateCountEnd(){
return this.duplicateCountEnd;
}
/**
* 设置 结束 副本数
* @param duplicateCountEnd
*/
public void setDuplicateCountEnd(Integer duplicateCountEnd){
this.duplicateCountEnd = duplicateCountEnd;
}
/**
* 获取 增加 副本数
* @return duplicateCountIncrement
*/
public Integer getDuplicateCountIncrement(){
return this.duplicateCountIncrement;
}
/**
* 设置 增加 副本数
* @param duplicateCountIncrement
*/
public void setDuplicateCountIncrement(Integer duplicateCountIncrement){
this.duplicateCountIncrement = duplicateCountIncrement;
}
/**
* 获取 副本数
* @return duplicateCountList
*/
public List<Integer> getDuplicateCountList(){
return this.duplicateCountList;
}
/**
* 设置 副本数
* @param duplicateCountList
*/
public void setDuplicateCountList(List<Integer> duplicateCountList){
this.duplicateCountList = duplicateCountList;
}
/**
* 获取 开始 打印状态1打印成功2失败
* @return printStatusStart
......@@ -567,6 +497,21 @@ public class PrintLogQuery extends PrintLogEntity {
this.printDateEnd = printDateEnd;
}
/**
* 获取 打印结果描述
* @return statusRemarkList
*/
public List<String> getStatusRemarkList(){
return this.statusRemarkList;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public void setStatusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
}
/**
* 获取 开始 打印设备
* @return deviceIdStart
......@@ -824,126 +769,92 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
* 设置 序号，主键，自增长
* @param id
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
public PrintLogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
public PrintLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
public PrintLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
public PrintLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 获取 证照目录ID
* @return catalogIdList
* 设置 序号，主键，自增长
* @param idList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
public PrintLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 打印结果描述
* @return statusRemarkList
*/
public List<String> getStatusRemarkList(){
return this.statusRemarkList;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public void setStatusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
}
/**
* 设置 序号，主键，自增长
* @param id
* @param catalogId
*/
public PrintLogQuery id(Long id){
setId(id);
public PrintLogQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public PrintLogQuery idStart(Long idStart){
this.idStart = idStart;
public PrintLogQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public PrintLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public PrintLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public PrintLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 证照目录ID
* @param catalogIdList
*/
public PrintLogQuery idList(List<Long> idList){
this.idList = idList;
public PrintLogQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
......@@ -967,6 +878,25 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 设置 目录名称
* @param catalogName
*/
public PrintLogQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public PrintLogQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
return this;
}
/**
* 设置 证照名称
* @param certificateName
......@@ -1099,96 +1029,6 @@ public class PrintLogQuery extends PrintLogEntity {
return this;
}
/**
* 设置 正本数
* @param originalCount
*/
public PrintLogQuery originalCount(Integer originalCount){
setOriginalCount(originalCount);
return this;
}
/**
* 设置 开始 正本数
* @param originalCountStart
*/
public PrintLogQuery originalCountStart(Integer originalCountStart){
this.originalCountStart = originalCountStart;
return this;
}
/**
* 设置 结束 正本数
* @param originalCountEnd
*/
public PrintLogQuery originalCountEnd(Integer originalCountEnd){
this.originalCountEnd = originalCountEnd;
return this;
}
/**
* 设置 增加 正本数
* @param originalCountIncrement
*/
public PrintLogQuery originalCountIncrement(Integer originalCountIncrement){
this.originalCountIncrement = originalCountIncrement;
return this;
}
/**
* 设置 正本数
* @param originalCountList
*/
public PrintLogQuery originalCountList(List<Integer> originalCountList){
this.originalCountList = originalCountList;
return this;
}
/**
* 设置 副本数
* @param duplicateCount
*/
public PrintLogQuery duplicateCount(Integer duplicateCount){
setDuplicateCount(duplicateCount);
return this;
}
/**
* 设置 开始 副本数
* @param duplicateCountStart
*/
public PrintLogQuery duplicateCountStart(Integer duplicateCountStart){
this.duplicateCountStart = duplicateCountStart;
return this;
}
/**
* 设置 结束 副本数
* @param duplicateCountEnd
*/
public PrintLogQuery duplicateCountEnd(Integer duplicateCountEnd){
this.duplicateCountEnd = duplicateCountEnd;
return this;
}
/**
* 设置 增加 副本数
* @param duplicateCountIncrement
*/
public PrintLogQuery duplicateCountIncrement(Integer duplicateCountIncrement){
this.duplicateCountIncrement = duplicateCountIncrement;
return this;
}
/**
* 设置 副本数
* @param duplicateCountList
*/
public PrintLogQuery duplicateCountList(List<Integer> duplicateCountList){
this.duplicateCountList = duplicateCountList;
return this;
}
/**
* 设置 打印状态1打印成功2失败
* @param printStatus
......@@ -1235,6 +1075,25 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 设置 打印结果描述
* @param statusRemark
*/
public PrintLogQuery statusRemark(String statusRemark){
setStatusRemark(statusRemark);
return this;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public PrintLogQuery statusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
return this;
}
/**
* 设置 打印设备
* @param deviceId
......@@ -1372,70 +1231,6 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public PrintLogQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public PrintLogQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public PrintLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public PrintLogQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 设置 打印结果描述
* @param statusRemark
*/
public PrintLogQuery statusRemark(String statusRemark){
setStatusRemark(statusRemark);
return this;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public PrintLogQuery statusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java
View file @ 4aa851e7
......@@ -10,21 +10,33 @@ import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L;
/**
* 证照档案ID
*/
private Long recordId;
/**
* 申请ID
*/
private Long applyId;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
private String catalogName;
/**
* 证照名称
*/
private String certificateName;
......@@ -53,10 +65,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/
private String pickerIDCardNo;
/**
* 证件类型1正本2副本
*/
private Integer certificateType;
/**
* 证件预览地址
*/
private String previewUrl;
......@@ -65,18 +73,32 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/
private String certificateUrl;
/**
* 是否打印0否1是
* 是否完成打印0否1是
*/
private Integer printStatus;
/**
* 证照目录ID
* 允许打印次数
*/
private Long catalogId;
private Integer total;
public PrintWaitQueueEntity(){}
/**
* 获取 证照档案ID
* @return Long
*/
public Long getRecordId(){
return recordId;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 获取 申请ID
* @return Long
*/
......@@ -91,6 +113,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.applyId = applyId;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
......@@ -105,6 +141,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
......@@ -203,20 +253,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 证件类型1正本2副本
* @return Integer
*/
public Integer getCertificateType(){
return certificateType;
}
/**
* 设置 证件类型1正本2副本
* @param certificateType
*/
public void setCertificateType(Integer certificateType){
this.certificateType = certificateType;
}
/**
* 获取 证件预览地址
* @return String
*/
......@@ -245,32 +281,32 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.certificateUrl = certificateUrl;
}
/**
* 获取 是否打印0否1是
* 获取 是否完成打印0否1是
* @return Integer
*/
public Integer getPrintStatus(){
return printStatus;
}
/**
* 设置 是否打印0否1是
* 设置 是否完成打印0否1是
* @param printStatus
*/
public void setPrintStatus(Integer printStatus){
this.printStatus = printStatus;
}
/**
* 获取 证照目录ID
* @return Long
* 获取 允许打印次数
* @return Integer
*/
public Long getCatalogId(){
return catalogId;
public Integer getTotal(){
return total;
}
/**
* 设置 证照目录ID
* @param catalogId
* 设置 允许打印次数
* @param total
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
public void setTotal(Integer total){
this.total = total;
}
......@@ -294,8 +330,11 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",applyId:").append(getApplyId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
......@@ -303,20 +342,25 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",certificateType:").append(getCertificateType());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",printStatus:").append(getPrintStatus());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",total:").append(getTotal());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.applyId = null;
this.catalogId = null;
this.catalogCode = "";
this.catalogName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -331,14 +375,12 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.pickerIDCardNo = "";
this.certificateType = 1;
this.previewUrl = "";
this.certificateUrl = "";
this.printStatus = 0;
this.catalogId = null;
this.total = 1;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */
......@@ -21,6 +21,18 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 证照档案ID */
private Long recordIdStart;
/** 结束 证照档案ID */
private Long recordIdEnd;
/** 增加 证照档案ID */
private Long recordIdIncrement;
/** 证照档案ID列表 */
private List <Long> recordIdList;
/** 开始 申请ID */
private Long applyIdStart;
......@@ -33,9 +45,24 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 申请ID列表 */
private List <Long> applyIdList;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 证照目录编号 */
private List<String> catalogCodeList;
/** 目录名称 */
private List<String> catalogNameList;
/** 证照名称 */
private List<String> certificateNameList;
......@@ -57,36 +84,36 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 取件人证件号码 */
private List<String> pickerIDCardNoList;
/** 开始 证件类型1正本2副本 */
private Integer certificateTypeStart;
/** 结束 证件类型1正本2副本 */
private Integer certificateTypeEnd;
/** 增加 证件类型1正本2副本 */
private Integer certificateTypeIncrement;
/** 证件类型1正本2副本列表 */
private List <Integer> certificateTypeList;
/** 证件预览地址 */
private List<String> previewUrlList;
/** 证件附件地址 */
private List<String> certificateUrlList;
/** 开始 是否打印0否1是 */
/** 开始 是否完成打印0否1是 */
private Integer printStatusStart;
/** 结束 是否打印0否1是 */
/** 结束 是否完成打印0否1是 */
private Integer printStatusEnd;
/** 增加 是否打印0否1是 */
/** 增加 是否完成打印0否1是 */
private Integer printStatusIncrement;
/** 是否打印0否1是列表 */
/** 是否完成打印0否1是列表 */
private List <Integer> printStatusList;
/** 开始 允许打印次数 */
private Integer totalStart;
/** 结束 允许打印次数 */
private Integer totalEnd;
/** 增加 允许打印次数 */
private Integer totalIncrement;
/** 允许打印次数列表 */
private List <Integer> totalList;
/** 开始 创建用户 */
private Long createUserIdStart;
......@@ -123,18 +150,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintWaitQueueQuery> orConditionList;
......@@ -207,6 +222,70 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.idList = idList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
*/
public Long getRecordIdStart(){
return this.recordIdStart;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
}
/**
* 获取 结束 证照档案ID
* @return $recordIdEnd
*/
public Long getRecordIdEnd(){
return this.recordIdEnd;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
}
/**
* 获取 增加 证照档案ID
* @return recordIdIncrement
*/
public Long getRecordIdIncrement(){
return this.recordIdIncrement;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
}
/**
* 获取 证照档案ID
* @return recordIdList
*/
public List<Long> getRecordIdList(){
return this.recordIdList;
}
/**
* 设置 证照档案ID
* @param recordIdList
*/
public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
}
/**
* 获取 开始 申请ID
* @return applyIdStart
......@@ -271,6 +350,70 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.applyIdList = applyIdList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 证照目录编号
* @return catalogCodeList
......@@ -287,6 +430,21 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 证照名称
* @return certificateNameList
*/
......@@ -391,70 +549,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList;
}
/**
* 获取 开始 证件类型1正本2副本
* @return certificateTypeStart
*/
public Integer getCertificateTypeStart(){
return this.certificateTypeStart;
}
/**
* 设置 开始 证件类型1正本2副本
* @param certificateTypeStart
*/
public void setCertificateTypeStart(Integer certificateTypeStart){
this.certificateTypeStart = certificateTypeStart;
}
/**
* 获取 结束 证件类型1正本2副本
* @return $certificateTypeEnd
*/
public Integer getCertificateTypeEnd(){
return this.certificateTypeEnd;
}
/**
* 设置 结束 证件类型1正本2副本
* @param certificateTypeEnd
*/
public void setCertificateTypeEnd(Integer certificateTypeEnd){
this.certificateTypeEnd = certificateTypeEnd;
}
/**
* 获取 增加 证件类型1正本2副本
* @return certificateTypeIncrement
*/
public Integer getCertificateTypeIncrement(){
return this.certificateTypeIncrement;
}
/**
* 设置 增加 证件类型1正本2副本
* @param certificateTypeIncrement
*/
public void setCertificateTypeIncrement(Integer certificateTypeIncrement){
this.certificateTypeIncrement = certificateTypeIncrement;
}
/**
* 获取 证件类型1正本2副本
* @return certificateTypeList
*/
public List<Integer> getCertificateTypeList(){
return this.certificateTypeList;
}
/**
* 设置 证件类型1正本2副本
* @param certificateTypeList
*/
public void setCertificateTypeList(List<Integer> certificateTypeList){
this.certificateTypeList = certificateTypeList;
}
/**
* 获取 证件预览地址
* @return previewUrlList
......@@ -486,7 +580,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.certificateUrlList = certificateUrlList;
}
/**
* 获取 开始 是否打印0否1是
* 获取 开始 是否完成打印0否1是
* @return printStatusStart
*/
public Integer getPrintStatusStart(){
......@@ -494,7 +588,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 开始 是否打印0否1是
* 设置 开始 是否完成打印0否1是
* @param printStatusStart
*/
public void setPrintStatusStart(Integer printStatusStart){
......@@ -502,7 +596,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 结束 是否打印0否1是
* 获取 结束 是否完成打印0否1是
* @return $printStatusEnd
*/
public Integer getPrintStatusEnd(){
......@@ -510,7 +604,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 结束 是否打印0否1是
* 设置 结束 是否完成打印0否1是
* @param printStatusEnd
*/
public void setPrintStatusEnd(Integer printStatusEnd){
......@@ -518,7 +612,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 增加 是否打印0否1是
* 获取 增加 是否完成打印0否1是
* @return printStatusIncrement
*/
public Integer getPrintStatusIncrement(){
......@@ -526,7 +620,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 增加 是否打印0否1是
* 设置 增加 是否完成打印0否1是
* @param printStatusIncrement
*/
public void setPrintStatusIncrement(Integer printStatusIncrement){
......@@ -534,7 +628,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 是否打印0否1是
* 获取 是否完成打印0否1是
* @return printStatusList
*/
public List<Integer> getPrintStatusList(){
......@@ -542,13 +636,77 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 是否打印0否1是
* 设置 是否完成打印0否1是
* @param printStatusList
*/
public void setPrintStatusList(List<Integer> printStatusList){
this.printStatusList = printStatusList;
}
/**
* 获取 开始 允许打印次数
* @return totalStart
*/
public Integer getTotalStart(){
return this.totalStart;
}
/**
* 设置 开始 允许打印次数
* @param totalStart
*/
public void setTotalStart(Integer totalStart){
this.totalStart = totalStart;
}
/**
* 获取 结束 允许打印次数
* @return $totalEnd
*/
public Integer getTotalEnd(){
return this.totalEnd;
}
/**
* 设置 结束 允许打印次数
* @param totalEnd
*/
public void setTotalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
}
/**
* 获取 增加 允许打印次数
* @return totalIncrement
*/
public Integer getTotalIncrement(){
return this.totalIncrement;
}
/**
* 设置 增加 允许打印次数
* @param totalIncrement
*/
public void setTotalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
}
/**
* 获取 允许打印次数
* @return totalList
*/
public List<Integer> getTotalList(){
return this.totalList;
}
/**
* 设置 允许打印次数
* @param totalList
*/
public void setTotalList(List<Integer> totalList){
this.totalList = totalList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
......@@ -741,70 +899,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -850,6 +944,51 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public PrintWaitQueueQuery recordId(Long recordId){
setRecordId(recordId);
return this;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public PrintWaitQueueQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
return this;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public PrintWaitQueueQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
return this;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public PrintWaitQueueQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
return this;
}
/**
* 设置 证照档案ID
* @param recordIdList
*/
public PrintWaitQueueQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
return this;
}
/**
* 设置 申请ID
* @param applyId
......@@ -895,6 +1034,51 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public PrintWaitQueueQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public PrintWaitQueueQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintWaitQueueQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public PrintWaitQueueQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public PrintWaitQueueQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 设置 证照目录编号
......@@ -915,6 +1099,25 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 目录名称
* @param catalogName
*/
public PrintWaitQueueQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public PrintWaitQueueQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
return this;
}
/**
* 设置 证照名称
* @param certificateName
......@@ -1047,51 +1250,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this;
}
/**
* 设置 证件类型1正本2副本
* @param certificateType
*/
public PrintWaitQueueQuery certificateType(Integer certificateType){
setCertificateType(certificateType);
return this;
}
/**
* 设置 开始 证件类型1正本2副本
* @param certificateTypeStart
*/
public PrintWaitQueueQuery certificateTypeStart(Integer certificateTypeStart){
this.certificateTypeStart = certificateTypeStart;
return this;
}
/**
* 设置 结束 证件类型1正本2副本
* @param certificateTypeEnd
*/
public PrintWaitQueueQuery certificateTypeEnd(Integer certificateTypeEnd){
this.certificateTypeEnd = certificateTypeEnd;
return this;
}
/**
* 设置 增加 证件类型1正本2副本
* @param certificateTypeIncrement
*/
public PrintWaitQueueQuery certificateTypeIncrement(Integer certificateTypeIncrement){
this.certificateTypeIncrement = certificateTypeIncrement;
return this;
}
/**
* 设置 证件类型1正本2副本
* @param certificateTypeList
*/
public PrintWaitQueueQuery certificateTypeList(List<Integer> certificateTypeList){
this.certificateTypeList = certificateTypeList;
return this;
}
/**
* 设置 证件预览地址
......@@ -1131,7 +1289,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 是否打印0否1是
* 设置 是否完成打印0否1是
* @param printStatus
*/
public PrintWaitQueueQuery printStatus(Integer printStatus){
......@@ -1140,7 +1298,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 开始 是否打印0否1是
* 设置 开始 是否完成打印0否1是
* @param printStatusStart
*/
public PrintWaitQueueQuery printStatusStart(Integer printStatusStart){
......@@ -1149,7 +1307,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 结束 是否打印0否1是
* 设置 结束 是否完成打印0否1是
* @param printStatusEnd
*/
public PrintWaitQueueQuery printStatusEnd(Integer printStatusEnd){
......@@ -1158,7 +1316,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 增加 是否打印0否1是
* 设置 增加 是否完成打印0否1是
* @param printStatusIncrement
*/
public PrintWaitQueueQuery printStatusIncrement(Integer printStatusIncrement){
......@@ -1167,7 +1325,7 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 是否打印0否1是
* 设置 是否完成打印0否1是
* @param printStatusList
*/
public PrintWaitQueueQuery printStatusList(List<Integer> printStatusList){
......@@ -1175,6 +1333,51 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this;
}
/**
* 设置 允许打印次数
* @param total
*/
public PrintWaitQueueQuery total(Integer total){
setTotal(total);
return this;
}
/**
* 设置 开始 允许打印次数
* @param totalStart
*/
public PrintWaitQueueQuery totalStart(Integer totalStart){
this.totalStart = totalStart;
return this;
}
/**
* 设置 结束 允许打印次数
* @param totalEnd
*/
public PrintWaitQueueQuery totalEnd(Integer totalEnd){
this.totalEnd = totalEnd;
return this;
}
/**
* 设置 增加 允许打印次数
* @param totalIncrement
*/
public PrintWaitQueueQuery totalIncrement(Integer totalIncrement){
this.totalIncrement = totalIncrement;
return this;
}
/**
* 设置 允许打印次数
* @param totalList
*/
public PrintWaitQueueQuery totalList(List<Integer> totalList){
this.totalList = totalList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
......@@ -1267,51 +1470,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public PrintWaitQueueQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public PrintWaitQueueQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintWaitQueueQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public PrintWaitQueueQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public PrintWaitQueueQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RecordEntity.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RecordVo;
/**
* 证照申请实体对象
*
* @author zxfei
* @date 2022-11-04
*/
public class RecordEntity extends RecordVo {
private static final long serialVersionUID = 1L;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 目录名称
*/
private String catalogName;
/**
* 目录编号
*/
private String catalogCode;
/**
* 档案状态
*/
private Integer recordStatus;
public RecordEntity(){}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 档案状态
* @return Integer
*/
public Integer getRecordStatus(){
return recordStatus;
}
/**
* 设置 档案状态
* @param recordStatus
*/
public void setRecordStatus(Integer recordStatus){
this.recordStatus = recordStatus;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof RecordEntity) {
RecordEntity tmp = (RecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",recordStatus:").append(getRecordStatus());
return sb.toString();
}
public void initAttrValue(){
this.catalogId = null;
this.catalogName = "";
this.catalogCode = "";
this.recordStatus = 1;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RecordQuery.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.model;
import java.util.List;
import com.mortals.xhx.module.record.model.RecordEntity;
/**
* 证照申请查询对象
*
* @author zxfei
* @date 2022-11-04
*/
public class RecordQuery extends RecordEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 目录名称 */
private List<String> catalogNameList;
/** 目录编号 */
private List<String> catalogCodeList;
/** 开始 档案状态 */
private Integer recordStatusStart;
/** 结束 档案状态 */
private Integer recordStatusEnd;
/** 增加 档案状态 */
private Integer recordStatusIncrement;
/** 档案状态列表 */
private List <Integer> recordStatusList;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<RecordQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<RecordQuery> andConditionList;
public RecordQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 目录编号
* @return catalogCodeList
*/
public List<String> getCatalogCodeList(){
return this.catalogCodeList;
}
/**
* 设置 目录编号
* @param catalogCodeList
*/
public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 开始 档案状态
* @return recordStatusStart
*/
public Integer getRecordStatusStart(){
return this.recordStatusStart;
}
/**
* 设置 开始 档案状态
* @param recordStatusStart
*/
public void setRecordStatusStart(Integer recordStatusStart){
this.recordStatusStart = recordStatusStart;
}
/**
* 获取 结束 档案状态
* @return $recordStatusEnd
*/
public Integer getRecordStatusEnd(){
return this.recordStatusEnd;
}
/**
* 设置 结束 档案状态
* @param recordStatusEnd
*/
public void setRecordStatusEnd(Integer recordStatusEnd){
this.recordStatusEnd = recordStatusEnd;
}
/**
* 获取 增加 档案状态
* @return recordStatusIncrement
*/
public Integer getRecordStatusIncrement(){
return this.recordStatusIncrement;
}
/**
* 设置 增加 档案状态
* @param recordStatusIncrement
*/
public void setRecordStatusIncrement(Integer recordStatusIncrement){
this.recordStatusIncrement = recordStatusIncrement;
}
/**
* 获取 档案状态
* @return recordStatusList
*/
public List<Integer> getRecordStatusList(){
return this.recordStatusList;
}
/**
* 设置 档案状态
* @param recordStatusList
*/
public void setRecordStatusList(List<Integer> recordStatusList){
this.recordStatusList = recordStatusList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public RecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public RecordQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public RecordQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public RecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public RecordQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public RecordQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public RecordQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public RecordQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public RecordQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public RecordQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 设置 目录名称
* @param catalogName
*/
public RecordQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public RecordQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
return this;
}
/**
* 设置 目录编号
* @param catalogCode
*/
public RecordQuery catalogCode(String catalogCode){
setCatalogCode(catalogCode);
return this;
}
/**
* 设置 目录编号
* @param catalogCodeList
*/
public RecordQuery catalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
return this;
}
/**
* 设置 档案状态
* @param recordStatus
*/
public RecordQuery recordStatus(Integer recordStatus){
setRecordStatus(recordStatus);
return this;
}
/**
* 设置 开始 档案状态
* @param recordStatusStart
*/
public RecordQuery recordStatusStart(Integer recordStatusStart){
this.recordStatusStart = recordStatusStart;
return this;
}
/**
* 设置 结束 档案状态
* @param recordStatusEnd
*/
public RecordQuery recordStatusEnd(Integer recordStatusEnd){
this.recordStatusEnd = recordStatusEnd;
return this;
}
/**
* 设置 增加 档案状态
* @param recordStatusIncrement
*/
public RecordQuery recordStatusIncrement(Integer recordStatusIncrement){
this.recordStatusIncrement = recordStatusIncrement;
return this;
}
/**
* 设置 档案状态
* @param recordStatusList
*/
public RecordQuery recordStatusList(List<Integer> recordStatusList){
this.recordStatusList = recordStatusList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public RecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public RecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public RecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public RecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public RecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public RecordQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public RecordQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public RecordQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public RecordQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public RecordQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<RecordQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<RecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<RecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<RecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 4aa851e7
......@@ -10,17 +10,29 @@ import com.mortals.xhx.module.record.model.vo.RetainLogVo;
* 证照持有实体对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L;
/**
* 证照档案ID
*/
private Long recordId;
/**
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
private String catalogName;
/**
* 证照名称
*/
private String certificateName;
......@@ -45,29 +57,45 @@ public class RetainLogEntity extends RetainLogVo {
*/
private Integer certificateStatus;
/**
* 正本数
* 证件附件地址
*/
private Integer originalCount;
private String certificateUrl;
/**
* 副本数
* 证件预览地址
*/
private Integer duplicateCount;
private String previewUrl;
public RetainLogEntity(){}
/**
* 正本附件地址
* 获取 证照档案ID
* @return Long
*/
private String originalUrl;
public Long getRecordId(){
return recordId;
}
/**
* 副本附件地址
* 设置 证照档案ID
* @param recordId
*/
private String duplicateUrl;
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 证照目录ID
* 获取 证照目录ID
* @return Long
*/
private Long catalogId;
public RetainLogEntity(){}
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
......@@ -83,6 +111,20 @@ public class RetainLogEntity extends RetainLogVo {
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
......@@ -167,74 +209,32 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateStatus = certificateStatus;
}
/**
* 获取 正本数
* @return Integer
*/
public Integer getOriginalCount(){
return originalCount;
}
/**
* 设置 正本数
* @param originalCount
*/
public void setOriginalCount(Integer originalCount){
this.originalCount = originalCount;
}
/**
* 获取 副本数
* @return Integer
*/
public Integer getDuplicateCount(){
return duplicateCount;
}
/**
* 设置 副本数
* @param duplicateCount
*/
public void setDuplicateCount(Integer duplicateCount){
this.duplicateCount = duplicateCount;
}
/**
* 获取 正本附件地址
* 获取 证件附件地址
* @return String
*/
public String getOriginalUrl(){
return originalUrl;
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 正本附件地址
* @param originalUrl
* 设置 证件附件地址
* @param certificateUrl
*/
public void setOriginalUrl(String originalUrl){
this.originalUrl = originalUrl;
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 副本附件地址
* 获取 证件预览地址
* @return String
*/
public String getDuplicateUrl(){
return duplicateUrl;
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 副本附件地址
* @param duplicateUrl
* 设置 证件预览地址
* @param previewUrl
*/
public void setDuplicateUrl(String duplicateUrl){
this.duplicateUrl = duplicateUrl;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
......@@ -258,25 +258,31 @@ public class RetainLogEntity extends RetainLogVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",certificateStatus:").append(getCertificateStatus());
sb.append(",originalCount:").append(getOriginalCount());
sb.append(",duplicateCount:").append(getDuplicateCount());
sb.append(",originalUrl:").append(getOriginalUrl());
sb.append(",duplicateUrl:").append(getDuplicateUrl());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",previewUrl:").append(getPreviewUrl());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.catalogId = null;
this.catalogCode = "";
this.catalogName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -289,14 +295,8 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateStatus = 1;
this.originalCount = 0;
this.certificateUrl = "";
this.duplicateCount = 0;
this.originalUrl = "";
this.duplicateUrl = "";
this.catalogId = null;
this.previewUrl = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 4aa851e7
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.record.model.RetainLogEntity;
* 证照持有查询对象
*
* @author zxfei
* @date 2022-10-22
* @date 2022-11-04
*/
public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */
......@@ -21,9 +21,36 @@ public class RetainLogQuery extends RetainLogEntity {
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 证照档案ID */
private Long recordIdStart;
/** 结束 证照档案ID */
private Long recordIdEnd;
/** 增加 证照档案ID */
private Long recordIdIncrement;
/** 证照档案ID列表 */
private List <Long> recordIdList;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 证照目录编号 */
private List<String> catalogCodeList;
/** 目录名称 */
private List<String> catalogNameList;
/** 证照名称 */
private List<String> certificateNameList;
......@@ -51,35 +78,11 @@ public class RetainLogQuery extends RetainLogEntity {
/** 证照状态，1正常2注销列表 */
private List <Integer> certificateStatusList;
/** 开始 正本数 */
private Integer originalCountStart;
/** 结束 正本数 */
private Integer originalCountEnd;
/** 增加 正本数 */
private Integer originalCountIncrement;
/** 正本数列表 */
private List <Integer> originalCountList;
/** 开始 副本数 */
private Integer duplicateCountStart;
/** 证件附件地址 */
private List<String> certificateUrlList;
/** 结束 副本数 */
private Integer duplicateCountEnd;
/** 增加 副本数 */
private Integer duplicateCountIncrement;
/** 副本数列表 */
private List <Integer> duplicateCountList;
/** 正本附件地址 */
private List<String> originalUrlList;
/** 副本附件地址 */
private List<String> duplicateUrlList;
/** 证件预览地址 */
private List<String> previewUrlList;
/** 开始 创建用户 */
private Long createUserIdStart;
......@@ -117,18 +120,6 @@ public class RetainLogQuery extends RetainLogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<RetainLogQuery> orConditionList;
......@@ -201,6 +192,134 @@ public class RetainLogQuery extends RetainLogEntity {
this.idList = idList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
*/
public Long getRecordIdStart(){
return this.recordIdStart;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public void setRecordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
}
/**
* 获取 结束 证照档案ID
* @return $recordIdEnd
*/
public Long getRecordIdEnd(){
return this.recordIdEnd;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public void setRecordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
}
/**
* 获取 增加 证照档案ID
* @return recordIdIncrement
*/
public Long getRecordIdIncrement(){
return this.recordIdIncrement;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public void setRecordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
}
/**
* 获取 证照档案ID
* @return recordIdList
*/
public List<Long> getRecordIdList(){
return this.recordIdList;
}
/**
* 设置 证照档案ID
* @param recordIdList
*/
public void setRecordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 证照目录编号
* @return catalogCodeList
......@@ -217,6 +336,21 @@ public class RetainLogQuery extends RetainLogEntity {
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 目录名称
* @return catalogNameList
*/
public List<String> getCatalogNameList(){
return this.catalogNameList;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
}
/**
* 获取 证照名称
* @return certificateNameList
*/
......@@ -356,162 +490,34 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 获取 开始 正本数
* @return originalCountStart
*/
public Integer getOriginalCountStart(){
return this.originalCountStart;
}
/**
* 设置 开始 正本数
* @param originalCountStart
*/
public void setOriginalCountStart(Integer originalCountStart){
this.originalCountStart = originalCountStart;
}
/**
* 获取 结束 正本数
* @return $originalCountEnd
* 获取 证件附件地址
* @return certificateUrlList
*/
public Integer getOriginalCountEnd(){
return this.originalCountEnd;
public List<String> getCertificateUrlList(){
return this.certificateUrlList;
}
/**
* 设置 结束 正本数
* @param originalCountEnd
* 设置 证件附件地址
* @param certificateUrlList
*/
public void setOriginalCountEnd(Integer originalCountEnd){
this.originalCountEnd = originalCountEnd;
public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
}
/**
* 获取 增加 正本数
* @return originalCountIncrement
* 获取 证件预览地址
* @return previewUrlList
*/
public Integer getOriginalCountIncrement(){
return this.originalCountIncrement;
public List<String> getPreviewUrlList(){
return this.previewUrlList;
}
/**
* 设置 增加 正本数
* @param originalCountIncrement
* 设置 证件预览地址
* @param previewUrlList
*/
public void setOriginalCountIncrement(Integer originalCountIncrement){
this.originalCountIncrement = originalCountIncrement;
}
/**
* 获取 正本数
* @return originalCountList
*/
public List<Integer> getOriginalCountList(){
return this.originalCountList;
}
/**
* 设置 正本数
* @param originalCountList
*/
public void setOriginalCountList(List<Integer> originalCountList){
this.originalCountList = originalCountList;
}
/**
* 获取 开始 副本数
* @return duplicateCountStart
*/
public Integer getDuplicateCountStart(){
return this.duplicateCountStart;
}
/**
* 设置 开始 副本数
* @param duplicateCountStart
*/
public void setDuplicateCountStart(Integer duplicateCountStart){
this.duplicateCountStart = duplicateCountStart;
}
/**
* 获取 结束 副本数
* @return $duplicateCountEnd
*/
public Integer getDuplicateCountEnd(){
return this.duplicateCountEnd;
}
/**
* 设置 结束 副本数
* @param duplicateCountEnd
*/
public void setDuplicateCountEnd(Integer duplicateCountEnd){
this.duplicateCountEnd = duplicateCountEnd;
}
/**
* 获取 增加 副本数
* @return duplicateCountIncrement
*/
public Integer getDuplicateCountIncrement(){
return this.duplicateCountIncrement;
}
/**
* 设置 增加 副本数
* @param duplicateCountIncrement
*/
public void setDuplicateCountIncrement(Integer duplicateCountIncrement){
this.duplicateCountIncrement = duplicateCountIncrement;
}
/**
* 获取 副本数
* @return duplicateCountList
*/
public List<Integer> getDuplicateCountList(){
return this.duplicateCountList;
}
/**
* 设置 副本数
* @param duplicateCountList
*/
public void setDuplicateCountList(List<Integer> duplicateCountList){
this.duplicateCountList = duplicateCountList;
}
/**
* 获取 正本附件地址
* @return originalUrlList
*/
public List<String> getOriginalUrlList(){
return this.originalUrlList;
}
/**
* 设置 正本附件地址
* @param originalUrlList
*/
public void setOriginalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
}
/**
* 获取 副本附件地址
* @return duplicateUrlList
*/
public List<String> getDuplicateUrlList(){
return this.duplicateUrlList;
}
/**
* 设置 副本附件地址
* @param duplicateUrlList
*/
public void setDuplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
}
/**
* 获取 开始 创建用户
......@@ -706,111 +712,137 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
* 设置 序号，主键，自增长
* @param id
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
public RetainLogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
public RetainLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
public RetainLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
public RetainLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
* 设置 序号，主键，自增长
* @param idList
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
public RetainLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
* 设置 证照档案ID
* @param recordId
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
public RetainLogQuery recordId(Long recordId){
setRecordId(recordId);
return this;
}
/**
* 获取 证照目录ID
* @return catalogIdList
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
public RetainLogQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
public RetainLogQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
return this;
}
/**
* 设置 序号，主键，自增长
* @param id
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public RetainLogQuery id(Long id){
setId(id);
public RetainLogQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 证照档案ID
* @param recordIdList
*/
public RetainLogQuery idStart(Long idStart){
this.idStart = idStart;
public RetainLogQuery recordIdList(List<Long> recordIdList){
this.recordIdList = recordIdList;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 证照目录ID
* @param catalogId
*/
public RetainLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public RetainLogQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public RetainLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public RetainLogQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public RetainLogQuery idList(List<Long> idList){
this.idList = idList;
public RetainLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public RetainLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public RetainLogQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
......@@ -834,6 +866,25 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 设置 目录名称
* @param catalogName
*/
public RetainLogQuery catalogName(String catalogName){
setCatalogName(catalogName);
return this;
}
/**
* 设置 目录名称
* @param catalogNameList
*/
public RetainLogQuery catalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList;
return this;
}
/**
* 设置 证照名称
* @param certificateName
......@@ -973,131 +1024,41 @@ public class RetainLogQuery extends RetainLogEntity {
return this;
}
/**
* 设置 正本数
* @param originalCount
*/
public RetainLogQuery originalCount(Integer originalCount){
setOriginalCount(originalCount);
return this;
}
/**
* 设置 开始 正本数
* @param originalCountStart
* 设置 证件附件地址
* @param certificateUrl
*/
public RetainLogQuery originalCountStart(Integer originalCountStart){
this.originalCountStart = originalCountStart;
public RetainLogQuery certificateUrl(String certificateUrl){
setCertificateUrl(certificateUrl);
return this;
}
/**
* 设置 结束 正本数
* @param originalCountEnd
* 设置 证件附件地址
* @param certificateUrlList
*/
public RetainLogQuery originalCountEnd(Integer originalCountEnd){
this.originalCountEnd = originalCountEnd;
public RetainLogQuery certificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
return this;
}
/**
* 设置 增加 正本数
* @param originalCountIncrement
*/
public RetainLogQuery originalCountIncrement(Integer originalCountIncrement){
this.originalCountIncrement = originalCountIncrement;
return this;
}
/**
* 设置 正本数
* @param originalCountList
* 设置 证件预览地址
* @param previewUrl
*/
public RetainLogQuery originalCountList(List<Integer> originalCountList){
this.originalCountList = originalCountList;
public RetainLogQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 副本数
* @param duplicateCount
* 设置 证件预览地址
* @param previewUrlList
*/
public RetainLogQuery duplicateCount(Integer duplicateCount){
setDuplicateCount(duplicateCount);
return this;
}
/**
* 设置 开始 副本数
* @param duplicateCountStart
*/
public RetainLogQuery duplicateCountStart(Integer duplicateCountStart){
this.duplicateCountStart = duplicateCountStart;
return this;
}
/**
* 设置 结束 副本数
* @param duplicateCountEnd
*/
public RetainLogQuery duplicateCountEnd(Integer duplicateCountEnd){
this.duplicateCountEnd = duplicateCountEnd;
return this;
}
/**
* 设置 增加 副本数
* @param duplicateCountIncrement
*/
public RetainLogQuery duplicateCountIncrement(Integer duplicateCountIncrement){
this.duplicateCountIncrement = duplicateCountIncrement;
return this;
}
/**
* 设置 副本数
* @param duplicateCountList
*/
public RetainLogQuery duplicateCountList(List<Integer> duplicateCountList){
this.duplicateCountList = duplicateCountList;
return this;
}
/**
* 设置 正本附件地址
* @param originalUrl
*/
public RetainLogQuery originalUrl(String originalUrl){
setOriginalUrl(originalUrl);
return this;
}
/**
* 设置 正本附件地址
* @param originalUrlList
*/
public RetainLogQuery originalUrlList(List<String> originalUrlList){
this.originalUrlList = originalUrlList;
return this;
}
/**
* 设置 副本附件地址
* @param duplicateUrl
*/
public RetainLogQuery duplicateUrl(String duplicateUrl){
setDuplicateUrl(duplicateUrl);
return this;
}
/**
* 设置 副本附件地址
* @param duplicateUrlList
*/
public RetainLogQuery duplicateUrlList(List<String> duplicateUrlList){
this.duplicateUrlList = duplicateUrlList;
public RetainLogQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
......@@ -1193,51 +1154,6 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public RetainLogQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public RetainLogQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public RetainLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public RetainLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public RetainLogQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/RecordVo.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.RecordEntity;
import java.util.ArrayList;
import java.util.List;
/**
* 证照申请视图对象
*
* @author zxfei
* @date 2022-11-04
*/
public class RecordVo extends BaseEntityLong {
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/ApplyLogService.java
View file @ 4aa851e7
......@@ -22,13 +22,6 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{
*/
String previewOriginal(ApplyLogEntity applyLogEntity, Context context) throws AppException;
/**
* 预览副本
* @param applyLogEntity
* @return
*/
String previewDuplicate(ApplyLogEntity applyLogEntity, Context context) throws AppException;
/**
* 生成正本
* @param applyLogEntity
......@@ -36,18 +29,5 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{
*/
void generateOriginal(ApplyLogEntity applyLogEntity, Context context) throws AppException;
/**
* 生成副本
* @param applyLogEntity
* @return
*/
void generateDuplicate(ApplyLogEntity applyLogEntity, Context context) throws AppException;
/**
* 生成正副本
* @param applyLogEntity
* @return
*/
void generateAll(ApplyLogEntity applyLogEntity, Context context) throws AppException;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintLogService.java
View file @ 4aa851e7
......@@ -16,11 +16,4 @@ import com.mortals.xhx.module.record.model.PrintLogEntity;
*/
public interface PrintLogService extends ICRUDService<PrintLogEntity,Long>{
/**
* 添加打印记录
* @param applyLogEntity
* @param context
* @throws AppException
*/
void creatPrintLog(ApplyLogEntity applyLogEntity, Context context) throws AppException;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/RecordService.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.record.model.RecordEntity;
/**
* RecordService
*
* 证照申请 service接口
*
* @author zxfei
* @date 2022-11-04
*/
public interface RecordService extends ICRUDService<RecordEntity,Long>{
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 4aa851e7
......@@ -18,6 +18,8 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.ClassifyType;
import com.mortals.xhx.common.code.GenerateStatus;
import com.mortals.xhx.common.code.OperTypeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.utils.ExportDocUtil;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.common.utils.WordUtil;
......@@ -25,8 +27,10 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.record.dao.RecordDao;
import com.mortals.xhx.module.record.model.ApplyLogQuery;
import com.mortals.xhx.module.record.model.DocTemplateVO;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import org.apache.http.entity.ContentType;
import org.springframework.beans.BeanUtils;
......@@ -70,10 +74,10 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private CertificateCatalogService certificateCatalogService;
@Autowired
private CertificateClassifyService certificateClassifyService;
private PrintWaitQueueService printWaitQueueService;
@Autowired
private PrintWaitQueueService printWaitQueueService;
private RecordDao recordDao;
@Override
protected ApplyLogEntity findBefore(ApplyLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
......@@ -142,86 +146,55 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
validData(applyLogEntity,context);
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getOriginalUrl(),applyLogEntity.getOriFormContent());
return preview(docTemplate, context);
}
@Override
public String previewDuplicate(ApplyLogEntity applyLogEntity, Context context) throws AppException {
validData(applyLogEntity,context);
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getDuplicateUrl(),catalog.getDupFormContent());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateUrl(),applyLogEntity.getFormContent());
return preview(docTemplate, context);
}
@Override
public void generateOriginal(ApplyLogEntity applyLogEntity, Context context) throws AppException {
validData(applyLogEntity,context);
Long oldId = null;
boolean delete = false;
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getOriginalUrl(),applyLogEntity.getOriFormContent());
applyLogEntity.setCatalogName(catalog.getCatalogName());
applyLogEntity.setFormTemplate(catalog.getFormContent());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateUrl(),applyLogEntity.getFormContent());
String paths = preview(docTemplate, context);
String[] vals = paths.split(";");
applyLogEntity.setOriginalUrl(vals[0]);
applyLogEntity.setOriPreview(vals[1]);
applyLogEntity.setCertificateUrl(vals[0]);
applyLogEntity.setPreviewUrl(vals[1]);
applyLogEntity.setCreateTime(new Date());
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
applyLogEntity.setGenerateStatus(GenerateStatus.ORIGINAL.getValue());
dao.insert(applyLogEntity);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
if(applyLogEntity.getId()!=null && applyLogEntity.getRecordId()!=null){
applyLogEntity.setOperType(OperTypeEnum.UPDATE.getValue());
oldId = applyLogEntity.getId();
delete = true;
RecordEntity recordEntity = new RecordEntity();
recordEntity.setId(applyLogEntity.getRecordId());
recordEntity.setUpdateUserId(applyLogEntity.getCreateUserId());
recordEntity.setUpdateTime(applyLogEntity.getCreateTime());
recordDao.update(recordEntity);
}else {
applyLogEntity.setOperType(OperTypeEnum.SAVE.getValue());
RecordEntity recordEntity = new RecordEntity();
recordEntity.setCatalogId(catalog.getId());
recordEntity.setCatalogCode(catalog.getCatalogCode());
recordEntity.setCatalogName(catalog.getCatalogName());
recordEntity.setRecordStatus(YesNoEnum.YES.getValue());
recordEntity.setCreateUserId(applyLogEntity.getCreateUserId());
recordEntity.setCreateTime(applyLogEntity.getCreateTime());
recordDao.insert(recordEntity);
applyLogEntity.setRecordId(recordEntity.getId());
}
@Override
public void generateDuplicate(ApplyLogEntity applyLogEntity, Context context) {
validData(applyLogEntity,context);
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getDuplicateUrl(),applyLogEntity.getDupFormContent());
String paths = preview(docTemplate, context);
String[] vals = paths.split(";");
applyLogEntity.setDuplicateUrl(vals[0]);
applyLogEntity.setDupPreview(vals[1]);
applyLogEntity.setCreateTime(new Date());
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
applyLogEntity.setGenerateStatus(GenerateStatus.DUPLICATE.getValue());
dao.insert(applyLogEntity);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.DUPLICATE.getValue(),context);
}
@Override
public void generateAll(ApplyLogEntity applyLogEntity, Context context) throws AppException {
if(context==null || context.getUser()==null){
throw new AppException("未登录或者登录过期");
}
validData(applyLogEntity,context);
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getOriginalUrl(),applyLogEntity.getOriFormContent());
String paths = preview(docTemplate, context);
String[] vals = paths.split(";");
applyLogEntity.setOriginalUrl(vals[0]);
applyLogEntity.setOriPreview(vals[1]);
CertificateClassifyEntity classifyEntity = certificateClassifyService.get(catalog.getClassifyId());
if(classifyEntity!=null && classifyEntity.getClassifyType()== ClassifyType.PRINCIPAL_AND_VICE.getValue()) {
docTemplate.setFormContent(applyLogEntity.getDupFormContent());
docTemplate.setTemplatePath(catalog.getDuplicateUrl());
String paths1 = preview(docTemplate, context);
String[] vals1 = paths1.split(";");
applyLogEntity.setDuplicateUrl(vals1[0]);
applyLogEntity.setDupPreview(vals1[1]);
if(delete){
dao.delete(oldId);
}
applyLogEntity.setCreateTime(new Date());
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
applyLogEntity.setGenerateStatus(GenerateStatus.ALL.getValue());
dao.insert(applyLogEntity);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ALL.getValue(),context);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
}
private String preview(DocTemplateVO docTemplate,Context context){
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintLogServiceImpl.java
View file @ 4aa851e7
......@@ -35,11 +35,6 @@ import java.util.List;
@Service("printLogService")
public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, PrintLogEntity, Long> implements PrintLogService {
@Autowired
private CertificateCatalogService certificateCatalogService;
@Autowired
private CertificateClassifyService certificateClassifyService;
@Override
protected PrintLogEntity findBefore(PrintLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
PrintLogQuery query = new PrintLogQuery();
......@@ -58,33 +53,4 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
}
return query;
}
@Override
public void creatPrintLog(ApplyLogEntity applyLogEntity, Context context) throws AppException {
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setCatalogId(applyLogEntity.getCatalogId());
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(applyLogEntity.getCatalogId());
CertificateClassifyEntity classifyEntity = certificateClassifyService.get(catalogEntity.getClassifyId());
printLogEntity.setCatalogCode(catalogEntity.getCatalogCode());
if(classifyEntity.getClassifyType()== ClassifyType.PRINCIPAL.getValue()){
printLogEntity.setOriginalCount(1);
printLogEntity.setDuplicateCount(0);
}
if(classifyEntity.getClassifyType()== ClassifyType.PRINCIPAL_AND_VICE.getValue()){
printLogEntity.setOriginalCount(1);
printLogEntity.setDuplicateCount(1);
}
printLogEntity.setCertificateName(applyLogEntity.getCertificateName());
printLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
printLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
printLogEntity.setHolderName(applyLogEntity.getHolderName());
printLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
Date now = new Date();
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(applyLogEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
dao.insert(printLogEntity);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 4aa851e7
......@@ -84,8 +84,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private PrintWaitQueueEntity creatWaitQueue(ApplyLogEntity applyLogEntity,int generateType){
PrintWaitQueueEntity waitQueueEntity = new PrintWaitQueueEntity();
waitQueueEntity.setApplyId(applyLogEntity.getId());
waitQueueEntity.setRecordId(applyLogEntity.getRecordId());
waitQueueEntity.setCatalogId(applyLogEntity.getCatalogId());
waitQueueEntity.setCatalogCode(applyLogEntity.getCatalogCode());
waitQueueEntity.setCatalogName(applyLogEntity.getCatalogName());
waitQueueEntity.setCertificateName(applyLogEntity.getCertificateName());
waitQueueEntity.setCertificateCode(applyLogEntity.getCertificateCode());
waitQueueEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
......@@ -93,16 +95,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
waitQueueEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
waitQueueEntity.setPickerName(applyLogEntity.getPickerName());
waitQueueEntity.setPickerIDCardNo(applyLogEntity.getPickerIDCardNo());
if(generateType== GenerateStatus.DUPLICATE.getValue()) {
waitQueueEntity.setCertificateType(CertificateType.DUPLICATE.getValue());
waitQueueEntity.setPreviewUrl(applyLogEntity.getDupPreview());
waitQueueEntity.setCertificateUrl(applyLogEntity.getDuplicateUrl());
}else{
waitQueueEntity.setCertificateType(CertificateType.ORIGINAL.getValue());
waitQueueEntity.setPreviewUrl(applyLogEntity.getOriPreview());
waitQueueEntity.setCertificateUrl(applyLogEntity.getOriginalUrl());
}
waitQueueEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
waitQueueEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
waitQueueEntity.setPrintStatus(YesNoEnum.NO.getValue());
waitQueueEntity.setTotal(1);
waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId());
waitQueueEntity.setCreateTime(new Date());
return waitQueueEntity;
......@@ -134,13 +130,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
if(waitQueueEntity.getCertificateType()==CertificateType.ORIGINAL.getValue()){
printLogEntity.setOriginalCount(1);
printLogEntity.setDuplicateCount(0);
}else {
printLogEntity.setOriginalCount(0);
printLogEntity.setDuplicateCount(1);
}
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
......@@ -174,21 +164,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
if(waitQueueEntity.getCertificateType()==CertificateType.ORIGINAL.getValue()){
printLogEntity.setOriginalCount(1);
printLogEntity.setDuplicateCount(0);
retainLogEntity.setOriginalCount(1);
retainLogEntity.setDuplicateCount(0);
retainLogEntity.setOriginalUrl(waitQueueEntity.getCertificateUrl());
}else {
printLogEntity.setOriginalCount(0);
printLogEntity.setDuplicateCount(1);
retainLogEntity.setOriginalCount(0);
retainLogEntity.setDuplicateCount(1);
retainLogEntity.setDuplicateUrl(waitQueueEntity.getCertificateUrl());
}
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RecordServiceImpl.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.record.dao.RecordDao;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.RecordService;
/**
* RecordService
* 证照申请 service实现
*
* @author zxfei
* @date 2022-11-04
*/
@Service("recordService")
public class RecordServiceImpl extends AbstractCRUDServiceImpl<RecordDao, RecordEntity, Long> implements RecordService {
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RetainLogServiceImpl.java
View file @ 4aa851e7
......@@ -60,25 +60,18 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
RetainLogEntity retainLogEntity = new RetainLogEntity();
retainLogEntity.setCatalogId(applyLogEntity.getCatalogId());
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(applyLogEntity.getCatalogId());
CertificateClassifyEntity classifyEntity = certificateClassifyService.get(catalogEntity.getClassifyId());
retainLogEntity.setRecordId(applyLogEntity.getRecordId());
retainLogEntity.setCatalogId(catalogEntity.getId());
retainLogEntity.setCatalogCode(catalogEntity.getCatalogCode());
if(classifyEntity.getClassifyType()== ClassifyType.PRINCIPAL.getValue()){
retainLogEntity.setOriginalCount(1);
retainLogEntity.setDuplicateCount(0);
}
if(classifyEntity.getClassifyType()== ClassifyType.PRINCIPAL_AND_VICE.getValue()){
retainLogEntity.setOriginalCount(1);
retainLogEntity.setDuplicateCount(1);
}
retainLogEntity.setCatalogName(catalogEntity.getCatalogName());
retainLogEntity.setCertificateName(applyLogEntity.getCertificateName());
retainLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
retainLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
retainLogEntity.setHolderName(applyLogEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setOriginalUrl(applyLogEntity.getOriginalUrl());
retainLogEntity.setDuplicateUrl(applyLogEntity.getDuplicateUrl());
retainLogEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
retainLogEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
retainLogEntity.setCreateUserId(applyLogEntity.getCreateUserId());
retainLogEntity.setCreateTime(new Date());
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java
View file @ 4aa851e7
......@@ -80,31 +80,6 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
return ret;
}
/**
* 预览副本
*/
@PostMapping(value = "preview/duplicate")
@UnAuth
public Rest<Object> previewDuplicate(@RequestBody ApplyLogEntity applyLogEntity) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
try {
String paths = this.service.previewDuplicate(applyLogEntity, getContext());
String[] vals = paths.split(";");
ret.setCode(VALUE_RESULT_SUCCESS);
ret.setMsg("生成成功");
//model.put("mergeDoc", vals[0]);
model.put("preview", vals[1]);
ret.setData(model);
} catch (Exception e) {
log.error("合成表单异常", e);
ret.setCode(VALUE_RESULT_FAILURE);
ret.setMsg(super.convertException(e));
}
return ret;
}
/**
* 生成正本
*/
......@@ -128,47 +103,4 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
return ret;
}
/**
* 生成副本
*/
@PostMapping(value = "generate/duplicate")
@UnAuth
public Rest<Object> generateDuplicate(@RequestBody ApplyLogEntity applyLogEntity) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
try {
this.service.generateDuplicate(applyLogEntity, getContext());
ret.setCode(VALUE_RESULT_SUCCESS);
ret.setMsg("生成成功");
//model.put("mergeDoc", vals[0]);
ret.setData(model);
} catch (Exception e) {
log.error("合成表单异常", e);
ret.setCode(VALUE_RESULT_FAILURE);
ret.setMsg(super.convertException(e));
}
return ret;
}
/**
* 全部生成
*/
@PostMapping(value = "generate/all")
@UnAuth
public Rest<Object> generateAll(@RequestBody ApplyLogEntity applyLogEntity) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
try {
this.service.generateAll(applyLogEntity, getContext());
ret.setCode(VALUE_RESULT_SUCCESS);
ret.setMsg("生成成功");
//model.put("mergeDoc", vals[0]);
ret.setData(model);
} catch (Exception e) {
log.error("合成表单异常", e);
ret.setCode(VALUE_RESULT_FAILURE);
ret.setMsg(super.convertException(e));
}
return ret;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/web/RecordController.java 0 → 100644
View file @ 4aa851e7
package com.mortals.xhx.module.record.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.RecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 证照申请
*
* @author zxfei
* @date 2022-11-04
*/
@RestController
@RequestMapping("record")
public class RecordController extends BaseCRUDJsonBodyMappingController<RecordService,RecordEntity,Long> {
@Autowired
private ParamService paramService;
public RecordController(){
super.setModuleDesc( "证照申请");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "recordStatus", paramService.getParamBySecondOrganize("Record","recordStatus"));
super.init(model, context);
}
}
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml
View file @ 4aa851e7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateCatalogDaoImpl">
<!-- 字段和属性映射 -->
......@@ -14,21 +14,19 @@
<result property="transverse" column="transverse" />
<result property="portrait" column="portrait" />
<result property="inspect" column="inspect" />
<result property="oriFileName" column="oriFileName" />
<result property="originalUrl" column="originalUrl" />
<result property="oriFormContent" column="oriFormContent" />
<result property="dupFileName" column="dupFileName" />
<result property="duplicateUrl" column="duplicateUrl" />
<result property="dupFormContent" column="dupFormContent" />
<result property="templateName" column="templateName" />
<result property="templateUrl" column="templateUrl" />
<result property="formContent" column="formContent" />
<result property="exampleUrl" column="exampleUrl" />
<result property="status" column="status" />
<result property="printerName" column="printerName" />
<result property="printerIp" column="printerIp" />
<result property="paperSource" column="paperSource" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="printerName" column="printerName" />
<result property="printerIp" column="printerIp" />
<result property="paperSource" column="paperSource" />
<result property="deviceId" column="deviceId" />
</resultMap>
......@@ -63,23 +61,14 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('inspect') or colPickMode == 1 and data.containsKey('inspect')))">
a.inspect,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFileName') or colPickMode == 1 and data.containsKey('oriFileName')))">
a.oriFileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalUrl') or colPickMode == 1 and data.containsKey('originalUrl')))">
a.originalUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormContent') or colPickMode == 1 and data.containsKey('oriFormContent')))">
a.oriFormContent,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFileName') or colPickMode == 1 and data.containsKey('dupFileName')))">
a.dupFileName,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateUrl') or colPickMode == 1 and data.containsKey('templateUrl')))">
a.templateUrl,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFormContent') or colPickMode == 1 and data.containsKey('dupFormContent')))">
a.dupFormContent,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exampleUrl') or colPickMode == 1 and data.containsKey('exampleUrl')))">
a.exampleUrl,
......@@ -87,6 +76,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerName') or colPickMode == 1 and data.containsKey('printerName')))">
a.printerName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerIp') or colPickMode == 1 and data.containsKey('printerIp')))">
a.printerIp,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paperSource') or colPickMode == 1 and data.containsKey('paperSource')))">
a.paperSource,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
......@@ -99,32 +97,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerName') or colPickMode == 1 and data.containsKey('printerName')))">
a.printerName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerIp') or colPickMode == 1 and data.containsKey('printerIp')))">
a.printerIp,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paperSource') or colPickMode == 1 and data.containsKey('paperSource')))">
a.paperSource,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_catalog
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,oriFileName,originalUrl,oriFormContent,dupFileName,duplicateUrl,dupFormContent,exampleUrl,status,createUserId,createTime,updateUserId,updateTime,printerName,printerIp,paperSource)
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId)
VALUES
(#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{oriFileName},#{originalUrl},#{oriFormContent},#{dupFileName},#{duplicateUrl},#{dupFormContent},#{exampleUrl},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{printerName},#{printerIp},#{paperSource})
(#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,oriFileName,originalUrl,oriFormContent,dupFileName,duplicateUrl,dupFormContent,exampleUrl,status,createUserId,createTime,updateUserId,updateTime,printerName,printerIp,paperSource)
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.oriFileName},#{item.originalUrl},#{item.oriFormContent},#{item.dupFileName},#{item.duplicateUrl},#{item.dupFormContent},#{item.exampleUrl},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.printerName},#{item.printerIp},#{item.paperSource})
(#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId})
</foreach>
</insert>
......@@ -176,23 +168,14 @@
<if test="(colPickMode==0 and data.containsKey('inspectIncrement')) or (colPickMode==1 and !data.containsKey('inspectIncrement'))">
a.inspect=ifnull(a.inspect,0) + #{data.inspectIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFileName')) or (colPickMode==1 and !data.containsKey('oriFileName'))">
a.oriFileName=#{data.oriFileName},
</if>
<if test="(colPickMode==0 and data.containsKey('originalUrl')) or (colPickMode==1 and !data.containsKey('originalUrl'))">
a.originalUrl=#{data.originalUrl},
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFormContent')) or (colPickMode==1 and !data.containsKey('oriFormContent'))">
a.oriFormContent=#{data.oriFormContent},
<if test="(colPickMode==0 and data.containsKey('templateUrl')) or (colPickMode==1 and !data.containsKey('templateUrl'))">
a.templateUrl=#{data.templateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('dupFileName')) or (colPickMode==1 and !data.containsKey('dupFileName'))">
a.dupFileName=#{data.dupFileName},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))">
a.duplicateUrl=#{data.duplicateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('dupFormContent')) or (colPickMode==1 and !data.containsKey('dupFormContent'))">
a.dupFormContent=#{data.dupFormContent},
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent},
</if>
<if test="(colPickMode==0 and data.containsKey('exampleUrl')) or (colPickMode==1 and !data.containsKey('exampleUrl'))">
a.exampleUrl=#{data.exampleUrl},
......@@ -203,6 +186,15 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('printerName')) or (colPickMode==1 and !data.containsKey('printerName'))">
a.printerName=#{data.printerName},
</if>
<if test="(colPickMode==0 and data.containsKey('printerIp')) or (colPickMode==1 and !data.containsKey('printerIp'))">
a.printerIp=#{data.printerIp},
</if>
<if test="(colPickMode==0 and data.containsKey('paperSource')) or (colPickMode==1 and !data.containsKey('paperSource'))">
a.paperSource=#{data.paperSource},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
......@@ -221,14 +213,11 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('printerName')) or (colPickMode==1 and !data.containsKey('printerName'))">
a.printerName=#{data.printerName},
<if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.deviceId=#{data.deviceId},
</if>
<if test="(colPickMode==0 and data.containsKey('printerIp')) or (colPickMode==1 and !data.containsKey('printerIp'))">
a.printerIp=#{data.printerIp},
</if>
<if test="(colPickMode==0 and data.containsKey('paperSource')) or (colPickMode==1 and !data.containsKey('paperSource'))">
a.paperSource=#{data.paperSource},
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
......@@ -328,45 +317,24 @@
</choose>
</foreach>
</trim>
<trim prefix="oriFileName=(case" suffix="ELSE oriFileName end),">
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriFileName')) or (colPickMode==1 and !item.containsKey('oriFileName'))">
when a.id=#{item.id} then #{item.oriFileName}
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="originalUrl=(case" suffix="ELSE originalUrl end),">
<trim prefix="templateUrl=(case" suffix="ELSE templateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('originalUrl')) or (colPickMode==1 and !item.containsKey('originalUrl'))">
when a.id=#{item.id} then #{item.originalUrl}
<if test="(colPickMode==0 and item.containsKey('templateUrl')) or (colPickMode==1 and !item.containsKey('templateUrl'))">
when a.id=#{item.id} then #{item.templateUrl}
</if>
</foreach>
</trim>
<trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent end),">
<trim prefix="formContent=(case" suffix="ELSE formContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriFormContent')) or (colPickMode==1 and !item.containsKey('oriFormContent'))">
when a.id=#{item.id} then #{item.oriFormContent}
</if>
</foreach>
</trim>
<trim prefix="dupFileName=(case" suffix="ELSE dupFileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupFileName')) or (colPickMode==1 and !item.containsKey('dupFileName'))">
when a.id=#{item.id} then #{item.dupFileName}
</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'))">
when a.id=#{item.id} then #{item.duplicateUrl}
</if>
</foreach>
</trim>
<trim prefix="dupFormContent=(case" suffix="ELSE dupFormContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupFormContent')) or (colPickMode==1 and !item.containsKey('dupFormContent'))">
when a.id=#{item.id} then #{item.dupFormContent}
<if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
when a.id=#{item.id} then #{item.formContent}
</if>
</foreach>
</trim>
......@@ -389,6 +357,27 @@
</choose>
</foreach>
</trim>
<trim prefix="printerName=(case" suffix="ELSE printerName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerName')) or (colPickMode==1 and !item.containsKey('printerName'))">
when a.id=#{item.id} then #{item.printerName}
</if>
</foreach>
</trim>
<trim prefix="printerIp=(case" suffix="ELSE printerIp end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerIp')) or (colPickMode==1 and !item.containsKey('printerIp'))">
when a.id=#{item.id} then #{item.printerIp}
</if>
</foreach>
</trim>
<trim prefix="paperSource=(case" suffix="ELSE paperSource end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('paperSource')) or (colPickMode==1 and !item.containsKey('paperSource'))">
when a.id=#{item.id} then #{item.paperSource}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -427,25 +416,16 @@
</if>
</foreach>
</trim>
<trim prefix="printerName=(case" suffix="ELSE printerName end),">
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerName')) or (colPickMode==1 and !item.containsKey('printerName'))">
when a.id=#{item.id} then #{item.printerName}
</if>
</foreach>
</trim>
<trim prefix="printerIp=(case" suffix="ELSE printerIp end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerIp')) or (colPickMode==1 and !item.containsKey('printerIp'))">
when a.id=#{item.id} then #{item.printerIp}
</if>
</foreach>
</trim>
<trim prefix="paperSource=(case" suffix="ELSE paperSource end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('paperSource')) or (colPickMode==1 and !item.containsKey('paperSource'))">
when a.id=#{item.id} then #{item.paperSource}
</if>
<choose>
<when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
when a.id=#{item.id} then #{item.deviceId}
</when>
<when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
......@@ -727,92 +707,47 @@
</if>
<if test="conditionParamRef.containsKey('oriFileName')">
<if test="conditionParamRef.oriFileName != null and conditionParamRef.oriFileName != ''">
${_conditionType_} a.oriFileName like #{${_conditionParam_}.oriFileName}
</if>
<if test="conditionParamRef.oriFileName == null">
${_conditionType_} a.oriFileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriFileNameList')">
${_conditionType_} a.oriFileName in
<foreach collection="conditionParamRef.oriFileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalUrl')">
<if test="conditionParamRef.originalUrl != null and conditionParamRef.originalUrl != ''">
${_conditionType_} a.originalUrl like #{${_conditionParam_}.originalUrl}
</if>
<if test="conditionParamRef.originalUrl == null">
${_conditionType_} a.originalUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalUrlList')">
${_conditionType_} a.originalUrl in
<foreach collection="conditionParamRef.originalUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriFormContent')">
<if test="conditionParamRef.oriFormContent != null and conditionParamRef.oriFormContent != ''">
${_conditionType_} a.oriFormContent like #{${_conditionParam_}.oriFormContent}
</if>
<if test="conditionParamRef.oriFormContent == null">
${_conditionType_} a.oriFormContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriFormContentList')">
${_conditionType_} a.oriFormContent in
<foreach collection="conditionParamRef.oriFormContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupFileName')">
<if test="conditionParamRef.dupFileName != null and conditionParamRef.dupFileName != ''">
${_conditionType_} a.dupFileName like #{${_conditionParam_}.dupFileName}
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.dupFileName == null">
${_conditionType_} a.dupFileName is null
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupFileNameList')">
${_conditionType_} a.dupFileName in
<foreach collection="conditionParamRef.dupFileNameList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('templateNameList')">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" 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}
<if test="conditionParamRef.containsKey('templateUrl')">
<if test="conditionParamRef.templateUrl != null and conditionParamRef.templateUrl != ''">
${_conditionType_} a.templateUrl like #{${_conditionParam_}.templateUrl}
</if>
<if test="conditionParamRef.duplicateUrl == null">
${_conditionType_} a.duplicateUrl is null
<if test="conditionParamRef.templateUrl == null">
${_conditionType_} a.templateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('duplicateUrlList')">
${_conditionType_} a.duplicateUrl in
<foreach collection="conditionParamRef.duplicateUrlList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('templateUrlList')">
${_conditionType_} a.templateUrl in
<foreach collection="conditionParamRef.templateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupFormContent')">
<if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''">
${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent}
<if test="conditionParamRef.containsKey('formContent')">
<if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
</if>
<if test="conditionParamRef.dupFormContent == null">
${_conditionType_} a.dupFormContent is null
<if test="conditionParamRef.formContent == null">
${_conditionType_} a.formContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupFormContentList')">
${_conditionType_} a.dupFormContent in
<foreach collection="conditionParamRef.dupFormContentList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('formContentList')">
${_conditionType_} a.formContent in
<foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -852,6 +787,51 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
${_conditionType_} a.printerName like #{${_conditionParam_}.printerName}
</if>
<if test="conditionParamRef.printerName == null">
${_conditionType_} a.printerName is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerNameList')">
${_conditionType_} a.printerName in
<foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIp')">
<if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''">
${_conditionType_} a.printerIp like #{${_conditionParam_}.printerIp}
</if>
<if test="conditionParamRef.printerIp == null">
${_conditionType_} a.printerIp is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerIpList')">
${_conditionType_} a.printerIp in
<foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSource')">
<if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''">
${_conditionType_} a.paperSource like #{${_conditionParam_}.paperSource}
</if>
<if test="conditionParamRef.paperSource == null">
${_conditionType_} a.paperSource is null
</if>
</if>
<if test="conditionParamRef.containsKey('paperSourceList')">
${_conditionType_} a.paperSource in
<foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
......@@ -924,51 +904,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
${_conditionType_} a.printerName like #{${_conditionParam_}.printerName}
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if>
<if test="conditionParamRef.printerName == null">
${_conditionType_} a.printerName is null
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerNameList')">
${_conditionType_} a.printerName in
<foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('deviceIdList')">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIp')">
<if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''">
${_conditionType_} a.printerIp like #{${_conditionParam_}.printerIp}
</if>
<if test="conditionParamRef.printerIp == null">
${_conditionType_} a.printerIp is null
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if>
</if>
<if test="conditionParamRef.containsKey('printerIpList')">
${_conditionType_} a.printerIp in
<foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('paperSource')">
<if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''">
${_conditionType_} a.paperSource like #{${_conditionParam_}.paperSource}
</if>
<if test="conditionParamRef.paperSource == null">
${_conditionType_} a.paperSource is null
</if>
</if>
<if test="conditionParamRef.containsKey('paperSourceList')">
${_conditionType_} a.paperSource in
<foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1027,34 +983,19 @@
<if test='orderCol.inspect != null and "DESC".equalsIgnoreCase(orderCol.inspect)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFileName')">
a.oriFileName
<if test='orderCol.oriFileName != null and "DESC".equalsIgnoreCase(orderCol.oriFileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('originalUrl')">
a.originalUrl
<if test='orderCol.originalUrl != null and "DESC".equalsIgnoreCase(orderCol.originalUrl)'>DESC</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFormContent')">
a.oriFormContent
<if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>DESC</if>
<if test="orderCol.containsKey('templateUrl')">
a.templateUrl
<if test='orderCol.templateUrl != null and "DESC".equalsIgnoreCase(orderCol.templateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupFileName')">
a.dupFileName
<if test='orderCol.dupFileName != null and "DESC".equalsIgnoreCase(orderCol.dupFileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateUrl')">
a.duplicateUrl
<if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupFormContent')">
a.dupFormContent
<if test='orderCol.dupFormContent != null and "DESC".equalsIgnoreCase(orderCol.dupFormContent)'>DESC</if>
<if test="orderCol.containsKey('formContent')">
a.formContent
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('exampleUrl')">
......@@ -1067,6 +1008,21 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerName')">
a.printerName
<if test='orderCol.printerName != null and "DESC".equalsIgnoreCase(orderCol.printerName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerIp')">
a.printerIp
<if test='orderCol.printerIp != null and "DESC".equalsIgnoreCase(orderCol.printerIp)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paperSource')">
a.paperSource
<if test='orderCol.paperSource != null and "DESC".equalsIgnoreCase(orderCol.paperSource)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......@@ -1087,19 +1043,9 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerName')">
a.printerName
<if test='orderCol.printerName != null and "DESC".equalsIgnoreCase(orderCol.printerName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerIp')">
a.printerIp
<if test='orderCol.printerIp != null and "DESC".equalsIgnoreCase(orderCol.printerIp)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paperSource')">
a.paperSource
<if test='orderCol.paperSource != null and "DESC".equalsIgnoreCase(orderCol.paperSource)'>DESC</if>
<if test="orderCol.containsKey('deviceId')">
a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
,
</if>
</trim>
......
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 4aa851e7
<?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">
<!-- 字段和属性映射 -->
<resultMap type="ApplyLogEntity" id="ApplyLogEntity-Map">
<id property="id" column="id" />
<result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="certificateCode" column="certificateCode" />
<result property="certificateName" column="certificateName" />
<result property="issueTime" column="issueTime" />
......@@ -20,15 +23,12 @@
<result property="validityStart" column="validityStart" />
<result property="validityEnd" column="validityEnd" />
<result property="privateID" column="privateID" />
<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="certificateUrl" column="certificateUrl" />
<result property="previewUrl" column="previewUrl" />
<result property="formContent" column="formContent" />
<result property="formTemplate" column="formTemplate" />
<result property="generateStatus" column="generateStatus" />
<result property="operType" column="operType" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
......@@ -43,9 +43,18 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode,
</if>
......@@ -85,33 +94,24 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('privateID') or colPickMode == 1 and data.containsKey('privateID')))">
a.privateID,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalUrl') or colPickMode == 1 and data.containsKey('originalUrl')))">
a.originalUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriPreview') or colPickMode == 1 and data.containsKey('oriPreview')))">
a.oriPreview,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormContent') or colPickMode == 1 and data.containsKey('oriFormContent')))">
a.oriFormContent,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateUrl') or colPickMode == 1 and data.containsKey('certificateUrl')))">
a.certificateUrl,
</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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('previewUrl') or colPickMode == 1 and data.containsKey('previewUrl')))">
a.previewUrl,
</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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupPreview') or colPickMode == 1 and data.containsKey('dupPreview')))">
a.dupPreview,
</if>
<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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formTemplate') or colPickMode == 1 and data.containsKey('formTemplate')))">
a.formTemplate,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('operType') or colPickMode == 1 and data.containsKey('operType')))">
a.operType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
......@@ -129,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,oriFormTemplate,duplicateUrl,dupPreview,dupFormContent,dupFormTemplate,generateStatus,createUserId,createTime,updateUserId,updateTime)
(recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{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})
(#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{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,oriFormTemplate,duplicateUrl,dupPreview,dupFormContent,dupFormTemplate,generateStatus,createUserId,createTime,updateUserId,updateTime)
(recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,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.oriFormTemplate},#{item.duplicateUrl},#{item.dupPreview},#{item.dupFormContent},#{item.dupFormTemplate},#{item.generateStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{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.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -150,12 +150,24 @@
update mortals_xhx_apply_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
<if test="(colPickMode==0 and data.containsKey('recordIdIncrement')) or (colPickMode==1 and !data.containsKey('recordIdIncrement'))">
a.recordId=ifnull(a.recordId,0) + #{data.recordIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode},
</if>
......@@ -201,29 +213,17 @@
<if test="(colPickMode==0 and data.containsKey('privateID')) or (colPickMode==1 and !data.containsKey('privateID'))">
a.privateID=#{data.privateID},
</if>
<if test="(colPickMode==0 and data.containsKey('originalUrl')) or (colPickMode==1 and !data.containsKey('originalUrl'))">
a.originalUrl=#{data.originalUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('oriPreview')) or (colPickMode==1 and !data.containsKey('oriPreview'))">
a.oriPreview=#{data.oriPreview},
<if test="(colPickMode==0 and data.containsKey('certificateUrl')) or (colPickMode==1 and !data.containsKey('certificateUrl'))">
a.certificateUrl=#{data.certificateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFormContent')) or (colPickMode==1 and !data.containsKey('oriFormContent'))">
a.oriFormContent=#{data.oriFormContent},
<if test="(colPickMode==0 and data.containsKey('previewUrl')) or (colPickMode==1 and !data.containsKey('previewUrl'))">
a.previewUrl=#{data.previewUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFormTemplate')) or (colPickMode==1 and !data.containsKey('oriFormTemplate'))">
a.oriFormTemplate=#{data.oriFormTemplate},
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))">
a.duplicateUrl=#{data.duplicateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('dupPreview')) or (colPickMode==1 and !data.containsKey('dupPreview'))">
a.dupPreview=#{data.dupPreview},
</if>
<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 test="(colPickMode==0 and data.containsKey('formTemplate')) or (colPickMode==1 and !data.containsKey('formTemplate'))">
a.formTemplate=#{data.formTemplate},
</if>
<if test="(colPickMode==0 and data.containsKey('generateStatus')) or (colPickMode==1 and !data.containsKey('generateStatus'))">
a.generateStatus=#{data.generateStatus},
......@@ -231,6 +231,12 @@
<if test="(colPickMode==0 and data.containsKey('generateStatusIncrement')) or (colPickMode==1 and !data.containsKey('generateStatusIncrement'))">
a.generateStatus=ifnull(a.generateStatus,0) + #{data.generateStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('operType')) or (colPickMode==1 and !data.containsKey('operType'))">
a.operType=#{data.operType},
</if>
<if test="(colPickMode==0 and data.containsKey('operTypeIncrement')) or (colPickMode==1 and !data.containsKey('operTypeIncrement'))">
a.operType=ifnull(a.operType,0) + #{data.operTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
......@@ -261,6 +267,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_apply_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
when a.id=#{item.id} then #{item.recordId}
</when>
<when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -273,6 +291,20 @@
</choose>
</foreach>
</trim>
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
when a.id=#{item.id} then #{item.catalogCode}
</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 prefix="certificateCode=(case" suffix="ELSE certificateCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateCode')) or (colPickMode==1 and !item.containsKey('certificateCode'))">
......@@ -374,59 +406,31 @@
</if>
</foreach>
</trim>
<trim prefix="originalUrl=(case" suffix="ELSE originalUrl end),">
<trim prefix="certificateUrl=(case" suffix="ELSE certificateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('originalUrl')) or (colPickMode==1 and !item.containsKey('originalUrl'))">
when a.id=#{item.id} then #{item.originalUrl}
<if test="(colPickMode==0 and item.containsKey('certificateUrl')) or (colPickMode==1 and !item.containsKey('certificateUrl'))">
when a.id=#{item.id} then #{item.certificateUrl}
</if>
</foreach>
</trim>
<trim prefix="oriPreview=(case" suffix="ELSE oriPreview end),">
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriPreview')) or (colPickMode==1 and !item.containsKey('oriPreview'))">
when a.id=#{item.id} then #{item.oriPreview}
<if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
when a.id=#{item.id} then #{item.previewUrl}
</if>
</foreach>
</trim>
<trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent end),">
<trim prefix="formContent=(case" suffix="ELSE formContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriFormContent')) or (colPickMode==1 and !item.containsKey('oriFormContent'))">
when a.id=#{item.id} then #{item.oriFormContent}
<if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
when a.id=#{item.id} then #{item.formContent}
</if>
</foreach>
</trim>
<trim prefix="oriFormTemplate=(case" suffix="ELSE oriFormTemplate end),">
<trim prefix="formTemplate=(case" suffix="ELSE formTemplate 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'))">
when a.id=#{item.id} then #{item.duplicateUrl}
</if>
</foreach>
</trim>
<trim prefix="dupPreview=(case" suffix="ELSE dupPreview end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupPreview')) or (colPickMode==1 and !item.containsKey('dupPreview'))">
when a.id=#{item.id} then #{item.dupPreview}
</if>
</foreach>
</trim>
<trim prefix="dupFormContent=(case" suffix="ELSE dupFormContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupFormContent')) or (colPickMode==1 and !item.containsKey('dupFormContent'))">
when a.id=#{item.id} then #{item.dupFormContent}
</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 test="(colPickMode==0 and item.containsKey('formTemplate')) or (colPickMode==1 and !item.containsKey('formTemplate'))">
when a.id=#{item.id} then #{item.formTemplate}
</if>
</foreach>
</trim>
......@@ -442,6 +446,18 @@
</choose>
</foreach>
</trim>
<trim prefix="operType=(case" suffix="ELSE operType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('operType')) or (colPickMode==1 and !item.containsKey('operType'))">
when a.id=#{item.id} then #{item.operType}
</when>
<when test="(colPickMode==0 and item.containsKey('operTypeIncrement')) or (colPickMode==1 and !item.containsKey('operTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.operType,0) + #{item.operTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -602,6 +618,27 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
</if>
<if test="conditionParamRef.recordId == null">
${_conditionType_} a.recordId is null
</if>
</if>
<if test="conditionParamRef.containsKey('recordIdList')">
${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if>
<if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
......@@ -624,6 +661,36 @@
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
${_conditionType_} a.catalogCode like #{${_conditionParam_}.catalogCode}
</if>
<if test="conditionParamRef.catalogCode == null">
${_conditionType_} a.catalogCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogCodeList')">
${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" 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')">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateCode')">
<if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''">
${_conditionType_} a.certificateCode like #{${_conditionParam_}.certificateCode}
......@@ -831,122 +898,62 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalUrl')">
<if test="conditionParamRef.originalUrl != null and conditionParamRef.originalUrl != ''">
${_conditionType_} a.originalUrl like #{${_conditionParam_}.originalUrl}
</if>
<if test="conditionParamRef.originalUrl == null">
${_conditionType_} a.originalUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalUrlList')">
${_conditionType_} a.originalUrl in
<foreach collection="conditionParamRef.originalUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriPreview')">
<if test="conditionParamRef.oriPreview != null and conditionParamRef.oriPreview != ''">
${_conditionType_} a.oriPreview like #{${_conditionParam_}.oriPreview}
</if>
<if test="conditionParamRef.oriPreview == null">
${_conditionType_} a.oriPreview is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriPreviewList')">
${_conditionType_} a.oriPreview in
<foreach collection="conditionParamRef.oriPreviewList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriFormContent')">
<if test="conditionParamRef.oriFormContent != null and conditionParamRef.oriFormContent != ''">
${_conditionType_} a.oriFormContent like #{${_conditionParam_}.oriFormContent}
</if>
<if test="conditionParamRef.oriFormContent == null">
${_conditionType_} a.oriFormContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriFormContentList')">
${_conditionType_} a.oriFormContent in
<foreach collection="conditionParamRef.oriFormContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriFormTemplate')">
<if test="conditionParamRef.oriFormTemplate != null and conditionParamRef.oriFormTemplate != ''">
${_conditionType_} a.oriFormTemplate like #{${_conditionParam_}.oriFormTemplate}
<if test="conditionParamRef.containsKey('certificateUrl')">
<if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''">
${_conditionType_} a.certificateUrl like #{${_conditionParam_}.certificateUrl}
</if>
<if test="conditionParamRef.oriFormTemplate == null">
${_conditionType_} a.oriFormTemplate is null
<if test="conditionParamRef.certificateUrl == null">
${_conditionType_} a.certificateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriFormTemplateList')">
${_conditionType_} a.oriFormTemplate in
<foreach collection="conditionParamRef.oriFormTemplateList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('certificateUrlList')">
${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" 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}
<if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
${_conditionType_} a.previewUrl like #{${_conditionParam_}.previewUrl}
</if>
<if test="conditionParamRef.duplicateUrl == null">
${_conditionType_} a.duplicateUrl is null
<if test="conditionParamRef.previewUrl == null">
${_conditionType_} a.previewUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('duplicateUrlList')">
${_conditionType_} a.duplicateUrl in
<foreach collection="conditionParamRef.duplicateUrlList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('previewUrlList')">
${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupPreview')">
<if test="conditionParamRef.dupPreview != null and conditionParamRef.dupPreview != ''">
${_conditionType_} a.dupPreview like #{${_conditionParam_}.dupPreview}
<if test="conditionParamRef.containsKey('formContent')">
<if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
</if>
<if test="conditionParamRef.dupPreview == null">
${_conditionType_} a.dupPreview is null
<if test="conditionParamRef.formContent == null">
${_conditionType_} a.formContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupPreviewList')">
${_conditionType_} a.dupPreview in
<foreach collection="conditionParamRef.dupPreviewList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('formContentList')">
${_conditionType_} a.formContent in
<foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupFormContent')">
<if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''">
${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent}
<if test="conditionParamRef.containsKey('formTemplate')">
<if test="conditionParamRef.formTemplate != null and conditionParamRef.formTemplate != ''">
${_conditionType_} a.formTemplate like #{${_conditionParam_}.formTemplate}
</if>
<if test="conditionParamRef.dupFormContent == null">
${_conditionType_} a.dupFormContent is null
<if test="conditionParamRef.formTemplate == null">
${_conditionType_} a.formTemplate is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupFormContentList')">
${_conditionType_} a.dupFormContent in
<foreach collection="conditionParamRef.dupFormContentList" open="(" close=")" index="index" item="item" separator=",">
#{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=",">
<if test="conditionParamRef.containsKey('formTemplateList')">
${_conditionType_} a.formTemplate in
<foreach collection="conditionParamRef.formTemplateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -971,6 +978,27 @@
${_conditionType_} a.generateStatus <![CDATA[ <= ]]> #{${_conditionParam_}.generateStatusEnd}
</if>
<if test="conditionParamRef.containsKey('operType')">
<if test="conditionParamRef.operType != null ">
${_conditionType_} a.operType = #{${_conditionParam_}.operType}
</if>
<if test="conditionParamRef.operType == null">
${_conditionType_} a.operType is null
</if>
</if>
<if test="conditionParamRef.containsKey('operTypeList')">
${_conditionType_} a.operType in
<foreach collection="conditionParamRef.operTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operTypeStart') and conditionParamRef.operTypeStart != null">
${_conditionType_} a.operType <![CDATA[ >= ]]> #{${_conditionParam_}.operTypeStart}
</if>
<if test="conditionParamRef.containsKey('operTypeEnd') and conditionParamRef.operTypeEnd != null">
${_conditionType_} a.operType <![CDATA[ <= ]]> #{${_conditionParam_}.operTypeEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
......@@ -1061,11 +1089,26 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateCode')">
a.certificateCode
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
......@@ -1131,44 +1174,24 @@
<if test='orderCol.privateID != null and "DESC".equalsIgnoreCase(orderCol.privateID)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('originalUrl')">
a.originalUrl
<if test='orderCol.originalUrl != null and "DESC".equalsIgnoreCase(orderCol.originalUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriPreview')">
a.oriPreview
<if test='orderCol.oriPreview != null and "DESC".equalsIgnoreCase(orderCol.oriPreview)'>DESC</if>
<if test="orderCol.containsKey('certificateUrl')">
a.certificateUrl
<if test='orderCol.certificateUrl != null and "DESC".equalsIgnoreCase(orderCol.certificateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFormContent')">
a.oriFormContent
<if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>DESC</if>
<if test="orderCol.containsKey('previewUrl')">
a.previewUrl
<if test='orderCol.previewUrl != null and "DESC".equalsIgnoreCase(orderCol.previewUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFormTemplate')">
a.oriFormTemplate
<if test='orderCol.oriFormTemplate != null and "DESC".equalsIgnoreCase(orderCol.oriFormTemplate)'>DESC</if>
<if test="orderCol.containsKey('formContent')">
a.formContent
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateUrl')">
a.duplicateUrl
<if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupPreview')">
a.dupPreview
<if test='orderCol.dupPreview != null and "DESC".equalsIgnoreCase(orderCol.dupPreview)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupFormContent')">
a.dupFormContent
<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 test="orderCol.containsKey('formTemplate')">
a.formTemplate
<if test='orderCol.formTemplate != null and "DESC".equalsIgnoreCase(orderCol.formTemplate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('generateStatus')">
......@@ -1176,6 +1199,11 @@
<if test='orderCol.generateStatus != null and "DESC".equalsIgnoreCase(orderCol.generateStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('operType')">
a.operType
<if test='orderCol.operType != null and "DESC".equalsIgnoreCase(orderCol.operType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 4aa851e7
<?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.PrintLogDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="PrintLogEntity" id="PrintLogEntity-Map">
<id property="id" column="id" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
......@@ -14,17 +16,14 @@
<result property="holderIDCardNo" column="holderIDCardNo" />
<result property="pickerName" column="pickerName" />
<result property="pickerIDCardNo" column="pickerIDCardNo" />
<result property="originalCount" column="originalCount" />
<result property="duplicateCount" column="duplicateCount" />
<result property="printStatus" column="printStatus" />
<result property="printDate" column="printDate" />
<result property="statusRemark" column="statusRemark" />
<result property="deviceId" column="deviceId" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
<result property="statusRemark" column="statusRemark" />
</resultMap>
......@@ -35,9 +34,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
......@@ -59,18 +64,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerIDCardNo') or colPickMode == 1 and data.containsKey('pickerIDCardNo')))">
a.pickerIDCardNo,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalCount') or colPickMode == 1 and data.containsKey('originalCount')))">
a.originalCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duplicateCount') or colPickMode == 1 and data.containsKey('duplicateCount')))">
a.duplicateCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printStatus') or colPickMode == 1 and data.containsKey('printStatus')))">
a.printStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printDate') or colPickMode == 1 and data.containsKey('printDate')))">
a.printDate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('statusRemark') or colPickMode == 1 and data.containsKey('statusRemark')))">
a.statusRemark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
......@@ -86,29 +88,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('statusRemark') or colPickMode == 1 and data.containsKey('statusRemark')))">
a.statusRemark,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark)
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId},#{statusRemark})
(#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark)
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId},#{item.statusRemark})
(#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.printStatus},#{item.printDate},#{item.statusRemark},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -118,9 +114,18 @@
update mortals_xhx_print_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
......@@ -142,18 +147,6 @@
<if test="(colPickMode==0 and data.containsKey('pickerIDCardNo')) or (colPickMode==1 and !data.containsKey('pickerIDCardNo'))">
a.pickerIDCardNo=#{data.pickerIDCardNo},
</if>
<if test="(colPickMode==0 and data.containsKey('originalCount')) or (colPickMode==1 and !data.containsKey('originalCount'))">
a.originalCount=#{data.originalCount},
</if>
<if test="(colPickMode==0 and data.containsKey('originalCountIncrement')) or (colPickMode==1 and !data.containsKey('originalCountIncrement'))">
a.originalCount=ifnull(a.originalCount,0) + #{data.originalCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateCount')) or (colPickMode==1 and !data.containsKey('duplicateCount'))">
a.duplicateCount=#{data.duplicateCount},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateCountIncrement')) or (colPickMode==1 and !data.containsKey('duplicateCountIncrement'))">
a.duplicateCount=ifnull(a.duplicateCount,0) + #{data.duplicateCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('printStatus')) or (colPickMode==1 and !data.containsKey('printStatus'))">
a.printStatus=#{data.printStatus},
</if>
......@@ -163,6 +156,9 @@
<if test="(colPickMode==0 and data.containsKey('printDate')) or (colPickMode==1 and !data.containsKey('printDate'))">
a.printDate=#{data.printDate},
</if>
<if test="(colPickMode==0 and data.containsKey('statusRemark')) or (colPickMode==1 and !data.containsKey('statusRemark'))">
a.statusRemark=#{data.statusRemark},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.deviceId=#{data.deviceId},
</if>
......@@ -187,15 +183,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('statusRemark')) or (colPickMode==1 and !data.containsKey('statusRemark'))">
a.statusRemark=#{data.statusRemark},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -208,6 +195,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
......@@ -215,6 +214,13 @@
</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 prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))">
......@@ -264,30 +270,6 @@
</if>
</foreach>
</trim>
<trim prefix="originalCount=(case" suffix="ELSE originalCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('originalCount')) or (colPickMode==1 and !item.containsKey('originalCount'))">
when a.id=#{item.id} then #{item.originalCount}
</when>
<when test="(colPickMode==0 and item.containsKey('originalCountIncrement')) or (colPickMode==1 and !item.containsKey('originalCountIncrement'))">
when a.id=#{item.id} then ifnull(a.originalCount,0) + #{item.originalCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="duplicateCount=(case" suffix="ELSE duplicateCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('duplicateCount')) or (colPickMode==1 and !item.containsKey('duplicateCount'))">
when a.id=#{item.id} then #{item.duplicateCount}
</when>
<when test="(colPickMode==0 and item.containsKey('duplicateCountIncrement')) or (colPickMode==1 and !item.containsKey('duplicateCountIncrement'))">
when a.id=#{item.id} then ifnull(a.duplicateCount,0) + #{item.duplicateCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="printStatus=(case" suffix="ELSE printStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -306,6 +288,13 @@
when a.id=#{item.id} then #{item.printDate}
</if>
</foreach>
</trim>
<trim prefix="statusRemark=(case" suffix="ELSE statusRemark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('statusRemark')) or (colPickMode==1 and !item.containsKey('statusRemark'))">
when a.id=#{item.id} then #{item.statusRemark}
</if>
</foreach>
</trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -357,25 +346,6 @@
</if>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="statusRemark=(case" suffix="ELSE statusRemark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('statusRemark')) or (colPickMode==1 and !item.containsKey('statusRemark'))">
when a.id=#{item.id} then #{item.statusRemark}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -498,6 +468,27 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
......@@ -514,6 +505,21 @@
</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')">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName}
......@@ -618,48 +624,6 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalCount')">
<if test="conditionParamRef.originalCount != null ">
${_conditionType_} a.originalCount = #{${_conditionParam_}.originalCount}
</if>
<if test="conditionParamRef.originalCount == null">
${_conditionType_} a.originalCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalCountList')">
${_conditionType_} a.originalCount in
<foreach collection="conditionParamRef.originalCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalCountStart') and conditionParamRef.originalCountStart != null">
${_conditionType_} a.originalCount <![CDATA[ >= ]]> #{${_conditionParam_}.originalCountStart}
</if>
<if test="conditionParamRef.containsKey('originalCountEnd') and conditionParamRef.originalCountEnd != null">
${_conditionType_} a.originalCount <![CDATA[ <= ]]> #{${_conditionParam_}.originalCountEnd}
</if>
<if test="conditionParamRef.containsKey('duplicateCount')">
<if test="conditionParamRef.duplicateCount != null ">
${_conditionType_} a.duplicateCount = #{${_conditionParam_}.duplicateCount}
</if>
<if test="conditionParamRef.duplicateCount == null">
${_conditionType_} a.duplicateCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('duplicateCountList')">
${_conditionType_} a.duplicateCount in
<foreach collection="conditionParamRef.duplicateCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('duplicateCountStart') and conditionParamRef.duplicateCountStart != null">
${_conditionType_} a.duplicateCount <![CDATA[ >= ]]> #{${_conditionParam_}.duplicateCountStart}
</if>
<if test="conditionParamRef.containsKey('duplicateCountEnd') and conditionParamRef.duplicateCountEnd != null">
${_conditionType_} a.duplicateCount <![CDATA[ <= ]]> #{${_conditionParam_}.duplicateCountEnd}
</if>
<if test="conditionParamRef.containsKey('printStatus')">
<if test="conditionParamRef.printStatus != null ">
${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus}
......@@ -696,6 +660,21 @@
<if test="conditionParamRef.containsKey('printDateEnd') and conditionParamRef.printDateEnd != null and conditionParamRef.printDateEnd!=''">
${_conditionType_} a.printDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.printDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('statusRemark')">
<if test="conditionParamRef.statusRemark != null and conditionParamRef.statusRemark != ''">
${_conditionType_} a.statusRemark like #{${_conditionParam_}.statusRemark}
</if>
<if test="conditionParamRef.statusRemark == null">
${_conditionType_} a.statusRemark is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusRemarkList')">
${_conditionType_} a.statusRemark in
<foreach collection="conditionParamRef.statusRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
......@@ -789,42 +768,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('statusRemark')">
<if test="conditionParamRef.statusRemark != null and conditionParamRef.statusRemark != ''">
${_conditionType_} a.statusRemark like #{${_conditionParam_}.statusRemark}
</if>
<if test="conditionParamRef.statusRemark == null">
${_conditionType_} a.statusRemark is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusRemarkList')">
${_conditionType_} a.statusRemark in
<foreach collection="conditionParamRef.statusRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -843,11 +786,21 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
......@@ -883,16 +836,6 @@
<if test='orderCol.pickerIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.pickerIDCardNo)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('originalCount')">
a.originalCount
<if test='orderCol.originalCount != null and "DESC".equalsIgnoreCase(orderCol.originalCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateCount')">
a.duplicateCount
<if test='orderCol.duplicateCount != null and "DESC".equalsIgnoreCase(orderCol.duplicateCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printStatus')">
a.printStatus
<if test='orderCol.printStatus != null and "DESC".equalsIgnoreCase(orderCol.printStatus)'>DESC</if>
......@@ -903,6 +846,11 @@
<if test='orderCol.printDate != null and "DESC".equalsIgnoreCase(orderCol.printDate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('statusRemark')">
a.statusRemark
<if test='orderCol.statusRemark != null and "DESC".equalsIgnoreCase(orderCol.statusRemark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceId')">
a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
......@@ -928,16 +876,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('statusRemark')">
a.statusRemark
<if test='orderCol.statusRemark != null and "DESC".equalsIgnoreCase(orderCol.statusRemark)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml
View file @ 4aa851e7
......@@ -6,8 +6,11 @@
<!-- 字段和属性映射 -->
<resultMap type="PrintWaitQueueEntity" id="PrintWaitQueueEntity-Map">
<id property="id" column="id" />
<result property="recordId" column="recordId" />
<result property="applyId" column="applyId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
......@@ -15,15 +18,14 @@
<result property="holderIDCardNo" column="holderIDCardNo" />
<result property="pickerName" column="pickerName" />
<result property="pickerIDCardNo" column="pickerIDCardNo" />
<result property="certificateType" column="certificateType" />
<result property="previewUrl" column="previewUrl" />
<result property="certificateUrl" column="certificateUrl" />
<result property="printStatus" column="printStatus" />
<result property="total" column="total" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
</resultMap>
......@@ -34,12 +36,21 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyId') or colPickMode == 1 and data.containsKey('applyId')))">
a.applyId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
......@@ -61,9 +72,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerIDCardNo') or colPickMode == 1 and data.containsKey('pickerIDCardNo')))">
a.pickerIDCardNo,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateType') or colPickMode == 1 and data.containsKey('certificateType')))">
a.certificateType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('previewUrl') or colPickMode == 1 and data.containsKey('previewUrl')))">
a.previewUrl,
</if>
......@@ -73,6 +81,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printStatus') or colPickMode == 1 and data.containsKey('printStatus')))">
a.printStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
a.total,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
......@@ -85,26 +96,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_wait_queue
(applyId,catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,certificateType,previewUrl,certificateUrl,printStatus,createUserId,createTime,updateUserId,updateTime,catalogId)
(recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{applyId},#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{certificateType},#{previewUrl},#{certificateUrl},#{printStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
(#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_wait_queue
(applyId,catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,certificateType,previewUrl,certificateUrl,printStatus,createUserId,createTime,updateUserId,updateTime,catalogId)
(recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.applyId},#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.certificateType},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
(#{item.recordId},#{item.applyId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.total},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -114,15 +122,30 @@
update mortals_xhx_print_wait_queue as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
<if test="(colPickMode==0 and data.containsKey('recordIdIncrement')) or (colPickMode==1 and !data.containsKey('recordIdIncrement'))">
a.recordId=ifnull(a.recordId,0) + #{data.recordIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('applyId')) or (colPickMode==1 and !data.containsKey('applyId'))">
a.applyId=#{data.applyId},
</if>
<if test="(colPickMode==0 and data.containsKey('applyIdIncrement')) or (colPickMode==1 and !data.containsKey('applyIdIncrement'))">
a.applyId=ifnull(a.applyId,0) + #{data.applyIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
......@@ -144,12 +167,6 @@
<if test="(colPickMode==0 and data.containsKey('pickerIDCardNo')) or (colPickMode==1 and !data.containsKey('pickerIDCardNo'))">
a.pickerIDCardNo=#{data.pickerIDCardNo},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateType')) or (colPickMode==1 and !data.containsKey('certificateType'))">
a.certificateType=#{data.certificateType},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateTypeIncrement')) or (colPickMode==1 and !data.containsKey('certificateTypeIncrement'))">
a.certificateType=ifnull(a.certificateType,0) + #{data.certificateTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('previewUrl')) or (colPickMode==1 and !data.containsKey('previewUrl'))">
a.previewUrl=#{data.previewUrl},
</if>
......@@ -162,6 +179,12 @@
<if test="(colPickMode==0 and data.containsKey('printStatusIncrement')) or (colPickMode==1 and !data.containsKey('printStatusIncrement'))">
a.printStatus=ifnull(a.printStatus,0) + #{data.printStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('total')) or (colPickMode==1 and !data.containsKey('total'))">
a.total=#{data.total},
</if>
<if test="(colPickMode==0 and data.containsKey('totalIncrement')) or (colPickMode==1 and !data.containsKey('totalIncrement'))">
a.total=ifnull(a.total,0) + #{data.totalIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
......@@ -180,12 +203,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -198,6 +215,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_wait_queue as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
when a.id=#{item.id} then #{item.recordId}
</when>
<when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="applyId=(case" suffix="ELSE applyId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -210,6 +239,18 @@
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
......@@ -217,6 +258,13 @@
</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 prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))">
......@@ -266,18 +314,6 @@
</if>
</foreach>
</trim>
<trim prefix="certificateType=(case" suffix="ELSE certificateType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('certificateType')) or (colPickMode==1 and !item.containsKey('certificateType'))">
when a.id=#{item.id} then #{item.certificateType}
</when>
<when test="(colPickMode==0 and item.containsKey('certificateTypeIncrement')) or (colPickMode==1 and !item.containsKey('certificateTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.certificateType,0) + #{item.certificateTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
......@@ -304,6 +340,18 @@
</choose>
</foreach>
</trim>
<trim prefix="total=(case" suffix="ELSE total end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
when a.id=#{item.id} then #{item.total}
</when>
<when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -342,18 +390,6 @@
</if>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -476,6 +512,27 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
</if>
<if test="conditionParamRef.recordId == null">
${_conditionType_} a.recordId is null
</if>
</if>
<if test="conditionParamRef.containsKey('recordIdList')">
${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if>
<if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
</if>
<if test="conditionParamRef.containsKey('applyId')">
<if test="conditionParamRef.applyId != null ">
${_conditionType_} a.applyId = #{${_conditionParam_}.applyId}
......@@ -497,6 +554,27 @@
${_conditionType_} a.applyId <![CDATA[ <= ]]> #{${_conditionParam_}.applyIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
......@@ -513,6 +591,21 @@
</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')">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName}
......@@ -617,27 +710,6 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateType')">
<if test="conditionParamRef.certificateType != null ">
${_conditionType_} a.certificateType = #{${_conditionParam_}.certificateType}
</if>
<if test="conditionParamRef.certificateType == null">
${_conditionType_} a.certificateType is null
</if>
</if>
<if test="conditionParamRef.containsKey('certificateTypeList')">
${_conditionType_} a.certificateType in
<foreach collection="conditionParamRef.certificateTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateTypeStart') and conditionParamRef.certificateTypeStart != null">
${_conditionType_} a.certificateType <![CDATA[ >= ]]> #{${_conditionParam_}.certificateTypeStart}
</if>
<if test="conditionParamRef.containsKey('certificateTypeEnd') and conditionParamRef.certificateTypeEnd != null">
${_conditionType_} a.certificateType <![CDATA[ <= ]]> #{${_conditionParam_}.certificateTypeEnd}
</if>
<if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
......@@ -689,6 +761,27 @@
${_conditionType_} a.printStatus <![CDATA[ <= ]]> #{${_conditionParam_}.printStatusEnd}
</if>
<if test="conditionParamRef.containsKey('total')">
<if test="conditionParamRef.total != null ">
${_conditionType_} a.total = #{${_conditionParam_}.total}
</if>
<if test="conditionParamRef.total == null">
${_conditionType_} a.total is null
</if>
</if>
<if test="conditionParamRef.containsKey('totalList')">
${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if>
<if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
......@@ -761,27 +854,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -800,16 +872,31 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyId')">
a.applyId
<if test='orderCol.applyId != null and "DESC".equalsIgnoreCase(orderCol.applyId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
......@@ -845,11 +932,6 @@
<if test='orderCol.pickerIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.pickerIDCardNo)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateType')">
a.certificateType
<if test='orderCol.certificateType != null and "DESC".equalsIgnoreCase(orderCol.certificateType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('previewUrl')">
a.previewUrl
<if test='orderCol.previewUrl != null and "DESC".equalsIgnoreCase(orderCol.previewUrl)'>DESC</if>
......@@ -865,6 +947,11 @@
<if test='orderCol.printStatus != null and "DESC".equalsIgnoreCase(orderCol.printStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('total')">
a.total
<if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......@@ -885,11 +972,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/RecordMapper.xml 0 → 100644
View file @ 4aa851e7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RecordDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="RecordEntity" id="RecordEntity-Map">
<id property="id" column="id" />
<result property="catalogId" column="catalogId" />
<result property="catalogName" column="catalogName" />
<result property="catalogCode" column="catalogCode" />
<result property="recordStatus" column="recordStatus" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordStatus') or colPickMode == 1 and data.containsKey('recordStatus')))">
a.recordStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_record
(catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogId},#{catalogName},#{catalogCode},#{recordStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_record
(catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.catalogName},#{item.catalogCode},#{item.recordStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_record as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('recordStatus')) or (colPickMode==1 and !data.containsKey('recordStatus'))">
a.recordStatus=#{data.recordStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('recordStatusIncrement')) or (colPickMode==1 and !data.containsKey('recordStatusIncrement'))">
a.recordStatus=ifnull(a.recordStatus,0) + #{data.recordStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_record as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="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 prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
when a.id=#{item.id} then #{item.catalogCode}
</if>
</foreach>
</trim>
<trim prefix="recordStatus=(case" suffix="ELSE recordStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('recordStatus')) or (colPickMode==1 and !item.containsKey('recordStatus'))">
when a.id=#{item.id} then #{item.recordStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('recordStatusIncrement')) or (colPickMode==1 and !item.containsKey('recordStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.recordStatus,0) + #{item.recordStatusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="RecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_record as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_record as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_record where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="RecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('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')">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
${_conditionType_} a.catalogCode like #{${_conditionParam_}.catalogCode}
</if>
<if test="conditionParamRef.catalogCode == null">
${_conditionType_} a.catalogCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogCodeList')">
${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordStatus')">
<if test="conditionParamRef.recordStatus != null ">
${_conditionType_} a.recordStatus = #{${_conditionParam_}.recordStatus}
</if>
<if test="conditionParamRef.recordStatus == null">
${_conditionType_} a.recordStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('recordStatusList')">
${_conditionType_} a.recordStatus in
<foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null">
${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart}
</if>
<if test="conditionParamRef.containsKey('recordStatusEnd') and conditionParamRef.recordStatusEnd != null">
${_conditionType_} a.recordStatus <![CDATA[ <= ]]> #{${_conditionParam_}.recordStatusEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordStatus')">
a.recordStatus
<if test='orderCol.recordStatus != null and "DESC".equalsIgnoreCase(orderCol.recordStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 4aa851e7
......@@ -6,22 +6,22 @@
<!-- 字段和属性映射 -->
<resultMap type="RetainLogEntity" id="RetainLogEntity-Map">
<id property="id" column="id" />
<result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
<result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" />
<result property="certificateStatus" column="certificateStatus" />
<result property="originalCount" column="originalCount" />
<result property="duplicateCount" column="duplicateCount" />
<result property="originalUrl" column="originalUrl" />
<result property="duplicateUrl" column="duplicateUrl" />
<result property="certificateUrl" column="certificateUrl" />
<result property="previewUrl" column="previewUrl" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
</resultMap>
......@@ -32,9 +32,18 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
......@@ -53,17 +62,11 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateStatus') or colPickMode == 1 and data.containsKey('certificateStatus')))">
a.certificateStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalCount') or colPickMode == 1 and data.containsKey('originalCount')))">
a.originalCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duplicateCount') or colPickMode == 1 and data.containsKey('duplicateCount')))">
a.duplicateCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalUrl') or colPickMode == 1 and data.containsKey('originalUrl')))">
a.originalUrl,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateUrl') or colPickMode == 1 and data.containsKey('certificateUrl')))">
a.certificateUrl,
</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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('previewUrl') or colPickMode == 1 and data.containsKey('previewUrl')))">
a.previewUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
......@@ -77,26 +80,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_retain_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
(recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{originalCount},#{duplicateCount},#{originalUrl},#{duplicateUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
(#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
(recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.originalCount},#{item.duplicateCount},#{item.originalUrl},#{item.duplicateUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
(#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -106,9 +106,24 @@
update mortals_xhx_retain_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
<if test="(colPickMode==0 and data.containsKey('recordIdIncrement')) or (colPickMode==1 and !data.containsKey('recordIdIncrement'))">
a.recordId=ifnull(a.recordId,0) + #{data.recordIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
......@@ -130,23 +145,11 @@
<if test="(colPickMode==0 and data.containsKey('certificateStatusIncrement')) or (colPickMode==1 and !data.containsKey('certificateStatusIncrement'))">
a.certificateStatus=ifnull(a.certificateStatus,0) + #{data.certificateStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('originalCount')) or (colPickMode==1 and !data.containsKey('originalCount'))">
a.originalCount=#{data.originalCount},
</if>
<if test="(colPickMode==0 and data.containsKey('originalCountIncrement')) or (colPickMode==1 and !data.containsKey('originalCountIncrement'))">
a.originalCount=ifnull(a.originalCount,0) + #{data.originalCountIncrement},
<if test="(colPickMode==0 and data.containsKey('certificateUrl')) or (colPickMode==1 and !data.containsKey('certificateUrl'))">
a.certificateUrl=#{data.certificateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateCount')) or (colPickMode==1 and !data.containsKey('duplicateCount'))">
a.duplicateCount=#{data.duplicateCount},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateCountIncrement')) or (colPickMode==1 and !data.containsKey('duplicateCountIncrement'))">
a.duplicateCount=ifnull(a.duplicateCount,0) + #{data.duplicateCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('originalUrl')) or (colPickMode==1 and !data.containsKey('originalUrl'))">
a.originalUrl=#{data.originalUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))">
a.duplicateUrl=#{data.duplicateUrl},
<if test="(colPickMode==0 and data.containsKey('previewUrl')) or (colPickMode==1 and !data.containsKey('previewUrl'))">
a.previewUrl=#{data.previewUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
......@@ -166,12 +169,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -184,6 +181,30 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_retain_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
when a.id=#{item.id} then #{item.recordId}
</when>
<when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
......@@ -191,6 +212,13 @@
</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 prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))">
......@@ -238,41 +266,17 @@
</choose>
</foreach>
</trim>
<trim prefix="originalCount=(case" suffix="ELSE originalCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('originalCount')) or (colPickMode==1 and !item.containsKey('originalCount'))">
when a.id=#{item.id} then #{item.originalCount}
</when>
<when test="(colPickMode==0 and item.containsKey('originalCountIncrement')) or (colPickMode==1 and !item.containsKey('originalCountIncrement'))">
when a.id=#{item.id} then ifnull(a.originalCount,0) + #{item.originalCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="duplicateCount=(case" suffix="ELSE duplicateCount end),">
<trim prefix="certificateUrl=(case" suffix="ELSE certificateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('duplicateCount')) or (colPickMode==1 and !item.containsKey('duplicateCount'))">
when a.id=#{item.id} then #{item.duplicateCount}
</when>
<when test="(colPickMode==0 and item.containsKey('duplicateCountIncrement')) or (colPickMode==1 and !item.containsKey('duplicateCountIncrement'))">
when a.id=#{item.id} then ifnull(a.duplicateCount,0) + #{item.duplicateCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="originalUrl=(case" suffix="ELSE originalUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('originalUrl')) or (colPickMode==1 and !item.containsKey('originalUrl'))">
when a.id=#{item.id} then #{item.originalUrl}
<if test="(colPickMode==0 and item.containsKey('certificateUrl')) or (colPickMode==1 and !item.containsKey('certificateUrl'))">
when a.id=#{item.id} then #{item.certificateUrl}
</if>
</foreach>
</trim>
<trim prefix="duplicateUrl=(case" suffix="ELSE duplicateUrl end),">
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl 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'))">
when a.id=#{item.id} then #{item.duplicateUrl}
<if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
when a.id=#{item.id} then #{item.previewUrl}
</if>
</foreach>
</trim>
......@@ -314,18 +318,6 @@
</if>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -448,6 +440,48 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
</if>
<if test="conditionParamRef.recordId == null">
${_conditionType_} a.recordId is null
</if>
</if>
<if test="conditionParamRef.containsKey('recordIdList')">
${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if>
<if test="conditionParamRef.containsKey('recordIdEnd') and conditionParamRef.recordIdEnd != null">
${_conditionType_} a.recordId <![CDATA[ <= ]]> #{${_conditionParam_}.recordIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
......@@ -464,6 +498,21 @@
</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')">
${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName}
......@@ -559,75 +608,33 @@
${_conditionType_} a.certificateStatus <![CDATA[ <= ]]> #{${_conditionParam_}.certificateStatusEnd}
</if>
<if test="conditionParamRef.containsKey('originalCount')">
<if test="conditionParamRef.originalCount != null ">
${_conditionType_} a.originalCount = #{${_conditionParam_}.originalCount}
</if>
<if test="conditionParamRef.originalCount == null">
${_conditionType_} a.originalCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalCountList')">
${_conditionType_} a.originalCount in
<foreach collection="conditionParamRef.originalCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originalCountStart') and conditionParamRef.originalCountStart != null">
${_conditionType_} a.originalCount <![CDATA[ >= ]]> #{${_conditionParam_}.originalCountStart}
</if>
<if test="conditionParamRef.containsKey('originalCountEnd') and conditionParamRef.originalCountEnd != null">
${_conditionType_} a.originalCount <![CDATA[ <= ]]> #{${_conditionParam_}.originalCountEnd}
</if>
<if test="conditionParamRef.containsKey('duplicateCount')">
<if test="conditionParamRef.duplicateCount != null ">
${_conditionType_} a.duplicateCount = #{${_conditionParam_}.duplicateCount}
<if test="conditionParamRef.containsKey('certificateUrl')">
<if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''">
${_conditionType_} a.certificateUrl like #{${_conditionParam_}.certificateUrl}
</if>
<if test="conditionParamRef.duplicateCount == null">
${_conditionType_} a.duplicateCount is null
<if test="conditionParamRef.certificateUrl == null">
${_conditionType_} a.certificateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('duplicateCountList')">
${_conditionType_} a.duplicateCount in
<foreach collection="conditionParamRef.duplicateCountList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('certificateUrlList')">
${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('duplicateCountStart') and conditionParamRef.duplicateCountStart != null">
${_conditionType_} a.duplicateCount <![CDATA[ >= ]]> #{${_conditionParam_}.duplicateCountStart}
</if>
<if test="conditionParamRef.containsKey('duplicateCountEnd') and conditionParamRef.duplicateCountEnd != null">
${_conditionType_} a.duplicateCount <![CDATA[ <= ]]> #{${_conditionParam_}.duplicateCountEnd}
</if>
<if test="conditionParamRef.containsKey('originalUrl')">
<if test="conditionParamRef.originalUrl != null and conditionParamRef.originalUrl != ''">
${_conditionType_} a.originalUrl like #{${_conditionParam_}.originalUrl}
<if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
${_conditionType_} a.previewUrl like #{${_conditionParam_}.previewUrl}
</if>
<if test="conditionParamRef.originalUrl == null">
${_conditionType_} a.originalUrl is null
<if test="conditionParamRef.previewUrl == null">
${_conditionType_} a.previewUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('originalUrlList')">
${_conditionType_} a.originalUrl in
<foreach collection="conditionParamRef.originalUrlList" 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}
</if>
<if test="conditionParamRef.duplicateUrl == null">
${_conditionType_} a.duplicateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('duplicateUrlList')">
${_conditionType_} a.duplicateUrl in
<foreach collection="conditionParamRef.duplicateUrlList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('previewUrlList')">
${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -703,27 +710,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -742,11 +728,26 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
......@@ -777,24 +778,14 @@
<if test='orderCol.certificateStatus != null and "DESC".equalsIgnoreCase(orderCol.certificateStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('originalCount')">
a.originalCount
<if test='orderCol.originalCount != null and "DESC".equalsIgnoreCase(orderCol.originalCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateCount')">
a.duplicateCount
<if test='orderCol.duplicateCount != null and "DESC".equalsIgnoreCase(orderCol.duplicateCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('originalUrl')">
a.originalUrl
<if test='orderCol.originalUrl != null and "DESC".equalsIgnoreCase(orderCol.originalUrl)'>DESC</if>
<if test="orderCol.containsKey('certificateUrl')">
a.certificateUrl
<if test='orderCol.certificateUrl != null and "DESC".equalsIgnoreCase(orderCol.certificateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('duplicateUrl')">
a.duplicateUrl
<if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if>
<if test="orderCol.containsKey('previewUrl')">
a.previewUrl
<if test='orderCol.previewUrl != null and "DESC".equalsIgnoreCase(orderCol.previewUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
......@@ -817,11 +808,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
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