From 3a1b91a30c0c7f7f7109e40adf5f7365a2d4c745 Mon Sep 17 00:00:00 2001 From: liaoxuwei <5789413@qq.com> Date: Wed, 26 Oct 2022 11:54:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- certificate-manager/doc/api.md | 64 +- .../model/CertificateCatalogEntity.java | 365 ++-- .../model/CertificateCatalogQuery.java | 1505 +++++++++-------- .../module/certificate/pdu/PrintLogPdu.java | 13 + .../web/CertificatePrintController.java | 16 +- .../module/record/model/PrintLogEntity.java | 287 ++-- .../module/record/model/PrintLogQuery.java | 1217 ++++++------- .../record/model/vo/PrintWaitQueueVo.java | 16 +- .../record/service/PrintWaitQueueService.java | 2 +- .../impl/PrintWaitQueueServiceImpl.java | 93 +- .../certificate/CertificateCatalogMapper.xml | 1478 ++++++++-------- .../sqlmap/module/record/PrintLogMapper.xml | 1262 +++++++------- 12 files changed, 3394 insertions(+), 2924 deletions(-) create mode 100644 certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintLogPdu.java diff --git a/certificate-manager/doc/api.md b/certificate-manager/doc/api.md index 2c9d407..6ac07d6 100644 --- a/certificate-manager/doc/api.md +++ b/certificate-manager/doc/api.md @@ -690,6 +690,9 @@ data|object|鏁版嵁瀵硅薄   createTime|Date|鍒涘缓鏃堕棿   updateUserId|Long|鏇存柊鐢ㄦ埛   updateTime|Date|鏇存柊鏃堕棿 +  printerName|String|鎵撳嵃鏈哄悕绉� +  printerIp|String|鎵撳嵃鏈虹綉缁滃湴鍧€ +  paperSource|String|鎵撳嵃鏈虹焊鐩� dict|object|瀛楀吀瀵硅薄 **鍝嶅簲娑堟伅鏍蜂緥:** @@ -749,6 +752,9 @@ data|object|鏁版嵁瀵硅薄  createTime|Date|鍒涘缓鏃堕棿  updateUserId|Long|鏇存柊鐢ㄦ埛  updateTime|Date|鏇存柊鏃堕棿 +  printerName|String|鎵撳嵃鏈哄悕绉� +  printerIp|String|鎵撳嵃鏈虹綉缁滃湴鍧€ +  paperSource|String|鎵撳嵃鏈虹焊鐩� dict|object|瀛楀吀瀵硅薄 **鍝嶅簲娑堟伅鏍蜂緥:** @@ -776,7 +782,10 @@ dict|object|瀛楀吀瀵硅薄 "createUserId":31, "createTime":"2022-10-14", "updateUserId":8897, - "updateTime":"2022-10-14" + "updateTime":"2022-10-14", + "printerName":"aa0y0y", + "printerIp":"cqvvc9", + "paperSource":"55io9h" } } ``` @@ -808,6 +817,9 @@ createUserId|Long|鍚鍒涘缓鐢ㄦ埛 createTime|Date|鍚鍒涘缓鏃堕棿 updateUserId|Long|鍚鏇存柊鐢ㄦ埛 updateTime|Date|鍚鏇存柊鏃堕棿 +printerName|String|鍚鎵撳嵃鏈哄悕绉� +printerIp|String|鍚鎵撳嵃鏈虹綉缁滃湴鍧€ +paperSource|String|鍚鎵撳嵃鏈虹焊鐩� **璇锋眰鏍蜂緥:** ``` @@ -828,6 +840,9 @@ updateTime|Date|鍚鏇存柊鏃堕棿 "dupFormContent":"ye4wm8", "exampleUrl":"mgv8im", "status":1567, + "printerName":"q2bm5t", + "printerIp":"x8xb4l", + "paperSource":"4nccil" } ``` @@ -861,6 +876,9 @@ data|object|鏁版嵁瀵硅薄   createTime|Date|鍒涘缓鏃堕棿   updateUserId|Long|鏇存柊鐢ㄦ埛   updateTime|Date|鏇存柊鏃堕棿 +  printerName|String|鎵撳嵃鏈哄悕绉� +  printerIp|String|鎵撳嵃鏈虹綉缁滃湴鍧€ +  paperSource|String|鎵撳嵃鏈虹焊鐩� **鍝嶅簲娑堟伅鏍蜂緥:** ``` @@ -2654,5 +2672,49 @@ dict|object|瀛楀吀瀵硅薄 "dict": null } ``` +### 缁堢鎻愪氦鎵撳嵃缁撴灉 + +**璇锋眰URL:** print/log + +**璇锋眰鏂瑰紡:** POST + +**鍐呭绫诲瀷:** application/json;charset=utf-8 + +**绠€瑕佹弿杩�:** 淇濆瓨鎵撳嵃缁撴灉 + +**璇锋眰鍙傛暟:** + +鍙傛暟鍚嶇О|绫诲瀷|蹇呭~|鎻忚堪 +:---|:---|:---|:------- +waitQueueId|Long|鏄瘄鎵撳嵃鍒楄〃id +printStatus|Integer|鏄瘄鎵撳嵃缁撴灉1鎴愬姛-1澶辫触 +statusRemark|String|鍚缁撴灉鎻忚堪 +**璇锋眰鏍蜂緥:** +``` + { + "waitQueueId": 1, + "printStatus": -1, + "statusRemark":"閿欒娴嬭瘯" +} + +``` +**鍝嶅簲鍙傛暟:** + +鍙傛暟鍚嶇О|鍙傛暟绫诲瀷|鎻忚堪 +:---|:---|:------ +code|Integer|缁撴灉鐮侊紙-1.澶辫触锛�1.鎴愬姛锛� +msg|String|娑堟伅 +data|object|鏁版嵁瀵硅薄 +dict|object|瀛楀吀瀵硅薄 + +**鍝嶅簲娑堟伅鏍蜂緥:** +``` +{ + "data": {}, + "code": 1, + "msg": "淇濆瓨鎵撳嵃璁板綍鎴愬姛", + "dict": null +} +``` ## 瀛楀吀闄勫綍 diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java index 4240949..d14cdf0 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java @@ -7,314 +7,368 @@ 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-22 -*/ + * 璇佺収鐩綍瀹炰綋瀵硅薄 + * + * @author zxfei + * @date 2022-10-26 + */ public class CertificateCatalogEntity extends CertificateCatalogVo { private static final long serialVersionUID = 1L; /** - * 鐩綍鍚嶇О - */ + * 鐩綍鍚嶇О + */ private String catalogName; /** - * 鐩綍缂栧彿 - */ + * 鐩綍缂栧彿 + */ private String catalogCode; /** - * 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - */ + * 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + */ private Integer holderType; /** - * 鎵€灞炶涓� - */ + * 鎵€灞炶涓� + */ private Long industryId; /** - * 鎵€灞炲垎绫� - */ + * 鎵€灞炲垎绫� + */ private Long classifyId; /** - * 妯悜灏哄(鍗曚綅mm) - */ + * 妯悜灏哄(鍗曚綅mm) + */ private Integer transverse; /** - * 绾靛悜灏哄(鍗曚綅mm) - */ + * 绾靛悜灏哄(鍗曚綅mm) + */ private Integer portrait; /** - * 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - */ + * 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + */ private Integer inspect; /** - * 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - */ + * 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + */ private String oriFileName; /** - * 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - */ + * 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + */ private String originalUrl; /** - * 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - */ + * 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + */ private String oriFormContent; /** - * 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - */ + * 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + */ private String dupFileName; /** - * 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - */ + * 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + */ private String duplicateUrl; /** - * 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - */ + * 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + */ private String dupFormContent; /** - * 璇佺収绀轰緥鍥惧湴鍧€ - */ + * 璇佺収绀轰緥鍥惧湴鍧€ + */ private String exampleUrl; /** - * 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - */ + * 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + */ private Integer status; + /** + * 鎵撳嵃鏈哄悕绉� + */ + private String printerName; + /** + * 鎵撳嵃鏈虹綉缁滃湴鍧€ + */ + private String printerIp; + /** + * 鎵撳嵃鏈虹焊鐩� + */ + private String paperSource; public CertificateCatalogEntity(){} /** - * 鑾峰彇 鐩綍鍚嶇О - * @return String - */ + * 鑾峰彇 鐩綍鍚嶇О + * @return String + */ public String getCatalogName(){ return catalogName; } /** - * 璁剧疆 鐩綍鍚嶇О - * @param catalogName - */ + * 璁剧疆 鐩綍鍚嶇О + * @param catalogName + */ public void setCatalogName(String catalogName){ this.catalogName = catalogName; } /** - * 鑾峰彇 鐩綍缂栧彿 - * @return String - */ + * 鑾峰彇 鐩綍缂栧彿 + * @return String + */ public String getCatalogCode(){ return catalogCode; } /** - * 璁剧疆 鐩綍缂栧彿 - * @param catalogCode - */ + * 璁剧疆 鐩綍缂栧彿 + * @param catalogCode + */ public void setCatalogCode(String catalogCode){ this.catalogCode = catalogCode; } /** - * 鑾峰彇 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @return Integer - */ + * 鑾峰彇 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @return Integer + */ public Integer getHolderType(){ return holderType; } /** - * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderType - */ + * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderType + */ public void setHolderType(Integer holderType){ this.holderType = holderType; } /** - * 鑾峰彇 鎵€灞炶涓� - * @return Long - */ + * 鑾峰彇 鎵€灞炶涓� + * @return Long + */ public Long getIndustryId(){ return industryId; } /** - * 璁剧疆 鎵€灞炶涓� - * @param industryId - */ + * 璁剧疆 鎵€灞炶涓� + * @param industryId + */ public void setIndustryId(Long industryId){ this.industryId = industryId; } /** - * 鑾峰彇 鎵€灞炲垎绫� - * @return Long - */ + * 鑾峰彇 鎵€灞炲垎绫� + * @return Long + */ public Long getClassifyId(){ return classifyId; } /** - * 璁剧疆 鎵€灞炲垎绫� - * @param classifyId - */ + * 璁剧疆 鎵€灞炲垎绫� + * @param classifyId + */ public void setClassifyId(Long classifyId){ this.classifyId = classifyId; } /** - * 鑾峰彇 妯悜灏哄(鍗曚綅mm) - * @return Integer - */ + * 鑾峰彇 妯悜灏哄(鍗曚綅mm) + * @return Integer + */ public Integer getTransverse(){ return transverse; } /** - * 璁剧疆 妯悜灏哄(鍗曚綅mm) - * @param transverse - */ + * 璁剧疆 妯悜灏哄(鍗曚綅mm) + * @param transverse + */ public void setTransverse(Integer transverse){ this.transverse = transverse; } /** - * 鑾峰彇 绾靛悜灏哄(鍗曚綅mm) - * @return Integer - */ + * 鑾峰彇 绾靛悜灏哄(鍗曚綅mm) + * @return Integer + */ public Integer getPortrait(){ return portrait; } /** - * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) - * @param portrait - */ + * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) + * @param portrait + */ public void setPortrait(Integer portrait){ this.portrait = portrait; } /** - * 鑾峰彇 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @return Integer - */ + * 鑾峰彇 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @return Integer + */ public Integer getInspect(){ return inspect; } /** - * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspect - */ + * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspect + */ public void setInspect(Integer inspect){ this.inspect = inspect; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @return String + */ public String getOriFileName(){ return oriFileName; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @param oriFileName - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @param oriFileName + */ public void setOriFileName(String oriFileName){ this.oriFileName = oriFileName; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @return String + */ public String getOriginalUrl(){ return originalUrl; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @param originalUrl - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @param originalUrl + */ public void setOriginalUrl(String originalUrl){ this.originalUrl = originalUrl; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @return String + */ public String getOriFormContent(){ return oriFormContent; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @param oriFormContent - */ + * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @param oriFormContent + */ public void setOriFormContent(String oriFormContent){ this.oriFormContent = oriFormContent; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @return String + */ public String getDupFileName(){ return dupFileName; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @param dupFileName - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @param dupFileName + */ public void setDupFileName(String dupFileName){ this.dupFileName = dupFileName; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @return String + */ public String getDuplicateUrl(){ return duplicateUrl; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @param duplicateUrl - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @param duplicateUrl + */ public void setDuplicateUrl(String duplicateUrl){ this.duplicateUrl = duplicateUrl; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @return String - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @return String + */ public String getDupFormContent(){ return dupFormContent; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @param dupFormContent - */ + * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @param dupFormContent + */ public void setDupFormContent(String dupFormContent){ this.dupFormContent = dupFormContent; } /** - * 鑾峰彇 璇佺収绀轰緥鍥惧湴鍧€ - * @return String - */ + * 鑾峰彇 璇佺収绀轰緥鍥惧湴鍧€ + * @return String + */ public String getExampleUrl(){ return exampleUrl; } /** - * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ - * @param exampleUrl - */ + * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ + * @param exampleUrl + */ public void setExampleUrl(String exampleUrl){ this.exampleUrl = exampleUrl; } /** - * 鑾峰彇 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @return Integer - */ + * 鑾峰彇 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @return Integer + */ public Integer getStatus(){ return status; } /** - * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param status - */ + * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param status + */ public void setStatus(Integer status){ this.status = status; } + /** + * 鑾峰彇 鎵撳嵃鏈哄悕绉� + * @return String + */ + public String getPrinterName(){ + return printerName; + } + /** + * 璁剧疆 鎵撳嵃鏈哄悕绉� + * @param printerName + */ + public void setPrinterName(String printerName){ + this.printerName = printerName; + } + /** + * 鑾峰彇 鎵撳嵃鏈虹綉缁滃湴鍧€ + * @return String + */ + public String getPrinterIp(){ + return printerIp; + } + /** + * 璁剧疆 鎵撳嵃鏈虹綉缁滃湴鍧€ + * @param printerIp + */ + public void setPrinterIp(String printerIp){ + this.printerIp = printerIp; + } + /** + * 鑾峰彇 鎵撳嵃鏈虹焊鐩� + * @return String + */ + public String getPaperSource(){ + return paperSource; + } + /** + * 璁剧疆 鎵撳嵃鏈虹焊鐩� + * @param paperSource + */ + public void setPaperSource(String paperSource){ + this.paperSource = paperSource; + } @Override public int hashCode() { - return this.getId().hashCode(); + return this.getId().hashCode(); } @Override public boolean equals(Object obj) { @@ -322,7 +376,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { if (obj instanceof CertificateCatalogEntity) { CertificateCatalogEntity tmp = (CertificateCatalogEntity) obj; if (this.getId() == tmp.getId()) { - return true; + return true; } } return false; @@ -346,41 +400,50 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { sb.append(",dupFormContent:").append(getDupFormContent()); 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()); return sb.toString(); } public void initAttrValue(){ - this.catalogName = ""; + this.catalogName = ""; + + this.catalogCode = ""; + + this.holderType = 1; + + this.industryId = null; - this.catalogCode = ""; + this.classifyId = null; - this.holderType = 1; + this.transverse = 0; - this.industryId = null; + this.portrait = 0; - this.classifyId = null; + this.inspect = 0; - this.transverse = 0; + this.oriFileName = ""; - this.portrait = 0; + this.originalUrl = ""; - this.inspect = 0; + this.oriFormContent = ""; - this.oriFileName = ""; + this.dupFileName = ""; - this.originalUrl = ""; + this.duplicateUrl = ""; - this.oriFormContent = ""; + this.dupFormContent = ""; - this.dupFileName = ""; + this.exampleUrl = ""; - this.duplicateUrl = ""; + this.status = 1; - this.dupFormContent = ""; + this.printerName = ""; - this.exampleUrl = ""; + this.printerIp = ""; - this.status = 1; + this.paperSource = ""; } } \ No newline at end of file diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java index 50273c5..104c5a0 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java @@ -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-22 -*/ + * 璇佺収鐩綍鏌ヨ瀵硅薄 + * + * @author zxfei + * @date 2022-10-26 + */ public class CertificateCatalogQuery extends CertificateCatalogEntity { /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */ private Long idStart; @@ -168,6 +168,15 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { /** 缁撴潫 鏇存柊鏃堕棿 */ private String updateTimeEnd; + /** 鎵撳嵃鏈哄悕绉� */ + private List<String> printerNameList; + + /** 鎵撳嵃鏈虹綉缁滃湴鍧€ */ + private List<String> printerIpList; + + /** 鎵撳嵃鏈虹焊鐩� */ + private List<String> paperSourceList; + /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ private List<CertificateCatalogQuery> orConditionList; @@ -177,1495 +186,1597 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { public CertificateCatalogQuery(){} /** - * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @return idStart - */ + * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @return idStart + */ public Long getIdStart(){ return this.idStart; } /** - * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @param idStart - */ + * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @param idStart + */ public void setIdStart(Long idStart){ this.idStart = idStart; } /** - * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @return $idEnd - */ + * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @return $idEnd + */ public Long getIdEnd(){ return this.idEnd; } /** - * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @param idEnd - */ + * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @param idEnd + */ public void setIdEnd(Long idEnd){ this.idEnd = idEnd; } /** - * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @return idIncrement - */ + * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @return idIncrement + */ public Long getIdIncrement(){ return this.idIncrement; } /** - * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @param idIncrement - */ + * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @param idIncrement + */ public void setIdIncrement(Long idIncrement){ this.idIncrement = idIncrement; } /** - * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀� - * @return idList - */ + * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀� + * @return idList + */ public List<Long> getIdList(){ return this.idList; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param idList - */ + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param idList + */ public void setIdList(List<Long> idList){ this.idList = idList; } /** - * 鑾峰彇 鐩綍鍚嶇О - * @return catalogNameList - */ + * 鑾峰彇 鐩綍鍚嶇О + * @return catalogNameList + */ public List<String> getCatalogNameList(){ return this.catalogNameList; } /** - * 璁剧疆 鐩綍鍚嶇О - * @param catalogNameList - */ + * 璁剧疆 鐩綍鍚嶇О + * @param catalogNameList + */ public void setCatalogNameList(List<String> catalogNameList){ this.catalogNameList = catalogNameList; } /** - * 鑾峰彇 鐩綍缂栧彿 - * @return catalogCodeList - */ + * 鑾峰彇 鐩綍缂栧彿 + * @return catalogCodeList + */ public List<String> getCatalogCodeList(){ return this.catalogCodeList; } /** - * 璁剧疆 鐩綍缂栧彿 - * @param catalogCodeList - */ + * 璁剧疆 鐩綍缂栧彿 + * @param catalogCodeList + */ public void setCatalogCodeList(List<String> catalogCodeList){ this.catalogCodeList = catalogCodeList; } /** - * 鑾峰彇 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @return holderTypeStart - */ + * 鑾峰彇 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @return holderTypeStart + */ public Integer getHolderTypeStart(){ return this.holderTypeStart; } /** - * 璁剧疆 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeStart - */ + * 璁剧疆 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeStart + */ public void setHolderTypeStart(Integer holderTypeStart){ this.holderTypeStart = holderTypeStart; } /** - * 鑾峰彇 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @return $holderTypeEnd - */ + * 鑾峰彇 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @return $holderTypeEnd + */ public Integer getHolderTypeEnd(){ return this.holderTypeEnd; } /** - * 璁剧疆 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeEnd - */ + * 璁剧疆 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeEnd + */ public void setHolderTypeEnd(Integer holderTypeEnd){ this.holderTypeEnd = holderTypeEnd; } /** - * 鑾峰彇 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @return holderTypeIncrement - */ + * 鑾峰彇 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @return holderTypeIncrement + */ public Integer getHolderTypeIncrement(){ return this.holderTypeIncrement; } /** - * 璁剧疆 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeIncrement - */ + * 璁剧疆 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeIncrement + */ public void setHolderTypeIncrement(Integer holderTypeIncrement){ this.holderTypeIncrement = holderTypeIncrement; } /** - * 鑾峰彇 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @return holderTypeList - */ + * 鑾峰彇 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @return holderTypeList + */ public List<Integer> getHolderTypeList(){ return this.holderTypeList; } /** - * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeList - */ + * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeList + */ public void setHolderTypeList(List<Integer> holderTypeList){ this.holderTypeList = holderTypeList; } /** - * 鑾峰彇 寮€濮� 鎵€灞炶涓� - * @return industryIdStart - */ + * 鑾峰彇 寮€濮� 鎵€灞炶涓� + * @return industryIdStart + */ public Long getIndustryIdStart(){ return this.industryIdStart; } /** - * 璁剧疆 寮€濮� 鎵€灞炶涓� - * @param industryIdStart - */ + * 璁剧疆 寮€濮� 鎵€灞炶涓� + * @param industryIdStart + */ public void setIndustryIdStart(Long industryIdStart){ this.industryIdStart = industryIdStart; } /** - * 鑾峰彇 缁撴潫 鎵€灞炶涓� - * @return $industryIdEnd - */ + * 鑾峰彇 缁撴潫 鎵€灞炶涓� + * @return $industryIdEnd + */ public Long getIndustryIdEnd(){ return this.industryIdEnd; } /** - * 璁剧疆 缁撴潫 鎵€灞炶涓� - * @param industryIdEnd - */ + * 璁剧疆 缁撴潫 鎵€灞炶涓� + * @param industryIdEnd + */ public void setIndustryIdEnd(Long industryIdEnd){ this.industryIdEnd = industryIdEnd; } /** - * 鑾峰彇 澧炲姞 鎵€灞炶涓� - * @return industryIdIncrement - */ + * 鑾峰彇 澧炲姞 鎵€灞炶涓� + * @return industryIdIncrement + */ public Long getIndustryIdIncrement(){ return this.industryIdIncrement; } /** - * 璁剧疆 澧炲姞 鎵€灞炶涓� - * @param industryIdIncrement - */ + * 璁剧疆 澧炲姞 鎵€灞炶涓� + * @param industryIdIncrement + */ public void setIndustryIdIncrement(Long industryIdIncrement){ this.industryIdIncrement = industryIdIncrement; } /** - * 鑾峰彇 鎵€灞炶涓� - * @return industryIdList - */ + * 鑾峰彇 鎵€灞炶涓� + * @return industryIdList + */ public List<Long> getIndustryIdList(){ return this.industryIdList; } /** - * 璁剧疆 鎵€灞炶涓� - * @param industryIdList - */ + * 璁剧疆 鎵€灞炶涓� + * @param industryIdList + */ public void setIndustryIdList(List<Long> industryIdList){ this.industryIdList = industryIdList; } /** - * 鑾峰彇 寮€濮� 鎵€灞炲垎绫� - * @return classifyIdStart - */ + * 鑾峰彇 寮€濮� 鎵€灞炲垎绫� + * @return classifyIdStart + */ public Long getClassifyIdStart(){ return this.classifyIdStart; } /** - * 璁剧疆 寮€濮� 鎵€灞炲垎绫� - * @param classifyIdStart - */ + * 璁剧疆 寮€濮� 鎵€灞炲垎绫� + * @param classifyIdStart + */ public void setClassifyIdStart(Long classifyIdStart){ this.classifyIdStart = classifyIdStart; } /** - * 鑾峰彇 缁撴潫 鎵€灞炲垎绫� - * @return $classifyIdEnd - */ + * 鑾峰彇 缁撴潫 鎵€灞炲垎绫� + * @return $classifyIdEnd + */ public Long getClassifyIdEnd(){ return this.classifyIdEnd; } /** - * 璁剧疆 缁撴潫 鎵€灞炲垎绫� - * @param classifyIdEnd - */ + * 璁剧疆 缁撴潫 鎵€灞炲垎绫� + * @param classifyIdEnd + */ public void setClassifyIdEnd(Long classifyIdEnd){ this.classifyIdEnd = classifyIdEnd; } /** - * 鑾峰彇 澧炲姞 鎵€灞炲垎绫� - * @return classifyIdIncrement - */ + * 鑾峰彇 澧炲姞 鎵€灞炲垎绫� + * @return classifyIdIncrement + */ public Long getClassifyIdIncrement(){ return this.classifyIdIncrement; } /** - * 璁剧疆 澧炲姞 鎵€灞炲垎绫� - * @param classifyIdIncrement - */ + * 璁剧疆 澧炲姞 鎵€灞炲垎绫� + * @param classifyIdIncrement + */ public void setClassifyIdIncrement(Long classifyIdIncrement){ this.classifyIdIncrement = classifyIdIncrement; } /** - * 鑾峰彇 鎵€灞炲垎绫� - * @return classifyIdList - */ + * 鑾峰彇 鎵€灞炲垎绫� + * @return classifyIdList + */ public List<Long> getClassifyIdList(){ return this.classifyIdList; } /** - * 璁剧疆 鎵€灞炲垎绫� - * @param classifyIdList - */ + * 璁剧疆 鎵€灞炲垎绫� + * @param classifyIdList + */ public void setClassifyIdList(List<Long> classifyIdList){ this.classifyIdList = classifyIdList; } /** - * 鑾峰彇 寮€濮� 妯悜灏哄(鍗曚綅mm) - * @return transverseStart - */ + * 鑾峰彇 寮€濮� 妯悜灏哄(鍗曚綅mm) + * @return transverseStart + */ public Integer getTransverseStart(){ return this.transverseStart; } /** - * 璁剧疆 寮€濮� 妯悜灏哄(鍗曚綅mm) - * @param transverseStart - */ + * 璁剧疆 寮€濮� 妯悜灏哄(鍗曚綅mm) + * @param transverseStart + */ public void setTransverseStart(Integer transverseStart){ this.transverseStart = transverseStart; } /** - * 鑾峰彇 缁撴潫 妯悜灏哄(鍗曚綅mm) - * @return $transverseEnd - */ + * 鑾峰彇 缁撴潫 妯悜灏哄(鍗曚綅mm) + * @return $transverseEnd + */ public Integer getTransverseEnd(){ return this.transverseEnd; } /** - * 璁剧疆 缁撴潫 妯悜灏哄(鍗曚綅mm) - * @param transverseEnd - */ + * 璁剧疆 缁撴潫 妯悜灏哄(鍗曚綅mm) + * @param transverseEnd + */ public void setTransverseEnd(Integer transverseEnd){ this.transverseEnd = transverseEnd; } /** - * 鑾峰彇 澧炲姞 妯悜灏哄(鍗曚綅mm) - * @return transverseIncrement - */ + * 鑾峰彇 澧炲姞 妯悜灏哄(鍗曚綅mm) + * @return transverseIncrement + */ public Integer getTransverseIncrement(){ return this.transverseIncrement; } /** - * 璁剧疆 澧炲姞 妯悜灏哄(鍗曚綅mm) - * @param transverseIncrement - */ + * 璁剧疆 澧炲姞 妯悜灏哄(鍗曚綅mm) + * @param transverseIncrement + */ public void setTransverseIncrement(Integer transverseIncrement){ this.transverseIncrement = transverseIncrement; } /** - * 鑾峰彇 妯悜灏哄(鍗曚綅mm) - * @return transverseList - */ + * 鑾峰彇 妯悜灏哄(鍗曚綅mm) + * @return transverseList + */ public List<Integer> getTransverseList(){ return this.transverseList; } /** - * 璁剧疆 妯悜灏哄(鍗曚綅mm) - * @param transverseList - */ + * 璁剧疆 妯悜灏哄(鍗曚綅mm) + * @param transverseList + */ public void setTransverseList(List<Integer> transverseList){ this.transverseList = transverseList; } /** - * 鑾峰彇 寮€濮� 绾靛悜灏哄(鍗曚綅mm) - * @return portraitStart - */ + * 鑾峰彇 寮€濮� 绾靛悜灏哄(鍗曚綅mm) + * @return portraitStart + */ public Integer getPortraitStart(){ return this.portraitStart; } /** - * 璁剧疆 寮€濮� 绾靛悜灏哄(鍗曚綅mm) - * @param portraitStart - */ + * 璁剧疆 寮€濮� 绾靛悜灏哄(鍗曚綅mm) + * @param portraitStart + */ public void setPortraitStart(Integer portraitStart){ this.portraitStart = portraitStart; } /** - * 鑾峰彇 缁撴潫 绾靛悜灏哄(鍗曚綅mm) - * @return $portraitEnd - */ + * 鑾峰彇 缁撴潫 绾靛悜灏哄(鍗曚綅mm) + * @return $portraitEnd + */ public Integer getPortraitEnd(){ return this.portraitEnd; } /** - * 璁剧疆 缁撴潫 绾靛悜灏哄(鍗曚綅mm) - * @param portraitEnd - */ + * 璁剧疆 缁撴潫 绾靛悜灏哄(鍗曚綅mm) + * @param portraitEnd + */ public void setPortraitEnd(Integer portraitEnd){ this.portraitEnd = portraitEnd; } /** - * 鑾峰彇 澧炲姞 绾靛悜灏哄(鍗曚綅mm) - * @return portraitIncrement - */ + * 鑾峰彇 澧炲姞 绾靛悜灏哄(鍗曚綅mm) + * @return portraitIncrement + */ public Integer getPortraitIncrement(){ return this.portraitIncrement; } /** - * 璁剧疆 澧炲姞 绾靛悜灏哄(鍗曚綅mm) - * @param portraitIncrement - */ + * 璁剧疆 澧炲姞 绾靛悜灏哄(鍗曚綅mm) + * @param portraitIncrement + */ public void setPortraitIncrement(Integer portraitIncrement){ this.portraitIncrement = portraitIncrement; } /** - * 鑾峰彇 绾靛悜灏哄(鍗曚綅mm) - * @return portraitList - */ + * 鑾峰彇 绾靛悜灏哄(鍗曚綅mm) + * @return portraitList + */ public List<Integer> getPortraitList(){ return this.portraitList; } /** - * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) - * @param portraitList - */ + * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) + * @param portraitList + */ public void setPortraitList(List<Integer> portraitList){ this.portraitList = portraitList; } /** - * 鑾峰彇 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @return inspectStart - */ + * 鑾峰彇 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @return inspectStart + */ public Integer getInspectStart(){ return this.inspectStart; } /** - * 璁剧疆 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectStart - */ + * 璁剧疆 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectStart + */ public void setInspectStart(Integer inspectStart){ this.inspectStart = inspectStart; } /** - * 鑾峰彇 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @return $inspectEnd - */ + * 鑾峰彇 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @return $inspectEnd + */ public Integer getInspectEnd(){ return this.inspectEnd; } /** - * 璁剧疆 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectEnd - */ + * 璁剧疆 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectEnd + */ public void setInspectEnd(Integer inspectEnd){ this.inspectEnd = inspectEnd; } /** - * 鑾峰彇 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @return inspectIncrement - */ + * 鑾峰彇 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @return inspectIncrement + */ public Integer getInspectIncrement(){ return this.inspectIncrement; } /** - * 璁剧疆 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectIncrement - */ + * 璁剧疆 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectIncrement + */ public void setInspectIncrement(Integer inspectIncrement){ this.inspectIncrement = inspectIncrement; } /** - * 鑾峰彇 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @return inspectList - */ + * 鑾峰彇 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @return inspectList + */ public List<Integer> getInspectList(){ return this.inspectList; } /** - * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectList - */ + * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectList + */ public void setInspectList(List<Integer> inspectList){ this.inspectList = inspectList; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @return oriFileNameList - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @return oriFileNameList + */ public List<String> getOriFileNameList(){ return this.oriFileNameList; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @param oriFileNameList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @param oriFileNameList + */ public void setOriFileNameList(List<String> oriFileNameList){ this.oriFileNameList = oriFileNameList; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @return originalUrlList - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @return originalUrlList + */ public List<String> getOriginalUrlList(){ return this.originalUrlList; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @param originalUrlList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @param originalUrlList + */ public void setOriginalUrlList(List<String> originalUrlList){ this.originalUrlList = originalUrlList; } /** - * 鑾峰彇 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @return oriFormContentList - */ + * 鑾峰彇 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @return oriFormContentList + */ public List<String> getOriFormContentList(){ return this.oriFormContentList; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @param oriFormContentList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @param oriFormContentList + */ public void setOriFormContentList(List<String> oriFormContentList){ this.oriFormContentList = oriFormContentList; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @return dupFileNameList - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @return dupFileNameList + */ public List<String> getDupFileNameList(){ return this.dupFileNameList; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @param dupFileNameList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @param dupFileNameList + */ public void setDupFileNameList(List<String> dupFileNameList){ this.dupFileNameList = dupFileNameList; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @return duplicateUrlList - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @return duplicateUrlList + */ public List<String> getDuplicateUrlList(){ return this.duplicateUrlList; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @param duplicateUrlList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @param duplicateUrlList + */ public void setDuplicateUrlList(List<String> duplicateUrlList){ this.duplicateUrlList = duplicateUrlList; } /** - * 鑾峰彇 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @return dupFormContentList - */ + * 鑾峰彇 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @return dupFormContentList + */ public List<String> getDupFormContentList(){ return this.dupFormContentList; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @param dupFormContentList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @param dupFormContentList + */ public void setDupFormContentList(List<String> dupFormContentList){ this.dupFormContentList = dupFormContentList; } /** - * 鑾峰彇 璇佺収绀轰緥鍥惧湴鍧€ - * @return exampleUrlList - */ + * 鑾峰彇 璇佺収绀轰緥鍥惧湴鍧€ + * @return exampleUrlList + */ public List<String> getExampleUrlList(){ return this.exampleUrlList; } /** - * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ - * @param exampleUrlList - */ + * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ + * @param exampleUrlList + */ public void setExampleUrlList(List<String> exampleUrlList){ this.exampleUrlList = exampleUrlList; } /** - * 鑾峰彇 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @return statusStart - */ + * 鑾峰彇 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @return statusStart + */ public Integer getStatusStart(){ return this.statusStart; } /** - * 璁剧疆 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusStart - */ + * 璁剧疆 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusStart + */ public void setStatusStart(Integer statusStart){ this.statusStart = statusStart; } /** - * 鑾峰彇 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @return $statusEnd - */ + * 鑾峰彇 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @return $statusEnd + */ public Integer getStatusEnd(){ return this.statusEnd; } /** - * 璁剧疆 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusEnd - */ + * 璁剧疆 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusEnd + */ public void setStatusEnd(Integer statusEnd){ this.statusEnd = statusEnd; } /** - * 鑾峰彇 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @return statusIncrement - */ + * 鑾峰彇 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @return statusIncrement + */ public Integer getStatusIncrement(){ return this.statusIncrement; } /** - * 璁剧疆 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusIncrement - */ + * 璁剧疆 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusIncrement + */ public void setStatusIncrement(Integer statusIncrement){ this.statusIncrement = statusIncrement; } /** - * 鑾峰彇 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @return statusList - */ + * 鑾峰彇 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @return statusList + */ public List<Integer> getStatusList(){ return this.statusList; } /** - * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusList - */ + * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusList + */ public void setStatusList(List<Integer> statusList){ this.statusList = statusList; } /** - * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛 - * @return createUserIdStart - */ + * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛 + * @return createUserIdStart + */ public Long getCreateUserIdStart(){ return this.createUserIdStart; } /** - * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 - * @param createUserIdStart - */ + * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 + * @param createUserIdStart + */ public void setCreateUserIdStart(Long createUserIdStart){ this.createUserIdStart = createUserIdStart; } /** - * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛 - * @return $createUserIdEnd - */ + * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛 + * @return $createUserIdEnd + */ public Long getCreateUserIdEnd(){ return this.createUserIdEnd; } /** - * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 - * @param createUserIdEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 + * @param createUserIdEnd + */ public void setCreateUserIdEnd(Long createUserIdEnd){ this.createUserIdEnd = createUserIdEnd; } /** - * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛 - * @return createUserIdIncrement - */ + * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛 + * @return createUserIdIncrement + */ public Long getCreateUserIdIncrement(){ return this.createUserIdIncrement; } /** - * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 - * @param createUserIdIncrement - */ + * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 + * @param createUserIdIncrement + */ public void setCreateUserIdIncrement(Long createUserIdIncrement){ this.createUserIdIncrement = createUserIdIncrement; } /** - * 鑾峰彇 鍒涘缓鐢ㄦ埛 - * @return createUserIdList - */ + * 鑾峰彇 鍒涘缓鐢ㄦ埛 + * @return createUserIdList + */ public List<Long> getCreateUserIdList(){ return this.createUserIdList; } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserIdList - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserIdList + */ public void setCreateUserIdList(List<Long> createUserIdList){ this.createUserIdList = createUserIdList; } /** - * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿 - * @return createTimeStart - */ + * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿 + * @return createTimeStart + */ public String getCreateTimeStart(){ return this.createTimeStart; } /** - * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿 - * @param createTimeStart - */ + * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿 + * @param createTimeStart + */ public void setCreateTimeStart(String createTimeStart){ this.createTimeStart = createTimeStart; } /** - * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿 - * @return createTimeEnd - */ + * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿 + * @return createTimeEnd + */ public String getCreateTimeEnd(){ return this.createTimeEnd; } /** - * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿 - * @param createTimeEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿 + * @param createTimeEnd + */ public void setCreateTimeEnd(String createTimeEnd){ this.createTimeEnd = createTimeEnd; } /** - * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛 - * @return updateUserIdStart - */ + * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛 + * @return updateUserIdStart + */ public Long getUpdateUserIdStart(){ return this.updateUserIdStart; } /** - * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 - * @param updateUserIdStart - */ + * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 + * @param updateUserIdStart + */ public void setUpdateUserIdStart(Long updateUserIdStart){ this.updateUserIdStart = updateUserIdStart; } /** - * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛 - * @return $updateUserIdEnd - */ + * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛 + * @return $updateUserIdEnd + */ public Long getUpdateUserIdEnd(){ return this.updateUserIdEnd; } /** - * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 - * @param updateUserIdEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 + * @param updateUserIdEnd + */ public void setUpdateUserIdEnd(Long updateUserIdEnd){ this.updateUserIdEnd = updateUserIdEnd; } /** - * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛 - * @return updateUserIdIncrement - */ + * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛 + * @return updateUserIdIncrement + */ public Long getUpdateUserIdIncrement(){ return this.updateUserIdIncrement; } /** - * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 - * @param updateUserIdIncrement - */ + * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 + * @param updateUserIdIncrement + */ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ this.updateUserIdIncrement = updateUserIdIncrement; } /** - * 鑾峰彇 鏇存柊鐢ㄦ埛 - * @return updateUserIdList - */ + * 鑾峰彇 鏇存柊鐢ㄦ埛 + * @return updateUserIdList + */ public List<Long> getUpdateUserIdList(){ return this.updateUserIdList; } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserIdList - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserIdList + */ public void setUpdateUserIdList(List<Long> updateUserIdList){ this.updateUserIdList = updateUserIdList; } /** - * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿 - * @return updateTimeStart - */ + * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿 + * @return updateTimeStart + */ public String getUpdateTimeStart(){ return this.updateTimeStart; } /** - * 璁剧疆 寮€濮� 鏇存柊鏃堕棿 - * @param updateTimeStart - */ + * 璁剧疆 寮€濮� 鏇存柊鏃堕棿 + * @param updateTimeStart + */ public void setUpdateTimeStart(String updateTimeStart){ this.updateTimeStart = updateTimeStart; } /** - * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿 - * @return updateTimeEnd - */ + * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿 + * @return updateTimeEnd + */ public String getUpdateTimeEnd(){ return this.updateTimeEnd; } /** - * 璁剧疆 缁撴潫 鏇存柊鏃堕棿 - * @param updateTimeEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鏃堕棿 + * @param updateTimeEnd + */ public void setUpdateTimeEnd(String updateTimeEnd){ this.updateTimeEnd = updateTimeEnd; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param id - */ + * 鑾峰彇 鎵撳嵃鏈哄悕绉� + * @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; + } + /** + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param id + */ public CertificateCatalogQuery id(Long id){ - setId(id); - return this; - } - - /** - * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @param idStart - */ + setId(id); + return this; + } + + /** + * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @param idStart + */ public CertificateCatalogQuery idStart(Long idStart){ - this.idStart = idStart; - return this; + this.idStart = idStart; + return this; } /** - * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @param idEnd - */ + * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @param idEnd + */ public CertificateCatalogQuery idEnd(Long idEnd){ - this.idEnd = idEnd; - return this; + this.idEnd = idEnd; + return this; } /** - * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @param idIncrement - */ + * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @param idIncrement + */ public CertificateCatalogQuery idIncrement(Long idIncrement){ - this.idIncrement = idIncrement; - return this; + this.idIncrement = idIncrement; + return this; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param idList - */ + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param idList + */ public CertificateCatalogQuery idList(List<Long> idList){ this.idList = idList; - return this; - } + return this; + } - /** - * 璁剧疆 鐩綍鍚嶇О - * @param catalogName - */ + /** + * 璁剧疆 鐩綍鍚嶇О + * @param catalogName + */ public CertificateCatalogQuery catalogName(String catalogName){ setCatalogName(catalogName); - return this; + return this; } /** - * 璁剧疆 鐩綍鍚嶇О - * @param catalogNameList - */ + * 璁剧疆 鐩綍鍚嶇О + * @param catalogNameList + */ public CertificateCatalogQuery catalogNameList(List<String> catalogNameList){ this.catalogNameList = catalogNameList; - return this; + return this; } - /** - * 璁剧疆 鐩綍缂栧彿 - * @param catalogCode - */ + /** + * 璁剧疆 鐩綍缂栧彿 + * @param catalogCode + */ public CertificateCatalogQuery catalogCode(String catalogCode){ setCatalogCode(catalogCode); - return this; + return this; } /** - * 璁剧疆 鐩綍缂栧彿 - * @param catalogCodeList - */ + * 璁剧疆 鐩綍缂栧彿 + * @param catalogCodeList + */ public CertificateCatalogQuery catalogCodeList(List<String> catalogCodeList){ this.catalogCodeList = catalogCodeList; - return this; + return this; } /** - * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderType - */ + * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderType + */ public CertificateCatalogQuery holderType(Integer holderType){ - setHolderType(holderType); - return this; - } - - /** - * 璁剧疆 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeStart - */ + setHolderType(holderType); + return this; + } + + /** + * 璁剧疆 寮€濮� 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeStart + */ public CertificateCatalogQuery holderTypeStart(Integer holderTypeStart){ - this.holderTypeStart = holderTypeStart; - return this; + this.holderTypeStart = holderTypeStart; + return this; } /** - * 璁剧疆 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeEnd - */ + * 璁剧疆 缁撴潫 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeEnd + */ public CertificateCatalogQuery holderTypeEnd(Integer holderTypeEnd){ - this.holderTypeEnd = holderTypeEnd; - return this; + this.holderTypeEnd = holderTypeEnd; + return this; } /** - * 璁剧疆 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeIncrement - */ + * 璁剧疆 澧炲姞 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeIncrement + */ public CertificateCatalogQuery holderTypeIncrement(Integer holderTypeIncrement){ - this.holderTypeIncrement = holderTypeIncrement; - return this; + this.holderTypeIncrement = holderTypeIncrement; + return this; } /** - * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� - * @param holderTypeList - */ + * 璁剧疆 鎸佹湁鑰呯被鍨嬶紝1锛氳嚜鐒朵汉锛�2锛氭硶浜猴紱3锛氳嚜鐒朵汉锛屾硶浜� + * @param holderTypeList + */ public CertificateCatalogQuery holderTypeList(List<Integer> holderTypeList){ this.holderTypeList = holderTypeList; - return this; - } + return this; + } /** - * 璁剧疆 鎵€灞炶涓� - * @param industryId - */ + * 璁剧疆 鎵€灞炶涓� + * @param industryId + */ public CertificateCatalogQuery industryId(Long industryId){ - setIndustryId(industryId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鎵€灞炶涓� - * @param industryIdStart - */ + setIndustryId(industryId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鎵€灞炶涓� + * @param industryIdStart + */ public CertificateCatalogQuery industryIdStart(Long industryIdStart){ - this.industryIdStart = industryIdStart; - return this; + this.industryIdStart = industryIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鎵€灞炶涓� - * @param industryIdEnd - */ + * 璁剧疆 缁撴潫 鎵€灞炶涓� + * @param industryIdEnd + */ public CertificateCatalogQuery industryIdEnd(Long industryIdEnd){ - this.industryIdEnd = industryIdEnd; - return this; + this.industryIdEnd = industryIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鎵€灞炶涓� - * @param industryIdIncrement - */ + * 璁剧疆 澧炲姞 鎵€灞炶涓� + * @param industryIdIncrement + */ public CertificateCatalogQuery industryIdIncrement(Long industryIdIncrement){ - this.industryIdIncrement = industryIdIncrement; - return this; + this.industryIdIncrement = industryIdIncrement; + return this; } /** - * 璁剧疆 鎵€灞炶涓� - * @param industryIdList - */ + * 璁剧疆 鎵€灞炶涓� + * @param industryIdList + */ public CertificateCatalogQuery industryIdList(List<Long> industryIdList){ this.industryIdList = industryIdList; - return this; - } + return this; + } /** - * 璁剧疆 鎵€灞炲垎绫� - * @param classifyId - */ + * 璁剧疆 鎵€灞炲垎绫� + * @param classifyId + */ public CertificateCatalogQuery classifyId(Long classifyId){ - setClassifyId(classifyId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鎵€灞炲垎绫� - * @param classifyIdStart - */ + setClassifyId(classifyId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鎵€灞炲垎绫� + * @param classifyIdStart + */ public CertificateCatalogQuery classifyIdStart(Long classifyIdStart){ - this.classifyIdStart = classifyIdStart; - return this; + this.classifyIdStart = classifyIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鎵€灞炲垎绫� - * @param classifyIdEnd - */ + * 璁剧疆 缁撴潫 鎵€灞炲垎绫� + * @param classifyIdEnd + */ public CertificateCatalogQuery classifyIdEnd(Long classifyIdEnd){ - this.classifyIdEnd = classifyIdEnd; - return this; + this.classifyIdEnd = classifyIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鎵€灞炲垎绫� - * @param classifyIdIncrement - */ + * 璁剧疆 澧炲姞 鎵€灞炲垎绫� + * @param classifyIdIncrement + */ public CertificateCatalogQuery classifyIdIncrement(Long classifyIdIncrement){ - this.classifyIdIncrement = classifyIdIncrement; - return this; + this.classifyIdIncrement = classifyIdIncrement; + return this; } /** - * 璁剧疆 鎵€灞炲垎绫� - * @param classifyIdList - */ + * 璁剧疆 鎵€灞炲垎绫� + * @param classifyIdList + */ public CertificateCatalogQuery classifyIdList(List<Long> classifyIdList){ this.classifyIdList = classifyIdList; - return this; - } + return this; + } /** - * 璁剧疆 妯悜灏哄(鍗曚綅mm) - * @param transverse - */ + * 璁剧疆 妯悜灏哄(鍗曚綅mm) + * @param transverse + */ public CertificateCatalogQuery transverse(Integer transverse){ - setTransverse(transverse); - return this; - } - - /** - * 璁剧疆 寮€濮� 妯悜灏哄(鍗曚綅mm) - * @param transverseStart - */ + setTransverse(transverse); + return this; + } + + /** + * 璁剧疆 寮€濮� 妯悜灏哄(鍗曚綅mm) + * @param transverseStart + */ public CertificateCatalogQuery transverseStart(Integer transverseStart){ - this.transverseStart = transverseStart; - return this; + this.transverseStart = transverseStart; + return this; } /** - * 璁剧疆 缁撴潫 妯悜灏哄(鍗曚綅mm) - * @param transverseEnd - */ + * 璁剧疆 缁撴潫 妯悜灏哄(鍗曚綅mm) + * @param transverseEnd + */ public CertificateCatalogQuery transverseEnd(Integer transverseEnd){ - this.transverseEnd = transverseEnd; - return this; + this.transverseEnd = transverseEnd; + return this; } /** - * 璁剧疆 澧炲姞 妯悜灏哄(鍗曚綅mm) - * @param transverseIncrement - */ + * 璁剧疆 澧炲姞 妯悜灏哄(鍗曚綅mm) + * @param transverseIncrement + */ public CertificateCatalogQuery transverseIncrement(Integer transverseIncrement){ - this.transverseIncrement = transverseIncrement; - return this; + this.transverseIncrement = transverseIncrement; + return this; } /** - * 璁剧疆 妯悜灏哄(鍗曚綅mm) - * @param transverseList - */ + * 璁剧疆 妯悜灏哄(鍗曚綅mm) + * @param transverseList + */ public CertificateCatalogQuery transverseList(List<Integer> transverseList){ this.transverseList = transverseList; - return this; - } + return this; + } /** - * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) - * @param portrait - */ + * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) + * @param portrait + */ public CertificateCatalogQuery portrait(Integer portrait){ - setPortrait(portrait); - return this; - } - - /** - * 璁剧疆 寮€濮� 绾靛悜灏哄(鍗曚綅mm) - * @param portraitStart - */ + setPortrait(portrait); + return this; + } + + /** + * 璁剧疆 寮€濮� 绾靛悜灏哄(鍗曚綅mm) + * @param portraitStart + */ public CertificateCatalogQuery portraitStart(Integer portraitStart){ - this.portraitStart = portraitStart; - return this; + this.portraitStart = portraitStart; + return this; } /** - * 璁剧疆 缁撴潫 绾靛悜灏哄(鍗曚綅mm) - * @param portraitEnd - */ + * 璁剧疆 缁撴潫 绾靛悜灏哄(鍗曚綅mm) + * @param portraitEnd + */ public CertificateCatalogQuery portraitEnd(Integer portraitEnd){ - this.portraitEnd = portraitEnd; - return this; + this.portraitEnd = portraitEnd; + return this; } /** - * 璁剧疆 澧炲姞 绾靛悜灏哄(鍗曚綅mm) - * @param portraitIncrement - */ + * 璁剧疆 澧炲姞 绾靛悜灏哄(鍗曚綅mm) + * @param portraitIncrement + */ public CertificateCatalogQuery portraitIncrement(Integer portraitIncrement){ - this.portraitIncrement = portraitIncrement; - return this; + this.portraitIncrement = portraitIncrement; + return this; } /** - * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) - * @param portraitList - */ + * 璁剧疆 绾靛悜灏哄(鍗曚綅mm) + * @param portraitList + */ public CertificateCatalogQuery portraitList(List<Integer> portraitList){ this.portraitList = portraitList; - return this; - } + return this; + } /** - * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspect - */ + * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspect + */ public CertificateCatalogQuery inspect(Integer inspect){ - setInspect(inspect); - return this; - } - - /** - * 璁剧疆 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectStart - */ + setInspect(inspect); + return this; + } + + /** + * 璁剧疆 寮€濮� 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectStart + */ public CertificateCatalogQuery inspectStart(Integer inspectStart){ - this.inspectStart = inspectStart; - return this; + this.inspectStart = inspectStart; + return this; } /** - * 璁剧疆 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectEnd - */ + * 璁剧疆 缁撴潫 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectEnd + */ public CertificateCatalogQuery inspectEnd(Integer inspectEnd){ - this.inspectEnd = inspectEnd; - return this; + this.inspectEnd = inspectEnd; + return this; } /** - * 璁剧疆 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectIncrement - */ + * 璁剧疆 澧炲姞 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectIncrement + */ public CertificateCatalogQuery inspectIncrement(Integer inspectIncrement){ - this.inspectIncrement = inspectIncrement; - return this; + this.inspectIncrement = inspectIncrement; + return this; } /** - * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 - * @param inspectList - */ + * 璁剧疆 鏄惁闇€瑕佸勾妫€锛�0锛氬惁1锛氭槸 + * @param inspectList + */ public CertificateCatalogQuery inspectList(List<Integer> inspectList){ this.inspectList = inspectList; - return this; - } + return this; + } - /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @param oriFileName - */ + /** + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @param oriFileName + */ public CertificateCatalogQuery oriFileName(String oriFileName){ setOriFileName(oriFileName); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О - * @param oriFileNameList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍚嶇О + * @param oriFileNameList + */ public CertificateCatalogQuery oriFileNameList(List<String> oriFileNameList){ this.oriFileNameList = oriFileNameList; - return this; + return this; } - /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @param originalUrl - */ + /** + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @param originalUrl + */ public CertificateCatalogQuery originalUrl(String originalUrl){ setOriginalUrl(originalUrl); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 - * @param originalUrlList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰鏂囦欢鍦板潃 + * @param originalUrlList + */ public CertificateCatalogQuery originalUrlList(List<String> originalUrlList){ this.originalUrlList = originalUrlList; - return this; + return this; } - /** - * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @param oriFormContent - */ + /** + * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @param oriFormContent + */ public CertificateCatalogQuery oriFormContent(String oriFormContent){ setOriFormContent(oriFormContent); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 - * @param oriFormContentList - */ + * 璁剧疆 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 + * @param oriFormContentList + */ public CertificateCatalogQuery oriFormContentList(List<String> oriFormContentList){ this.oriFormContentList = oriFormContentList; - return this; + return this; } - /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @param dupFileName - */ + /** + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @param dupFileName + */ public CertificateCatalogQuery dupFileName(String dupFileName){ setDupFileName(dupFileName); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О - * @param dupFileNameList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍚嶇О + * @param dupFileNameList + */ public CertificateCatalogQuery dupFileNameList(List<String> dupFileNameList){ this.dupFileNameList = dupFileNameList; - return this; + return this; } - /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @param duplicateUrl - */ + /** + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @param duplicateUrl + */ public CertificateCatalogQuery duplicateUrl(String duplicateUrl){ setDuplicateUrl(duplicateUrl); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 - * @param duplicateUrlList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰鏂囦欢鍦板潃 + * @param duplicateUrlList + */ public CertificateCatalogQuery duplicateUrlList(List<String> duplicateUrlList){ this.duplicateUrlList = duplicateUrlList; - return this; + return this; } - /** - * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @param dupFormContent - */ + /** + * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @param dupFormContent + */ public CertificateCatalogQuery dupFormContent(String dupFormContent){ setDupFormContent(dupFormContent); - return this; + return this; } /** - * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 - * @param dupFormContentList - */ + * 璁剧疆 璇佺収妯℃澘鍓湰琛ㄥ崟鍐呭 + * @param dupFormContentList + */ public CertificateCatalogQuery dupFormContentList(List<String> dupFormContentList){ this.dupFormContentList = dupFormContentList; - return this; + return this; } - /** - * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ - * @param exampleUrl - */ + /** + * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ + * @param exampleUrl + */ public CertificateCatalogQuery exampleUrl(String exampleUrl){ setExampleUrl(exampleUrl); - return this; + return this; } /** - * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ - * @param exampleUrlList - */ + * 璁剧疆 璇佺収绀轰緥鍥惧湴鍧€ + * @param exampleUrlList + */ public CertificateCatalogQuery exampleUrlList(List<String> exampleUrlList){ this.exampleUrlList = exampleUrlList; - return this; + return this; } /** - * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param status - */ + * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param status + */ public CertificateCatalogQuery status(Integer status){ - setStatus(status); - return this; - } - - /** - * 璁剧疆 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusStart - */ + setStatus(status); + return this; + } + + /** + * 璁剧疆 寮€濮� 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusStart + */ public CertificateCatalogQuery statusStart(Integer statusStart){ - this.statusStart = statusStart; - return this; + this.statusStart = statusStart; + return this; } /** - * 璁剧疆 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusEnd - */ + * 璁剧疆 缁撴潫 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusEnd + */ public CertificateCatalogQuery statusEnd(Integer statusEnd){ - this.statusEnd = statusEnd; - return this; + this.statusEnd = statusEnd; + return this; } /** - * 璁剧疆 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusIncrement - */ + * 璁剧疆 澧炲姞 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusIncrement + */ public CertificateCatalogQuery statusIncrement(Integer statusIncrement){ - this.statusIncrement = statusIncrement; - return this; + this.statusIncrement = statusIncrement; + return this; } /** - * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� - * @param statusList - */ + * 璁剧疆 璇佺収鐘舵€侊紝0锛氱鐢�1锛氬惎鐢� + * @param statusList + */ public CertificateCatalogQuery statusList(List<Integer> statusList){ this.statusList = statusList; - return this; - } + return this; + } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserId - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserId + */ public CertificateCatalogQuery createUserId(Long createUserId){ - setCreateUserId(createUserId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 - * @param createUserIdStart - */ + setCreateUserId(createUserId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 + * @param createUserIdStart + */ public CertificateCatalogQuery createUserIdStart(Long createUserIdStart){ - this.createUserIdStart = createUserIdStart; - return this; + this.createUserIdStart = createUserIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 - * @param createUserIdEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 + * @param createUserIdEnd + */ public CertificateCatalogQuery createUserIdEnd(Long createUserIdEnd){ - this.createUserIdEnd = createUserIdEnd; - return this; + this.createUserIdEnd = createUserIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 - * @param createUserIdIncrement - */ + * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 + * @param createUserIdIncrement + */ public CertificateCatalogQuery createUserIdIncrement(Long createUserIdIncrement){ - this.createUserIdIncrement = createUserIdIncrement; - return this; + this.createUserIdIncrement = createUserIdIncrement; + return this; } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserIdList - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserIdList + */ public CertificateCatalogQuery createUserIdList(List<Long> createUserIdList){ this.createUserIdList = createUserIdList; - return this; - } + return this; + } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserId - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserId + */ public CertificateCatalogQuery updateUserId(Long updateUserId){ - setUpdateUserId(updateUserId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 - * @param updateUserIdStart - */ + setUpdateUserId(updateUserId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 + * @param updateUserIdStart + */ public CertificateCatalogQuery updateUserIdStart(Long updateUserIdStart){ - this.updateUserIdStart = updateUserIdStart; - return this; + this.updateUserIdStart = updateUserIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 - * @param updateUserIdEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 + * @param updateUserIdEnd + */ public CertificateCatalogQuery updateUserIdEnd(Long updateUserIdEnd){ - this.updateUserIdEnd = updateUserIdEnd; - return this; + this.updateUserIdEnd = updateUserIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 - * @param updateUserIdIncrement - */ + * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 + * @param updateUserIdIncrement + */ public CertificateCatalogQuery updateUserIdIncrement(Long updateUserIdIncrement){ - this.updateUserIdIncrement = updateUserIdIncrement; - return this; + this.updateUserIdIncrement = updateUserIdIncrement; + return this; } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserIdList - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserIdList + */ public CertificateCatalogQuery updateUserIdList(List<Long> updateUserIdList){ this.updateUserIdList = updateUserIdList; - return this; - } + return this; + } + + /** + * 璁剧疆 鎵撳嵃鏈哄悕绉� + * @param printerName + */ + public CertificateCatalogQuery printerName(String printerName){ + setPrinterName(printerName); + return this; + } + + /** + * 璁剧疆 鎵撳嵃鏈哄悕绉� + * @param printerNameList + */ + public CertificateCatalogQuery printerNameList(List<String> printerNameList){ + this.printerNameList = printerNameList; + return this; + } + + + /** + * 璁剧疆 鎵撳嵃鏈虹綉缁滃湴鍧€ + * @param printerIp + */ + public CertificateCatalogQuery printerIp(String printerIp){ + setPrinterIp(printerIp); + return this; + } + + /** + * 璁剧疆 鎵撳嵃鏈虹綉缁滃湴鍧€ + * @param printerIpList + */ + public CertificateCatalogQuery printerIpList(List<String> printerIpList){ + this.printerIpList = printerIpList; + return this; + } + + + /** + * 璁剧疆 鎵撳嵃鏈虹焊鐩� + * @param paperSource + */ + public CertificateCatalogQuery paperSource(String paperSource){ + setPaperSource(paperSource); + return this; + } + + /** + * 璁剧疆 鎵撳嵃鏈虹焊鐩� + * @param paperSourceList + */ + public CertificateCatalogQuery paperSourceList(List<String> paperSourceList){ + this.paperSourceList = paperSourceList; + return this; + } + /** - * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) - * @return orConditionList - */ + * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) + * @return orConditionList + */ public List<CertificateCatalogQuery> getOrConditionList(){ - return this.orConditionList; + return this.orConditionList; } /** - * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) - * @param orConditionList - */ + * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) + * @param orConditionList + */ public void setOrConditionList(List<CertificateCatalogQuery> orConditionList){ this.orConditionList = orConditionList; } /** - * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) - * @return andConditionList - */ + * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) + * @return andConditionList + */ public List<CertificateCatalogQuery> getAndConditionList(){ return this.andConditionList; } /** - * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) - * @param andConditionList - */ + * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) + * @param andConditionList + */ public void setAndConditionList(List<CertificateCatalogQuery> andConditionList){ this.andConditionList = andConditionList; } diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintLogPdu.java b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintLogPdu.java new file mode 100644 index 0000000..86084a5 --- /dev/null +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintLogPdu.java @@ -0,0 +1,13 @@ +package com.mortals.xhx.module.certificate.pdu; + +import lombok.Data; + +@Data +public class PrintLogPdu { + /** 鎵撳嵃闃熷垪id */ + private Long waitQueueId; + /** 鎵撳嵃缁撴灉 */ + private Integer printStatus; + /** 缁撴灉鎻忚堪 */ + private String statusRemark; +} diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java index 09fb635..7835c67 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java @@ -16,6 +16,7 @@ import com.mortals.xhx.common.key.ParamKey; import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity; import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity; import com.mortals.xhx.module.certificate.pdu.PrintListPdu; +import com.mortals.xhx.module.certificate.pdu.PrintLogPdu; import com.mortals.xhx.module.certificate.pdu.PrintSettingPdu; import com.mortals.xhx.module.certificate.service.CertificateCatalogService; import com.mortals.xhx.module.certificate.service.CertificateClassifyService; @@ -112,22 +113,15 @@ public class CertificatePrintController extends BaseJsonBodyController { /** * 鎵撳嵃鏂囦欢 */ - @RequestMapping(value = {"do"},method = {RequestMethod.POST, RequestMethod.GET}) + @RequestMapping(value = {"log"},method = {RequestMethod.POST, RequestMethod.GET}) @UnAuth - public Rest<Object> print(Long id) { + public Rest<Object> print(@RequestBody PrintLogPdu printLogPdu) { Rest<Object> ret = new Rest(); Map<String, Object> model = new HashMap(); - String busiDesc = "鎵撳嵃璇佷欢"; + String busiDesc = "淇濆瓨鎵撳嵃璁板綍"; int code=1; try { - String rsp = printWaitQueueService.doPrint(id); - JSONObject jsonObject = JSONObject.parseObject(rsp); - if(jsonObject.getString("status").equals("1")){ - model.put("message_info", busiDesc + "鎴愬姛"); - }else { - code = -1; - model.put("message_info", jsonObject.getString("message")); - } + printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark()); model.put("message_info", busiDesc + "鎴愬姛"); this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�"); } catch (Exception var9) { diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java index 6a3cd2c..3c0b9cf 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java @@ -8,278 +8,296 @@ 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-22 -*/ + * 璇佺収鎵撳嵃璁板綍瀹炰綋瀵硅薄 + * + * @author zxfei + * @date 2022-10-26 + */ public class PrintLogEntity extends PrintLogVo { private static final long serialVersionUID = 1L; /** - * 璇佺収鐩綍缂栧彿 - */ + * 璇佺収鐩綍缂栧彿 + */ private String catalogCode; /** - * 璇佺収鍚嶇О - */ + * 璇佺収鍚嶇О + */ private String certificateName; /** - * 璇佺収缂栧彿 - */ + * 璇佺収缂栧彿 + */ private String certificateCode; /** - * 浼佷笟鍚嶇О - */ + * 浼佷笟鍚嶇О + */ private String enterpriseName; /** - * 鎸佹湁鑰呭鍚� - */ + * 鎸佹湁鑰呭鍚� + */ private String holderName; /** - * 鎸佹湁鑰呰瘉浠跺彿鐮� - */ + * 鎸佹湁鑰呰瘉浠跺彿鐮� + */ private String holderIDCardNo; /** - * 鍙栦欢浜哄鍚� - */ + * 鍙栦欢浜哄鍚� + */ private String pickerName; /** - * 鍙栦欢浜鸿瘉浠跺彿鐮� - */ + * 鍙栦欢浜鸿瘉浠跺彿鐮� + */ private String pickerIDCardNo; /** - * 姝f湰鏁� - */ + * 姝f湰鏁� + */ private Integer originalCount; /** - * 鍓湰鏁� - */ + * 鍓湰鏁� + */ private Integer duplicateCount; /** - * 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - */ + * 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + */ private Integer printStatus; /** - * 鎵撳嵃鏃堕棿 - */ + * 鎵撳嵃鏃堕棿 + */ private Date printDate; /** - * 鎵撳嵃璁惧 - */ + * 鎵撳嵃璁惧 + */ private Long deviceId; /** - * 璇佺収鐩綍ID - */ + * 璇佺収鐩綍ID + */ private Long catalogId; + /** + * 鎵撳嵃缁撴灉鎻忚堪 + */ + private String statusRemark; public PrintLogEntity(){} /** - * 鑾峰彇 璇佺収鐩綍缂栧彿 - * @return String - */ + * 鑾峰彇 璇佺収鐩綍缂栧彿 + * @return String + */ public String getCatalogCode(){ return catalogCode; } /** - * 璁剧疆 璇佺収鐩綍缂栧彿 - * @param catalogCode - */ + * 璁剧疆 璇佺収鐩綍缂栧彿 + * @param catalogCode + */ public void setCatalogCode(String catalogCode){ this.catalogCode = catalogCode; } /** - * 鑾峰彇 璇佺収鍚嶇О - * @return String - */ + * 鑾峰彇 璇佺収鍚嶇О + * @return String + */ public String getCertificateName(){ return certificateName; } /** - * 璁剧疆 璇佺収鍚嶇О - * @param certificateName - */ + * 璁剧疆 璇佺収鍚嶇О + * @param certificateName + */ public void setCertificateName(String certificateName){ this.certificateName = certificateName; } /** - * 鑾峰彇 璇佺収缂栧彿 - * @return String - */ + * 鑾峰彇 璇佺収缂栧彿 + * @return String + */ public String getCertificateCode(){ return certificateCode; } /** - * 璁剧疆 璇佺収缂栧彿 - * @param certificateCode - */ + * 璁剧疆 璇佺収缂栧彿 + * @param certificateCode + */ public void setCertificateCode(String certificateCode){ this.certificateCode = certificateCode; } /** - * 鑾峰彇 浼佷笟鍚嶇О - * @return String - */ + * 鑾峰彇 浼佷笟鍚嶇О + * @return String + */ public String getEnterpriseName(){ return enterpriseName; } /** - * 璁剧疆 浼佷笟鍚嶇О - * @param enterpriseName - */ + * 璁剧疆 浼佷笟鍚嶇О + * @param enterpriseName + */ public void setEnterpriseName(String enterpriseName){ this.enterpriseName = enterpriseName; } /** - * 鑾峰彇 鎸佹湁鑰呭鍚� - * @return String - */ + * 鑾峰彇 鎸佹湁鑰呭鍚� + * @return String + */ public String getHolderName(){ return holderName; } /** - * 璁剧疆 鎸佹湁鑰呭鍚� - * @param holderName - */ + * 璁剧疆 鎸佹湁鑰呭鍚� + * @param holderName + */ public void setHolderName(String holderName){ this.holderName = holderName; } /** - * 鑾峰彇 鎸佹湁鑰呰瘉浠跺彿鐮� - * @return String - */ + * 鑾峰彇 鎸佹湁鑰呰瘉浠跺彿鐮� + * @return String + */ public String getHolderIDCardNo(){ return holderIDCardNo; } /** - * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� - * @param holderIDCardNo - */ + * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� + * @param holderIDCardNo + */ public void setHolderIDCardNo(String holderIDCardNo){ this.holderIDCardNo = holderIDCardNo; } /** - * 鑾峰彇 鍙栦欢浜哄鍚� - * @return String - */ + * 鑾峰彇 鍙栦欢浜哄鍚� + * @return String + */ public String getPickerName(){ return pickerName; } /** - * 璁剧疆 鍙栦欢浜哄鍚� - * @param pickerName - */ + * 璁剧疆 鍙栦欢浜哄鍚� + * @param pickerName + */ public void setPickerName(String pickerName){ this.pickerName = pickerName; } /** - * 鑾峰彇 鍙栦欢浜鸿瘉浠跺彿鐮� - * @return String - */ + * 鑾峰彇 鍙栦欢浜鸿瘉浠跺彿鐮� + * @return String + */ public String getPickerIDCardNo(){ return pickerIDCardNo; } /** - * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� - * @param pickerIDCardNo - */ + * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� + * @param pickerIDCardNo + */ public void setPickerIDCardNo(String pickerIDCardNo){ this.pickerIDCardNo = pickerIDCardNo; } /** - * 鑾峰彇 姝f湰鏁� - * @return Integer - */ + * 鑾峰彇 姝f湰鏁� + * @return Integer + */ public Integer getOriginalCount(){ return originalCount; } /** - * 璁剧疆 姝f湰鏁� - * @param originalCount - */ + * 璁剧疆 姝f湰鏁� + * @param originalCount + */ public void setOriginalCount(Integer originalCount){ this.originalCount = originalCount; } /** - * 鑾峰彇 鍓湰鏁� - * @return Integer - */ + * 鑾峰彇 鍓湰鏁� + * @return Integer + */ public Integer getDuplicateCount(){ return duplicateCount; } /** - * 璁剧疆 鍓湰鏁� - * @param duplicateCount - */ + * 璁剧疆 鍓湰鏁� + * @param duplicateCount + */ public void setDuplicateCount(Integer duplicateCount){ this.duplicateCount = duplicateCount; } /** - * 鑾峰彇 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @return Integer - */ + * 鑾峰彇 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @return Integer + */ public Integer getPrintStatus(){ return printStatus; } /** - * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatus - */ + * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatus + */ public void setPrintStatus(Integer printStatus){ this.printStatus = printStatus; } /** - * 鑾峰彇 鎵撳嵃鏃堕棿 - * @return Date - */ + * 鑾峰彇 鎵撳嵃鏃堕棿 + * @return Date + */ public Date getPrintDate(){ return printDate; } /** - * 璁剧疆 鎵撳嵃鏃堕棿 - * @param printDate - */ + * 璁剧疆 鎵撳嵃鏃堕棿 + * @param printDate + */ public void setPrintDate(Date printDate){ this.printDate = printDate; } /** - * 鑾峰彇 鎵撳嵃璁惧 - * @return Long - */ + * 鑾峰彇 鎵撳嵃璁惧 + * @return Long + */ public Long getDeviceId(){ return deviceId; } /** - * 璁剧疆 鎵撳嵃璁惧 - * @param deviceId - */ + * 璁剧疆 鎵撳嵃璁惧 + * @param deviceId + */ public void setDeviceId(Long deviceId){ this.deviceId = deviceId; } /** - * 鑾峰彇 璇佺収鐩綍ID - * @return Long - */ + * 鑾峰彇 璇佺収鐩綍ID + * @return Long + */ public Long getCatalogId(){ return catalogId; } /** - * 璁剧疆 璇佺収鐩綍ID - * @param catalogId - */ + * 璁剧疆 璇佺収鐩綍ID + * @param catalogId + */ public void setCatalogId(Long catalogId){ this.catalogId = catalogId; } + /** + * 鑾峰彇 鎵撳嵃缁撴灉鎻忚堪 + * @return String + */ + public String getStatusRemark(){ + return statusRemark; + } + /** + * 璁剧疆 鎵撳嵃缁撴灉鎻忚堪 + * @param statusRemark + */ + public void setStatusRemark(String statusRemark){ + this.statusRemark = statusRemark; + } @Override public int hashCode() { - return this.getId().hashCode(); + return this.getId().hashCode(); } @Override public boolean equals(Object obj) { @@ -287,7 +305,7 @@ public class PrintLogEntity extends PrintLogVo { if (obj instanceof PrintLogEntity) { PrintLogEntity tmp = (PrintLogEntity) obj; if (this.getId() == tmp.getId()) { - return true; + return true; } } return false; @@ -309,37 +327,40 @@ public class PrintLogEntity extends PrintLogVo { sb.append(",printDate:").append(getPrintDate()); sb.append(",deviceId:").append(getDeviceId()); sb.append(",catalogId:").append(getCatalogId()); + sb.append(",statusRemark:").append(getStatusRemark()); return sb.toString(); } public void initAttrValue(){ - this.catalogCode = ""; + this.catalogCode = ""; + + this.certificateName = ""; - this.certificateName = ""; + this.certificateCode = ""; - this.certificateCode = ""; + this.enterpriseName = ""; - this.enterpriseName = ""; + this.holderName = ""; - this.holderName = ""; + this.holderIDCardNo = ""; - this.holderIDCardNo = ""; + this.pickerName = ""; - this.pickerName = ""; + this.pickerIDCardNo = ""; - this.pickerIDCardNo = ""; + this.originalCount = 0; - this.originalCount = 0; + this.duplicateCount = 0; - this.duplicateCount = 0; + this.printStatus = 1; - this.printStatus = 1; + this.printDate = null; - this.printDate = null; + this.deviceId = null; - this.deviceId = null; + this.catalogId = null; - this.catalogId = null; + this.statusRemark = ""; } } \ No newline at end of file diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java index 5d22230..6246939 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java @@ -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-22 -*/ + * 璇佺収鎵撳嵃璁板綍鏌ヨ瀵硅薄 + * + * @author zxfei + * @date 2022-10-26 + */ public class PrintLogQuery extends PrintLogEntity { /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */ private Long idStart; @@ -148,6 +148,9 @@ public class PrintLogQuery extends PrintLogEntity { /** 璇佺収鐩綍ID鍒楄〃 */ private List <Long> catalogIdList; + /** 鎵撳嵃缁撴灉鎻忚堪 */ + private List<String> statusRemarkList; + /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ private List<PrintLogQuery> orConditionList; @@ -157,1276 +160,1310 @@ public class PrintLogQuery extends PrintLogEntity { public PrintLogQuery(){} /** - * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @return idStart - */ + * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @return idStart + */ public Long getIdStart(){ return this.idStart; } /** - * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @param idStart - */ + * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @param idStart + */ public void setIdStart(Long idStart){ this.idStart = idStart; } /** - * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @return $idEnd - */ + * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @return $idEnd + */ public Long getIdEnd(){ return this.idEnd; } /** - * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @param idEnd - */ + * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @param idEnd + */ public void setIdEnd(Long idEnd){ this.idEnd = idEnd; } /** - * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @return idIncrement - */ + * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @return idIncrement + */ public Long getIdIncrement(){ return this.idIncrement; } /** - * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @param idIncrement - */ + * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @param idIncrement + */ public void setIdIncrement(Long idIncrement){ this.idIncrement = idIncrement; } /** - * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀� - * @return idList - */ + * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀� + * @return idList + */ public List<Long> getIdList(){ return this.idList; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param idList - */ + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param idList + */ public void setIdList(List<Long> idList){ this.idList = idList; } /** - * 鑾峰彇 璇佺収鐩綍缂栧彿 - * @return catalogCodeList - */ + * 鑾峰彇 璇佺収鐩綍缂栧彿 + * @return catalogCodeList + */ public List<String> getCatalogCodeList(){ return this.catalogCodeList; } /** - * 璁剧疆 璇佺収鐩綍缂栧彿 - * @param catalogCodeList - */ + * 璁剧疆 璇佺収鐩綍缂栧彿 + * @param catalogCodeList + */ public void setCatalogCodeList(List<String> catalogCodeList){ this.catalogCodeList = catalogCodeList; } /** - * 鑾峰彇 璇佺収鍚嶇О - * @return certificateNameList - */ + * 鑾峰彇 璇佺収鍚嶇О + * @return certificateNameList + */ public List<String> getCertificateNameList(){ return this.certificateNameList; } /** - * 璁剧疆 璇佺収鍚嶇О - * @param certificateNameList - */ + * 璁剧疆 璇佺収鍚嶇О + * @param certificateNameList + */ public void setCertificateNameList(List<String> certificateNameList){ this.certificateNameList = certificateNameList; } /** - * 鑾峰彇 璇佺収缂栧彿 - * @return certificateCodeList - */ + * 鑾峰彇 璇佺収缂栧彿 + * @return certificateCodeList + */ public List<String> getCertificateCodeList(){ return this.certificateCodeList; } /** - * 璁剧疆 璇佺収缂栧彿 - * @param certificateCodeList - */ + * 璁剧疆 璇佺収缂栧彿 + * @param certificateCodeList + */ public void setCertificateCodeList(List<String> certificateCodeList){ this.certificateCodeList = certificateCodeList; } /** - * 鑾峰彇 浼佷笟鍚嶇О - * @return enterpriseNameList - */ + * 鑾峰彇 浼佷笟鍚嶇О + * @return enterpriseNameList + */ public List<String> getEnterpriseNameList(){ return this.enterpriseNameList; } /** - * 璁剧疆 浼佷笟鍚嶇О - * @param enterpriseNameList - */ + * 璁剧疆 浼佷笟鍚嶇О + * @param enterpriseNameList + */ public void setEnterpriseNameList(List<String> enterpriseNameList){ this.enterpriseNameList = enterpriseNameList; } /** - * 鑾峰彇 鎸佹湁鑰呭鍚� - * @return holderNameList - */ + * 鑾峰彇 鎸佹湁鑰呭鍚� + * @return holderNameList + */ public List<String> getHolderNameList(){ return this.holderNameList; } /** - * 璁剧疆 鎸佹湁鑰呭鍚� - * @param holderNameList - */ + * 璁剧疆 鎸佹湁鑰呭鍚� + * @param holderNameList + */ public void setHolderNameList(List<String> holderNameList){ this.holderNameList = holderNameList; } /** - * 鑾峰彇 鎸佹湁鑰呰瘉浠跺彿鐮� - * @return holderIDCardNoList - */ + * 鑾峰彇 鎸佹湁鑰呰瘉浠跺彿鐮� + * @return holderIDCardNoList + */ public List<String> getHolderIDCardNoList(){ return this.holderIDCardNoList; } /** - * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� - * @param holderIDCardNoList - */ + * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� + * @param holderIDCardNoList + */ public void setHolderIDCardNoList(List<String> holderIDCardNoList){ this.holderIDCardNoList = holderIDCardNoList; } /** - * 鑾峰彇 鍙栦欢浜哄鍚� - * @return pickerNameList - */ + * 鑾峰彇 鍙栦欢浜哄鍚� + * @return pickerNameList + */ public List<String> getPickerNameList(){ return this.pickerNameList; } /** - * 璁剧疆 鍙栦欢浜哄鍚� - * @param pickerNameList - */ + * 璁剧疆 鍙栦欢浜哄鍚� + * @param pickerNameList + */ public void setPickerNameList(List<String> pickerNameList){ this.pickerNameList = pickerNameList; } /** - * 鑾峰彇 鍙栦欢浜鸿瘉浠跺彿鐮� - * @return pickerIDCardNoList - */ + * 鑾峰彇 鍙栦欢浜鸿瘉浠跺彿鐮� + * @return pickerIDCardNoList + */ public List<String> getPickerIDCardNoList(){ return this.pickerIDCardNoList; } /** - * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� - * @param pickerIDCardNoList - */ + * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� + * @param pickerIDCardNoList + */ public void setPickerIDCardNoList(List<String> pickerIDCardNoList){ this.pickerIDCardNoList = pickerIDCardNoList; } /** - * 鑾峰彇 寮€濮� 姝f湰鏁� - * @return originalCountStart - */ + * 鑾峰彇 寮€濮� 姝f湰鏁� + * @return originalCountStart + */ public Integer getOriginalCountStart(){ return this.originalCountStart; } /** - * 璁剧疆 寮€濮� 姝f湰鏁� - * @param originalCountStart - */ + * 璁剧疆 寮€濮� 姝f湰鏁� + * @param originalCountStart + */ public void setOriginalCountStart(Integer originalCountStart){ this.originalCountStart = originalCountStart; } /** - * 鑾峰彇 缁撴潫 姝f湰鏁� - * @return $originalCountEnd - */ + * 鑾峰彇 缁撴潫 姝f湰鏁� + * @return $originalCountEnd + */ public Integer getOriginalCountEnd(){ return this.originalCountEnd; } /** - * 璁剧疆 缁撴潫 姝f湰鏁� - * @param originalCountEnd - */ + * 璁剧疆 缁撴潫 姝f湰鏁� + * @param originalCountEnd + */ public void setOriginalCountEnd(Integer originalCountEnd){ this.originalCountEnd = originalCountEnd; } /** - * 鑾峰彇 澧炲姞 姝f湰鏁� - * @return originalCountIncrement - */ + * 鑾峰彇 澧炲姞 姝f湰鏁� + * @return originalCountIncrement + */ public Integer getOriginalCountIncrement(){ return this.originalCountIncrement; } /** - * 璁剧疆 澧炲姞 姝f湰鏁� - * @param originalCountIncrement - */ + * 璁剧疆 澧炲姞 姝f湰鏁� + * @param originalCountIncrement + */ public void setOriginalCountIncrement(Integer originalCountIncrement){ this.originalCountIncrement = originalCountIncrement; } /** - * 鑾峰彇 姝f湰鏁� - * @return originalCountList - */ + * 鑾峰彇 姝f湰鏁� + * @return originalCountList + */ public List<Integer> getOriginalCountList(){ return this.originalCountList; } /** - * 璁剧疆 姝f湰鏁� - * @param originalCountList - */ + * 璁剧疆 姝f湰鏁� + * @param originalCountList + */ public void setOriginalCountList(List<Integer> originalCountList){ this.originalCountList = originalCountList; } /** - * 鑾峰彇 寮€濮� 鍓湰鏁� - * @return duplicateCountStart - */ + * 鑾峰彇 寮€濮� 鍓湰鏁� + * @return duplicateCountStart + */ public Integer getDuplicateCountStart(){ return this.duplicateCountStart; } /** - * 璁剧疆 寮€濮� 鍓湰鏁� - * @param duplicateCountStart - */ + * 璁剧疆 寮€濮� 鍓湰鏁� + * @param duplicateCountStart + */ public void setDuplicateCountStart(Integer duplicateCountStart){ this.duplicateCountStart = duplicateCountStart; } /** - * 鑾峰彇 缁撴潫 鍓湰鏁� - * @return $duplicateCountEnd - */ + * 鑾峰彇 缁撴潫 鍓湰鏁� + * @return $duplicateCountEnd + */ public Integer getDuplicateCountEnd(){ return this.duplicateCountEnd; } /** - * 璁剧疆 缁撴潫 鍓湰鏁� - * @param duplicateCountEnd - */ + * 璁剧疆 缁撴潫 鍓湰鏁� + * @param duplicateCountEnd + */ public void setDuplicateCountEnd(Integer duplicateCountEnd){ this.duplicateCountEnd = duplicateCountEnd; } /** - * 鑾峰彇 澧炲姞 鍓湰鏁� - * @return duplicateCountIncrement - */ + * 鑾峰彇 澧炲姞 鍓湰鏁� + * @return duplicateCountIncrement + */ public Integer getDuplicateCountIncrement(){ return this.duplicateCountIncrement; } /** - * 璁剧疆 澧炲姞 鍓湰鏁� - * @param duplicateCountIncrement - */ + * 璁剧疆 澧炲姞 鍓湰鏁� + * @param duplicateCountIncrement + */ public void setDuplicateCountIncrement(Integer duplicateCountIncrement){ this.duplicateCountIncrement = duplicateCountIncrement; } /** - * 鑾峰彇 鍓湰鏁� - * @return duplicateCountList - */ + * 鑾峰彇 鍓湰鏁� + * @return duplicateCountList + */ public List<Integer> getDuplicateCountList(){ return this.duplicateCountList; } /** - * 璁剧疆 鍓湰鏁� - * @param duplicateCountList - */ + * 璁剧疆 鍓湰鏁� + * @param duplicateCountList + */ public void setDuplicateCountList(List<Integer> duplicateCountList){ this.duplicateCountList = duplicateCountList; } /** - * 鑾峰彇 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @return printStatusStart - */ + * 鑾峰彇 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @return printStatusStart + */ public Integer getPrintStatusStart(){ return this.printStatusStart; } /** - * 璁剧疆 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusStart - */ + * 璁剧疆 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusStart + */ public void setPrintStatusStart(Integer printStatusStart){ this.printStatusStart = printStatusStart; } /** - * 鑾峰彇 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @return $printStatusEnd - */ + * 鑾峰彇 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @return $printStatusEnd + */ public Integer getPrintStatusEnd(){ return this.printStatusEnd; } /** - * 璁剧疆 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusEnd - */ + * 璁剧疆 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusEnd + */ public void setPrintStatusEnd(Integer printStatusEnd){ this.printStatusEnd = printStatusEnd; } /** - * 鑾峰彇 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @return printStatusIncrement - */ + * 鑾峰彇 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @return printStatusIncrement + */ public Integer getPrintStatusIncrement(){ return this.printStatusIncrement; } /** - * 璁剧疆 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusIncrement - */ + * 璁剧疆 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusIncrement + */ public void setPrintStatusIncrement(Integer printStatusIncrement){ this.printStatusIncrement = printStatusIncrement; } /** - * 鑾峰彇 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @return printStatusList - */ + * 鑾峰彇 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @return printStatusList + */ public List<Integer> getPrintStatusList(){ return this.printStatusList; } /** - * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusList - */ + * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusList + */ public void setPrintStatusList(List<Integer> printStatusList){ this.printStatusList = printStatusList; } /** - * 鑾峰彇 寮€濮� 鎵撳嵃鏃堕棿 - * @return printDateStart - */ + * 鑾峰彇 寮€濮� 鎵撳嵃鏃堕棿 + * @return printDateStart + */ public String getPrintDateStart(){ return this.printDateStart; } /** - * 璁剧疆 寮€濮� 鎵撳嵃鏃堕棿 - * @param printDateStart - */ + * 璁剧疆 寮€濮� 鎵撳嵃鏃堕棿 + * @param printDateStart + */ public void setPrintDateStart(String printDateStart){ this.printDateStart = printDateStart; } /** - * 鑾峰彇 缁撴潫 鎵撳嵃鏃堕棿 - * @return printDateEnd - */ + * 鑾峰彇 缁撴潫 鎵撳嵃鏃堕棿 + * @return printDateEnd + */ public String getPrintDateEnd(){ return this.printDateEnd; } /** - * 璁剧疆 缁撴潫 鎵撳嵃鏃堕棿 - * @param printDateEnd - */ + * 璁剧疆 缁撴潫 鎵撳嵃鏃堕棿 + * @param printDateEnd + */ public void setPrintDateEnd(String printDateEnd){ this.printDateEnd = printDateEnd; } /** - * 鑾峰彇 寮€濮� 鎵撳嵃璁惧 - * @return deviceIdStart - */ + * 鑾峰彇 寮€濮� 鎵撳嵃璁惧 + * @return deviceIdStart + */ public Long getDeviceIdStart(){ return this.deviceIdStart; } /** - * 璁剧疆 寮€濮� 鎵撳嵃璁惧 - * @param deviceIdStart - */ + * 璁剧疆 寮€濮� 鎵撳嵃璁惧 + * @param deviceIdStart + */ public void setDeviceIdStart(Long deviceIdStart){ this.deviceIdStart = deviceIdStart; } /** - * 鑾峰彇 缁撴潫 鎵撳嵃璁惧 - * @return $deviceIdEnd - */ + * 鑾峰彇 缁撴潫 鎵撳嵃璁惧 + * @return $deviceIdEnd + */ public Long getDeviceIdEnd(){ return this.deviceIdEnd; } /** - * 璁剧疆 缁撴潫 鎵撳嵃璁惧 - * @param deviceIdEnd - */ + * 璁剧疆 缁撴潫 鎵撳嵃璁惧 + * @param deviceIdEnd + */ public void setDeviceIdEnd(Long deviceIdEnd){ this.deviceIdEnd = deviceIdEnd; } /** - * 鑾峰彇 澧炲姞 鎵撳嵃璁惧 - * @return deviceIdIncrement - */ + * 鑾峰彇 澧炲姞 鎵撳嵃璁惧 + * @return deviceIdIncrement + */ public Long getDeviceIdIncrement(){ return this.deviceIdIncrement; } /** - * 璁剧疆 澧炲姞 鎵撳嵃璁惧 - * @param deviceIdIncrement - */ + * 璁剧疆 澧炲姞 鎵撳嵃璁惧 + * @param deviceIdIncrement + */ public void setDeviceIdIncrement(Long deviceIdIncrement){ this.deviceIdIncrement = deviceIdIncrement; } /** - * 鑾峰彇 鎵撳嵃璁惧 - * @return deviceIdList - */ + * 鑾峰彇 鎵撳嵃璁惧 + * @return deviceIdList + */ public List<Long> getDeviceIdList(){ return this.deviceIdList; } /** - * 璁剧疆 鎵撳嵃璁惧 - * @param deviceIdList - */ + * 璁剧疆 鎵撳嵃璁惧 + * @param deviceIdList + */ public void setDeviceIdList(List<Long> deviceIdList){ this.deviceIdList = deviceIdList; } /** - * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛 - * @return createUserIdStart - */ + * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛 + * @return createUserIdStart + */ public Long getCreateUserIdStart(){ return this.createUserIdStart; } /** - * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 - * @param createUserIdStart - */ + * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 + * @param createUserIdStart + */ public void setCreateUserIdStart(Long createUserIdStart){ this.createUserIdStart = createUserIdStart; } /** - * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛 - * @return $createUserIdEnd - */ + * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛 + * @return $createUserIdEnd + */ public Long getCreateUserIdEnd(){ return this.createUserIdEnd; } /** - * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 - * @param createUserIdEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 + * @param createUserIdEnd + */ public void setCreateUserIdEnd(Long createUserIdEnd){ this.createUserIdEnd = createUserIdEnd; } /** - * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛 - * @return createUserIdIncrement - */ + * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛 + * @return createUserIdIncrement + */ public Long getCreateUserIdIncrement(){ return this.createUserIdIncrement; } /** - * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 - * @param createUserIdIncrement - */ + * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 + * @param createUserIdIncrement + */ public void setCreateUserIdIncrement(Long createUserIdIncrement){ this.createUserIdIncrement = createUserIdIncrement; } /** - * 鑾峰彇 鍒涘缓鐢ㄦ埛 - * @return createUserIdList - */ + * 鑾峰彇 鍒涘缓鐢ㄦ埛 + * @return createUserIdList + */ public List<Long> getCreateUserIdList(){ return this.createUserIdList; } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserIdList - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserIdList + */ public void setCreateUserIdList(List<Long> createUserIdList){ this.createUserIdList = createUserIdList; } /** - * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿 - * @return createTimeStart - */ + * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿 + * @return createTimeStart + */ public String getCreateTimeStart(){ return this.createTimeStart; } /** - * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿 - * @param createTimeStart - */ + * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿 + * @param createTimeStart + */ public void setCreateTimeStart(String createTimeStart){ this.createTimeStart = createTimeStart; } /** - * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿 - * @return createTimeEnd - */ + * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿 + * @return createTimeEnd + */ public String getCreateTimeEnd(){ return this.createTimeEnd; } /** - * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿 - * @param createTimeEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿 + * @param createTimeEnd + */ public void setCreateTimeEnd(String createTimeEnd){ this.createTimeEnd = createTimeEnd; } /** - * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛 - * @return updateUserIdStart - */ + * 鑾峰彇 寮€濮� 鏇存柊鐢ㄦ埛 + * @return updateUserIdStart + */ public Long getUpdateUserIdStart(){ return this.updateUserIdStart; } /** - * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 - * @param updateUserIdStart - */ + * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 + * @param updateUserIdStart + */ public void setUpdateUserIdStart(Long updateUserIdStart){ this.updateUserIdStart = updateUserIdStart; } /** - * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛 - * @return $updateUserIdEnd - */ + * 鑾峰彇 缁撴潫 鏇存柊鐢ㄦ埛 + * @return $updateUserIdEnd + */ public Long getUpdateUserIdEnd(){ return this.updateUserIdEnd; } /** - * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 - * @param updateUserIdEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 + * @param updateUserIdEnd + */ public void setUpdateUserIdEnd(Long updateUserIdEnd){ this.updateUserIdEnd = updateUserIdEnd; } /** - * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛 - * @return updateUserIdIncrement - */ + * 鑾峰彇 澧炲姞 鏇存柊鐢ㄦ埛 + * @return updateUserIdIncrement + */ public Long getUpdateUserIdIncrement(){ return this.updateUserIdIncrement; } /** - * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 - * @param updateUserIdIncrement - */ + * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 + * @param updateUserIdIncrement + */ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ this.updateUserIdIncrement = updateUserIdIncrement; } /** - * 鑾峰彇 鏇存柊鐢ㄦ埛 - * @return updateUserIdList - */ + * 鑾峰彇 鏇存柊鐢ㄦ埛 + * @return updateUserIdList + */ public List<Long> getUpdateUserIdList(){ return this.updateUserIdList; } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserIdList - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserIdList + */ public void setUpdateUserIdList(List<Long> updateUserIdList){ this.updateUserIdList = updateUserIdList; } /** - * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿 - * @return updateTimeStart - */ + * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿 + * @return updateTimeStart + */ public String getUpdateTimeStart(){ return this.updateTimeStart; } /** - * 璁剧疆 寮€濮� 鏇存柊鏃堕棿 - * @param updateTimeStart - */ + * 璁剧疆 寮€濮� 鏇存柊鏃堕棿 + * @param updateTimeStart + */ public void setUpdateTimeStart(String updateTimeStart){ this.updateTimeStart = updateTimeStart; } /** - * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿 - * @return updateTimeEnd - */ + * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿 + * @return updateTimeEnd + */ public String getUpdateTimeEnd(){ return this.updateTimeEnd; } /** - * 璁剧疆 缁撴潫 鏇存柊鏃堕棿 - * @param updateTimeEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鏃堕棿 + * @param updateTimeEnd + */ public void setUpdateTimeEnd(String updateTimeEnd){ this.updateTimeEnd = updateTimeEnd; } /** - * 鑾峰彇 寮€濮� 璇佺収鐩綍ID - * @return catalogIdStart - */ + * 鑾峰彇 寮€濮� 璇佺収鐩綍ID + * @return catalogIdStart + */ public Long getCatalogIdStart(){ return this.catalogIdStart; } /** - * 璁剧疆 寮€濮� 璇佺収鐩綍ID - * @param catalogIdStart - */ + * 璁剧疆 寮€濮� 璇佺収鐩綍ID + * @param catalogIdStart + */ public void setCatalogIdStart(Long catalogIdStart){ this.catalogIdStart = catalogIdStart; } /** - * 鑾峰彇 缁撴潫 璇佺収鐩綍ID - * @return $catalogIdEnd - */ + * 鑾峰彇 缁撴潫 璇佺収鐩綍ID + * @return $catalogIdEnd + */ public Long getCatalogIdEnd(){ return this.catalogIdEnd; } /** - * 璁剧疆 缁撴潫 璇佺収鐩綍ID - * @param catalogIdEnd - */ + * 璁剧疆 缁撴潫 璇佺収鐩綍ID + * @param catalogIdEnd + */ public void setCatalogIdEnd(Long catalogIdEnd){ this.catalogIdEnd = catalogIdEnd; } /** - * 鑾峰彇 澧炲姞 璇佺収鐩綍ID - * @return catalogIdIncrement - */ + * 鑾峰彇 澧炲姞 璇佺収鐩綍ID + * @return catalogIdIncrement + */ public Long getCatalogIdIncrement(){ return this.catalogIdIncrement; } /** - * 璁剧疆 澧炲姞 璇佺収鐩綍ID - * @param catalogIdIncrement - */ + * 璁剧疆 澧炲姞 璇佺収鐩綍ID + * @param catalogIdIncrement + */ public void setCatalogIdIncrement(Long catalogIdIncrement){ this.catalogIdIncrement = catalogIdIncrement; } /** - * 鑾峰彇 璇佺収鐩綍ID - * @return catalogIdList - */ + * 鑾峰彇 璇佺収鐩綍ID + * @return catalogIdList + */ public List<Long> getCatalogIdList(){ return this.catalogIdList; } /** - * 璁剧疆 璇佺収鐩綍ID - * @param catalogIdList - */ + * 璁剧疆 璇佺収鐩綍ID + * @param catalogIdList + */ public void setCatalogIdList(List<Long> catalogIdList){ this.catalogIdList = catalogIdList; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param id - */ + * 鑾峰彇 鎵撳嵃缁撴灉鎻忚堪 + * @return statusRemarkList + */ + public List<String> getStatusRemarkList(){ + return this.statusRemarkList; + } + + /** + * 璁剧疆 鎵撳嵃缁撴灉鎻忚堪 + * @param statusRemarkList + */ + public void setStatusRemarkList(List<String> statusRemarkList){ + this.statusRemarkList = statusRemarkList; + } + /** + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param id + */ public PrintLogQuery id(Long id){ - setId(id); - return this; - } - - /** - * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� - * @param idStart - */ + setId(id); + return this; + } + + /** + * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀� + * @param idStart + */ public PrintLogQuery idStart(Long idStart){ - this.idStart = idStart; - return this; + this.idStart = idStart; + return this; } /** - * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� - * @param idEnd - */ + * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀� + * @param idEnd + */ public PrintLogQuery idEnd(Long idEnd){ - this.idEnd = idEnd; - return this; + this.idEnd = idEnd; + return this; } /** - * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� - * @param idIncrement - */ + * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀� + * @param idIncrement + */ public PrintLogQuery idIncrement(Long idIncrement){ - this.idIncrement = idIncrement; - return this; + this.idIncrement = idIncrement; + return this; } /** - * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� - * @param idList - */ + * 璁剧疆 搴忓彿锛屼富閿紝鑷闀� + * @param idList + */ public PrintLogQuery idList(List<Long> idList){ this.idList = idList; - return this; - } + return this; + } - /** - * 璁剧疆 璇佺収鐩綍缂栧彿 - * @param catalogCode - */ + /** + * 璁剧疆 璇佺収鐩綍缂栧彿 + * @param catalogCode + */ public PrintLogQuery catalogCode(String catalogCode){ setCatalogCode(catalogCode); - return this; + return this; } /** - * 璁剧疆 璇佺収鐩綍缂栧彿 - * @param catalogCodeList - */ + * 璁剧疆 璇佺収鐩綍缂栧彿 + * @param catalogCodeList + */ public PrintLogQuery catalogCodeList(List<String> catalogCodeList){ this.catalogCodeList = catalogCodeList; - return this; + return this; } - /** - * 璁剧疆 璇佺収鍚嶇О - * @param certificateName - */ + /** + * 璁剧疆 璇佺収鍚嶇О + * @param certificateName + */ public PrintLogQuery certificateName(String certificateName){ setCertificateName(certificateName); - return this; + return this; } /** - * 璁剧疆 璇佺収鍚嶇О - * @param certificateNameList - */ + * 璁剧疆 璇佺収鍚嶇О + * @param certificateNameList + */ public PrintLogQuery certificateNameList(List<String> certificateNameList){ this.certificateNameList = certificateNameList; - return this; + return this; } - /** - * 璁剧疆 璇佺収缂栧彿 - * @param certificateCode - */ + /** + * 璁剧疆 璇佺収缂栧彿 + * @param certificateCode + */ public PrintLogQuery certificateCode(String certificateCode){ setCertificateCode(certificateCode); - return this; + return this; } /** - * 璁剧疆 璇佺収缂栧彿 - * @param certificateCodeList - */ + * 璁剧疆 璇佺収缂栧彿 + * @param certificateCodeList + */ public PrintLogQuery certificateCodeList(List<String> certificateCodeList){ this.certificateCodeList = certificateCodeList; - return this; + return this; } - /** - * 璁剧疆 浼佷笟鍚嶇О - * @param enterpriseName - */ + /** + * 璁剧疆 浼佷笟鍚嶇О + * @param enterpriseName + */ public PrintLogQuery enterpriseName(String enterpriseName){ setEnterpriseName(enterpriseName); - return this; + return this; } /** - * 璁剧疆 浼佷笟鍚嶇О - * @param enterpriseNameList - */ + * 璁剧疆 浼佷笟鍚嶇О + * @param enterpriseNameList + */ public PrintLogQuery enterpriseNameList(List<String> enterpriseNameList){ this.enterpriseNameList = enterpriseNameList; - return this; + return this; } - /** - * 璁剧疆 鎸佹湁鑰呭鍚� - * @param holderName - */ + /** + * 璁剧疆 鎸佹湁鑰呭鍚� + * @param holderName + */ public PrintLogQuery holderName(String holderName){ setHolderName(holderName); - return this; + return this; } /** - * 璁剧疆 鎸佹湁鑰呭鍚� - * @param holderNameList - */ + * 璁剧疆 鎸佹湁鑰呭鍚� + * @param holderNameList + */ public PrintLogQuery holderNameList(List<String> holderNameList){ this.holderNameList = holderNameList; - return this; + return this; } - /** - * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� - * @param holderIDCardNo - */ + /** + * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� + * @param holderIDCardNo + */ public PrintLogQuery holderIDCardNo(String holderIDCardNo){ setHolderIDCardNo(holderIDCardNo); - return this; + return this; } /** - * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� - * @param holderIDCardNoList - */ + * 璁剧疆 鎸佹湁鑰呰瘉浠跺彿鐮� + * @param holderIDCardNoList + */ public PrintLogQuery holderIDCardNoList(List<String> holderIDCardNoList){ this.holderIDCardNoList = holderIDCardNoList; - return this; + return this; } - /** - * 璁剧疆 鍙栦欢浜哄鍚� - * @param pickerName - */ + /** + * 璁剧疆 鍙栦欢浜哄鍚� + * @param pickerName + */ public PrintLogQuery pickerName(String pickerName){ setPickerName(pickerName); - return this; + return this; } /** - * 璁剧疆 鍙栦欢浜哄鍚� - * @param pickerNameList - */ + * 璁剧疆 鍙栦欢浜哄鍚� + * @param pickerNameList + */ public PrintLogQuery pickerNameList(List<String> pickerNameList){ this.pickerNameList = pickerNameList; - return this; + return this; } - /** - * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� - * @param pickerIDCardNo - */ + /** + * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� + * @param pickerIDCardNo + */ public PrintLogQuery pickerIDCardNo(String pickerIDCardNo){ setPickerIDCardNo(pickerIDCardNo); - return this; + return this; } /** - * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� - * @param pickerIDCardNoList - */ + * 璁剧疆 鍙栦欢浜鸿瘉浠跺彿鐮� + * @param pickerIDCardNoList + */ public PrintLogQuery pickerIDCardNoList(List<String> pickerIDCardNoList){ this.pickerIDCardNoList = pickerIDCardNoList; - return this; + return this; } /** - * 璁剧疆 姝f湰鏁� - * @param originalCount - */ + * 璁剧疆 姝f湰鏁� + * @param originalCount + */ public PrintLogQuery originalCount(Integer originalCount){ - setOriginalCount(originalCount); - return this; - } - - /** - * 璁剧疆 寮€濮� 姝f湰鏁� - * @param originalCountStart - */ + setOriginalCount(originalCount); + return this; + } + + /** + * 璁剧疆 寮€濮� 姝f湰鏁� + * @param originalCountStart + */ public PrintLogQuery originalCountStart(Integer originalCountStart){ - this.originalCountStart = originalCountStart; - return this; + this.originalCountStart = originalCountStart; + return this; } /** - * 璁剧疆 缁撴潫 姝f湰鏁� - * @param originalCountEnd - */ + * 璁剧疆 缁撴潫 姝f湰鏁� + * @param originalCountEnd + */ public PrintLogQuery originalCountEnd(Integer originalCountEnd){ - this.originalCountEnd = originalCountEnd; - return this; + this.originalCountEnd = originalCountEnd; + return this; } /** - * 璁剧疆 澧炲姞 姝f湰鏁� - * @param originalCountIncrement - */ + * 璁剧疆 澧炲姞 姝f湰鏁� + * @param originalCountIncrement + */ public PrintLogQuery originalCountIncrement(Integer originalCountIncrement){ - this.originalCountIncrement = originalCountIncrement; - return this; + this.originalCountIncrement = originalCountIncrement; + return this; } /** - * 璁剧疆 姝f湰鏁� - * @param originalCountList - */ + * 璁剧疆 姝f湰鏁� + * @param originalCountList + */ public PrintLogQuery originalCountList(List<Integer> originalCountList){ this.originalCountList = originalCountList; - return this; - } + return this; + } /** - * 璁剧疆 鍓湰鏁� - * @param duplicateCount - */ + * 璁剧疆 鍓湰鏁� + * @param duplicateCount + */ public PrintLogQuery duplicateCount(Integer duplicateCount){ - setDuplicateCount(duplicateCount); - return this; - } - - /** - * 璁剧疆 寮€濮� 鍓湰鏁� - * @param duplicateCountStart - */ + setDuplicateCount(duplicateCount); + return this; + } + + /** + * 璁剧疆 寮€濮� 鍓湰鏁� + * @param duplicateCountStart + */ public PrintLogQuery duplicateCountStart(Integer duplicateCountStart){ - this.duplicateCountStart = duplicateCountStart; - return this; + this.duplicateCountStart = duplicateCountStart; + return this; } /** - * 璁剧疆 缁撴潫 鍓湰鏁� - * @param duplicateCountEnd - */ + * 璁剧疆 缁撴潫 鍓湰鏁� + * @param duplicateCountEnd + */ public PrintLogQuery duplicateCountEnd(Integer duplicateCountEnd){ - this.duplicateCountEnd = duplicateCountEnd; - return this; + this.duplicateCountEnd = duplicateCountEnd; + return this; } /** - * 璁剧疆 澧炲姞 鍓湰鏁� - * @param duplicateCountIncrement - */ + * 璁剧疆 澧炲姞 鍓湰鏁� + * @param duplicateCountIncrement + */ public PrintLogQuery duplicateCountIncrement(Integer duplicateCountIncrement){ - this.duplicateCountIncrement = duplicateCountIncrement; - return this; + this.duplicateCountIncrement = duplicateCountIncrement; + return this; } /** - * 璁剧疆 鍓湰鏁� - * @param duplicateCountList - */ + * 璁剧疆 鍓湰鏁� + * @param duplicateCountList + */ public PrintLogQuery duplicateCountList(List<Integer> duplicateCountList){ this.duplicateCountList = duplicateCountList; - return this; - } + return this; + } /** - * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatus - */ + * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatus + */ public PrintLogQuery printStatus(Integer printStatus){ - setPrintStatus(printStatus); - return this; - } - - /** - * 璁剧疆 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusStart - */ + setPrintStatus(printStatus); + return this; + } + + /** + * 璁剧疆 寮€濮� 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusStart + */ public PrintLogQuery printStatusStart(Integer printStatusStart){ - this.printStatusStart = printStatusStart; - return this; + this.printStatusStart = printStatusStart; + return this; } /** - * 璁剧疆 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusEnd - */ + * 璁剧疆 缁撴潫 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusEnd + */ public PrintLogQuery printStatusEnd(Integer printStatusEnd){ - this.printStatusEnd = printStatusEnd; - return this; + this.printStatusEnd = printStatusEnd; + return this; } /** - * 璁剧疆 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusIncrement - */ + * 璁剧疆 澧炲姞 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusIncrement + */ public PrintLogQuery printStatusIncrement(Integer printStatusIncrement){ - this.printStatusIncrement = printStatusIncrement; - return this; + this.printStatusIncrement = printStatusIncrement; + return this; } /** - * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 - * @param printStatusList - */ + * 璁剧疆 鎵撳嵃鐘舵€�1鎵撳嵃鎴愬姛2澶辫触 + * @param printStatusList + */ public PrintLogQuery printStatusList(List<Integer> printStatusList){ this.printStatusList = printStatusList; - return this; - } + return this; + } /** - * 璁剧疆 鎵撳嵃璁惧 - * @param deviceId - */ + * 璁剧疆 鎵撳嵃璁惧 + * @param deviceId + */ public PrintLogQuery deviceId(Long deviceId){ - setDeviceId(deviceId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鎵撳嵃璁惧 - * @param deviceIdStart - */ + setDeviceId(deviceId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鎵撳嵃璁惧 + * @param deviceIdStart + */ public PrintLogQuery deviceIdStart(Long deviceIdStart){ - this.deviceIdStart = deviceIdStart; - return this; + this.deviceIdStart = deviceIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鎵撳嵃璁惧 - * @param deviceIdEnd - */ + * 璁剧疆 缁撴潫 鎵撳嵃璁惧 + * @param deviceIdEnd + */ public PrintLogQuery deviceIdEnd(Long deviceIdEnd){ - this.deviceIdEnd = deviceIdEnd; - return this; + this.deviceIdEnd = deviceIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鎵撳嵃璁惧 - * @param deviceIdIncrement - */ + * 璁剧疆 澧炲姞 鎵撳嵃璁惧 + * @param deviceIdIncrement + */ public PrintLogQuery deviceIdIncrement(Long deviceIdIncrement){ - this.deviceIdIncrement = deviceIdIncrement; - return this; + this.deviceIdIncrement = deviceIdIncrement; + return this; } /** - * 璁剧疆 鎵撳嵃璁惧 - * @param deviceIdList - */ + * 璁剧疆 鎵撳嵃璁惧 + * @param deviceIdList + */ public PrintLogQuery deviceIdList(List<Long> deviceIdList){ this.deviceIdList = deviceIdList; - return this; - } + return this; + } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserId - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserId + */ public PrintLogQuery createUserId(Long createUserId){ - setCreateUserId(createUserId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 - * @param createUserIdStart - */ + setCreateUserId(createUserId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛 + * @param createUserIdStart + */ public PrintLogQuery createUserIdStart(Long createUserIdStart){ - this.createUserIdStart = createUserIdStart; - return this; + this.createUserIdStart = createUserIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 - * @param createUserIdEnd - */ + * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛 + * @param createUserIdEnd + */ public PrintLogQuery createUserIdEnd(Long createUserIdEnd){ - this.createUserIdEnd = createUserIdEnd; - return this; + this.createUserIdEnd = createUserIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 - * @param createUserIdIncrement - */ + * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛 + * @param createUserIdIncrement + */ public PrintLogQuery createUserIdIncrement(Long createUserIdIncrement){ - this.createUserIdIncrement = createUserIdIncrement; - return this; + this.createUserIdIncrement = createUserIdIncrement; + return this; } /** - * 璁剧疆 鍒涘缓鐢ㄦ埛 - * @param createUserIdList - */ + * 璁剧疆 鍒涘缓鐢ㄦ埛 + * @param createUserIdList + */ public PrintLogQuery createUserIdList(List<Long> createUserIdList){ this.createUserIdList = createUserIdList; - return this; - } + return this; + } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserId - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserId + */ public PrintLogQuery updateUserId(Long updateUserId){ - setUpdateUserId(updateUserId); - return this; - } - - /** - * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 - * @param updateUserIdStart - */ + setUpdateUserId(updateUserId); + return this; + } + + /** + * 璁剧疆 寮€濮� 鏇存柊鐢ㄦ埛 + * @param updateUserIdStart + */ public PrintLogQuery updateUserIdStart(Long updateUserIdStart){ - this.updateUserIdStart = updateUserIdStart; - return this; + this.updateUserIdStart = updateUserIdStart; + return this; } /** - * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 - * @param updateUserIdEnd - */ + * 璁剧疆 缁撴潫 鏇存柊鐢ㄦ埛 + * @param updateUserIdEnd + */ public PrintLogQuery updateUserIdEnd(Long updateUserIdEnd){ - this.updateUserIdEnd = updateUserIdEnd; - return this; + this.updateUserIdEnd = updateUserIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 - * @param updateUserIdIncrement - */ + * 璁剧疆 澧炲姞 鏇存柊鐢ㄦ埛 + * @param updateUserIdIncrement + */ public PrintLogQuery updateUserIdIncrement(Long updateUserIdIncrement){ - this.updateUserIdIncrement = updateUserIdIncrement; - return this; + this.updateUserIdIncrement = updateUserIdIncrement; + return this; } /** - * 璁剧疆 鏇存柊鐢ㄦ埛 - * @param updateUserIdList - */ + * 璁剧疆 鏇存柊鐢ㄦ埛 + * @param updateUserIdList + */ public PrintLogQuery updateUserIdList(List<Long> updateUserIdList){ this.updateUserIdList = updateUserIdList; - return this; - } + return this; + } /** - * 璁剧疆 璇佺収鐩綍ID - * @param catalogId - */ + * 璁剧疆 璇佺収鐩綍ID + * @param catalogId + */ public PrintLogQuery catalogId(Long catalogId){ - setCatalogId(catalogId); - return this; - } - - /** - * 璁剧疆 寮€濮� 璇佺収鐩綍ID - * @param catalogIdStart - */ + setCatalogId(catalogId); + return this; + } + + /** + * 璁剧疆 寮€濮� 璇佺収鐩綍ID + * @param catalogIdStart + */ public PrintLogQuery catalogIdStart(Long catalogIdStart){ - this.catalogIdStart = catalogIdStart; - return this; + this.catalogIdStart = catalogIdStart; + return this; } /** - * 璁剧疆 缁撴潫 璇佺収鐩綍ID - * @param catalogIdEnd - */ + * 璁剧疆 缁撴潫 璇佺収鐩綍ID + * @param catalogIdEnd + */ public PrintLogQuery catalogIdEnd(Long catalogIdEnd){ - this.catalogIdEnd = catalogIdEnd; - return this; + this.catalogIdEnd = catalogIdEnd; + return this; } /** - * 璁剧疆 澧炲姞 璇佺収鐩綍ID - * @param catalogIdIncrement - */ + * 璁剧疆 澧炲姞 璇佺収鐩綍ID + * @param catalogIdIncrement + */ public PrintLogQuery catalogIdIncrement(Long catalogIdIncrement){ - this.catalogIdIncrement = catalogIdIncrement; - return this; + this.catalogIdIncrement = catalogIdIncrement; + return this; } /** - * 璁剧疆 璇佺収鐩綍ID - * @param catalogIdList - */ + * 璁剧疆 璇佺収鐩綍ID + * @param catalogIdList + */ public PrintLogQuery catalogIdList(List<Long> catalogIdList){ this.catalogIdList = catalogIdList; - return this; - } + 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鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) - * @return orConditionList - */ + * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) + * @return orConditionList + */ public List<PrintLogQuery> getOrConditionList(){ - return this.orConditionList; + return this.orConditionList; } /** - * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) - * @param orConditionList - */ + * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) + * @param orConditionList + */ public void setOrConditionList(List<PrintLogQuery> orConditionList){ this.orConditionList = orConditionList; } /** - * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) - * @return andConditionList - */ + * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) + * @return andConditionList + */ public List<PrintLogQuery> getAndConditionList(){ return this.andConditionList; } /** - * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) - * @param andConditionList - */ + * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) + * @param andConditionList + */ public void setAndConditionList(List<PrintLogQuery> andConditionList){ this.andConditionList = andConditionList; } diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java index f220a88..8efa98a 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java @@ -1,6 +1,8 @@ package com.mortals.xhx.module.record.model.vo; import com.mortals.framework.model.BaseEntityLong; import com.mortals.xhx.module.record.model.PrintWaitQueueEntity; +import lombok.Data; + import java.util.ArrayList; import java.util.List; /** @@ -9,6 +11,18 @@ import java.util.List; * @author zxfei * @date 2022-10-22 */ +@Data public class PrintWaitQueueVo extends BaseEntityLong { - + /** + * 鎵撳嵃鏈哄悕绉� + */ + private String printerName; + /** + * 鎵撳嵃鏈虹綉缁滃湴鍧€ + */ + private String printerIp; + /** + * 鎵撳嵃鏈虹焊鐩� + */ + private String paperSource; } \ No newline at end of file diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java index 1e8e519..9887cba 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java @@ -27,5 +27,5 @@ public interface PrintWaitQueueService extends ICRUDService<PrintWaitQueueEntity * 鎵撳嵃鏂囦欢 * @param id */ - String doPrint(Long id); + void doPrint(Long id,int printStatus,String statusRemark); } \ No newline at end of file diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java index efb0a3e..b376b6a 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java @@ -4,6 +4,7 @@ import com.mortals.framework.util.HttpUtil; import com.mortals.xhx.common.code.*; 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.record.dao.PrintLogDao; import com.mortals.xhx.module.record.dao.RetainLogDao; import com.mortals.xhx.module.record.model.ApplyLogEntity; @@ -22,6 +23,7 @@ import com.mortals.xhx.module.record.service.PrintWaitQueueService; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -48,7 +50,18 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait private PrintLogDao printLogDao; @Autowired private RetainLogDao retainLogDao; + @Autowired + private CertificateCatalogService certificateCatalogService; + @Override + protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException { + for(PrintWaitQueueEntity printWaitQueueEntity:list){ + CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId()); + printWaitQueueEntity.setPaperSource(catalogEntity.getPaperSource()); + printWaitQueueEntity.setPrinterIp(catalogEntity.getPrinterIp()); + printWaitQueueEntity.setPrinterName(catalogEntity.getPrinterName()); + } + } @Override public void creatWaitQueueByApply(ApplyLogEntity applyLogEntity, int generateType, Context context) throws AppException { @@ -92,44 +105,55 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait } @Override - public String doPrint(Long id) { + public void doPrint(Long id,int printStatus,String statusRemark) { PrintWaitQueueEntity waitQueueEntity = this.dao.get(id); if(waitQueueEntity==null){ throw new AppException("鏁版嵁涓嶅瓨鍦ㄦ垨宸蹭慨鏀�"); } - String rootPath = this.ip.endsWith("/") ? this.ip : this.ip + "/"; - String filePath = rootPath+waitQueueEntity.getCertificateUrl(); - Map<String,String> printParameter = new HashMap<>(); - printParameter.put("printername","娴嬭瘯鎵撳嵃鏈�");//鎵撳嵃鏈哄悕绉� - printParameter.put("printerip",printIp);//鎵撳嵃鏈虹綉缁滃湴鍧€ - printParameter.put("printerpapersource","1");//鎵撳嵃鏈虹焊鐩� - printParameter.put("printerfile",filePath);//鎵撳嵃鏂囦欢缃戠粶鍦板潃鏍煎紡涓篸oc鏂囦欢鎴杙df鏂囦欢 - try { - //String rsp = HttpUtil.doPost(printApi, printParameter); - String rsp = "{\n" + - " \"status\": \"1\",\n" + - " \"message\": \"鎵撳嵃鎴愬姛\",\n" + - " }"; - JSONObject jsonObject = JSONObject.parseObject(rsp); - if(jsonObject.getString("status").equals("1")){ - doPrintAfter(waitQueueEntity,1); - }else { - doPrintAfter(waitQueueEntity,-1); - //throw new AppException(jsonObject.getString("message")); - } - PrintWaitQueueEntity data = new PrintWaitQueueEntity(); - data.setId(id); + PrintWaitQueueEntity data = new PrintWaitQueueEntity(); + data.setId(id); + data.setPrintStatus(YesNoEnum.YES.getValue()); + if(printStatus==PrintStatus.SUCCESS.getValue()){ + doPrintSuccess(waitQueueEntity); data.setPrintStatus(YesNoEnum.YES.getValue()); - data.setUpdateTime(new Date()); - dao.update(data); - return rsp; - }catch (Throwable e){ - log.error("璋冪敤杩滅▼鎵撳嵃api鎺ュ彛鍑洪敊",e); - throw new AppException("璋冪敤杩滅▼鎵撳嵃api鎺ュ彛鍑洪敊"); + }else { + doPrintFail(waitQueueEntity,statusRemark); + data.setPrintStatus(-1); } + data.setUpdateTime(new Date()); + dao.update(data); + } - private void doPrintAfter(PrintWaitQueueEntity waitQueueEntity,int printResult){ + private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){ + Date now = new Date(); + 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.setCertificateName(waitQueueEntity.getCertificateName()); + printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode()); + printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName()); + printLogEntity.setHolderName(waitQueueEntity.getHolderName()); + printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo()); + printLogEntity.setPickerName(waitQueueEntity.getPickerName()); + printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo()); + + printLogEntity.setPrintDate(now); + printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId()); + printLogEntity.setCreateTime(now); + printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue()); + printLogEntity.setStatusRemark(statusRemark); + printLogDao.insert(printLogEntity); + } + + private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){ RetainLogEntity retainLogEntity = new RetainLogEntity(); Date now = new Date(); retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId()); @@ -172,13 +196,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait printLogEntity.setPrintDate(now); printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId()); printLogEntity.setCreateTime(now); - if(printResult==1){ - //鎵撳嵃鎴愬姛 - printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue()); - retainLogDao.insert(retainLogEntity); - }else { - printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue()); - } + printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue()); + retainLogDao.insert(retainLogEntity); printLogDao.insert(printLogEntity); } } \ No newline at end of file diff --git a/certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml b/certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml index 568725b..8b81c89 100644 --- a/certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml +++ b/certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml @@ -1,118 +1,130 @@ <?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"> <!-- 瀛楁鍜屽睘鎬ф槧灏� --> <resultMap type="CertificateCatalogEntity" id="CertificateCatalogEntity-Map"> - <id property="id" column="id" /> - <result property="catalogName" column="catalogName" /> - <result property="catalogCode" column="catalogCode" /> - <result property="holderType" column="holderType" /> - <result property="industryId" column="industryId" /> - <result property="classifyId" column="classifyId" /> - <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="exampleUrl" column="exampleUrl" /> - <result property="status" column="status" /> - <result property="createUserId" column="createUserId" /> - <result property="createTime" column="createTime" /> - <result property="updateUserId" column="updateUserId" /> - <result property="updateTime" column="updateTime" /> - + <id property="id" column="id" /> + <result property="catalogName" column="catalogName" /> + <result property="catalogCode" column="catalogCode" /> + <result property="holderType" column="holderType" /> + <result property="industryId" column="industryId" /> + <result property="classifyId" column="classifyId" /> + <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="exampleUrl" column="exampleUrl" /> + <result property="status" column="status" /> + <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" /> + </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('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('holderType') or colPickMode == 1 and data.containsKey('holderType')))"> - a.holderType, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('industryId') or colPickMode == 1 and data.containsKey('industryId')))"> - a.industryId, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyId') or colPickMode == 1 and data.containsKey('classifyId')))"> - a.classifyId, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('transverse') or colPickMode == 1 and data.containsKey('transverse')))"> - a.transverse, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('portrait') or colPickMode == 1 and data.containsKey('portrait')))"> - a.portrait, - </if> - <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> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFileName') or colPickMode == 1 and data.containsKey('dupFileName')))"> - a.dupFileName, - </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> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exampleUrl') or colPickMode == 1 and data.containsKey('exampleUrl')))"> - a.exampleUrl, - </if> - <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('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> + <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('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('holderType') or colPickMode == 1 and data.containsKey('holderType')))"> + a.holderType, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('industryId') or colPickMode == 1 and data.containsKey('industryId')))"> + a.industryId, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('classifyId') or colPickMode == 1 and data.containsKey('classifyId')))"> + a.classifyId, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('transverse') or colPickMode == 1 and data.containsKey('transverse')))"> + a.transverse, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('portrait') or colPickMode == 1 and data.containsKey('portrait')))"> + a.portrait, + </if> + <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> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFileName') or colPickMode == 1 and data.containsKey('dupFileName')))"> + a.dupFileName, + </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> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exampleUrl') or colPickMode == 1 and data.containsKey('exampleUrl')))"> + a.exampleUrl, + </if> + <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('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> + <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> </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) + (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,oriFileName,originalUrl,oriFormContent,dupFileName,duplicateUrl,dupFormContent,exampleUrl,status,createUserId,createTime,updateUserId,updateTime,printerName,printerIp,paperSource) VALUES - (#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{oriFileName},#{originalUrl},#{oriFormContent},#{dupFileName},#{duplicateUrl},#{dupFormContent},#{exampleUrl},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) + (#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{oriFileName},#{originalUrl},#{oriFormContent},#{dupFileName},#{duplicateUrl},#{dupFormContent},#{exampleUrl},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{printerName},#{printerIp},#{paperSource}) </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) + (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,oriFileName,originalUrl,oriFormContent,dupFileName,duplicateUrl,dupFormContent,exampleUrl,status,createUserId,createTime,updateUserId,updateTime,printerName,printerIp,paperSource) 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.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}) </foreach> </insert> @@ -209,6 +221,15 @@ <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> + <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> </trim> <trim suffixOverrides="where" suffix=""> where @@ -221,191 +242,212 @@ <update id="updateBatch" parameterType="paramDto"> update mortals_xhx_certificate_catalog as a <trim prefix="set" suffixOverrides=","> - <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="holderType=(case" suffix="ELSE holderType end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('holderType')) or (colPickMode==1 and !item.containsKey('holderType'))"> - when a.id=#{item.id} then #{item.holderType} - </when> - <when test="(colPickMode==0 and item.containsKey('holderTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderTypeIncrement'))"> - when a.id=#{item.id} then ifnull(a.holderType,0) + #{item.holderTypeIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="industryId=(case" suffix="ELSE industryId end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('industryId')) or (colPickMode==1 and !item.containsKey('industryId'))"> - when a.id=#{item.id} then #{item.industryId} - </when> - <when test="(colPickMode==0 and item.containsKey('industryIdIncrement')) or (colPickMode==1 and !item.containsKey('industryIdIncrement'))"> - when a.id=#{item.id} then ifnull(a.industryId,0) + #{item.industryIdIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="classifyId=(case" suffix="ELSE classifyId end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('classifyId')) or (colPickMode==1 and !item.containsKey('classifyId'))"> - when a.id=#{item.id} then #{item.classifyId} - </when> - <when test="(colPickMode==0 and item.containsKey('classifyIdIncrement')) or (colPickMode==1 and !item.containsKey('classifyIdIncrement'))"> - when a.id=#{item.id} then ifnull(a.classifyId,0) + #{item.classifyIdIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="transverse=(case" suffix="ELSE transverse end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('transverse')) or (colPickMode==1 and !item.containsKey('transverse'))"> - when a.id=#{item.id} then #{item.transverse} - </when> - <when test="(colPickMode==0 and item.containsKey('transverseIncrement')) or (colPickMode==1 and !item.containsKey('transverseIncrement'))"> - when a.id=#{item.id} then ifnull(a.transverse,0) + #{item.transverseIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="portrait=(case" suffix="ELSE portrait end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('portrait')) or (colPickMode==1 and !item.containsKey('portrait'))"> - when a.id=#{item.id} then #{item.portrait} - </when> - <when test="(colPickMode==0 and item.containsKey('portraitIncrement')) or (colPickMode==1 and !item.containsKey('portraitIncrement'))"> - when a.id=#{item.id} then ifnull(a.portrait,0) + #{item.portraitIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="inspect=(case" suffix="ELSE inspect end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('inspect')) or (colPickMode==1 and !item.containsKey('inspect'))"> - when a.id=#{item.id} then #{item.inspect} - </when> - <when test="(colPickMode==0 and item.containsKey('inspectIncrement')) or (colPickMode==1 and !item.containsKey('inspectIncrement'))"> - when a.id=#{item.id} then ifnull(a.inspect,0) + #{item.inspectIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="oriFileName=(case" suffix="ELSE oriFileName 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> - </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> - </foreach> - </trim> - <trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent 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> - </foreach> - </trim> - <trim prefix="exampleUrl=(case" suffix="ELSE exampleUrl end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('exampleUrl')) or (colPickMode==1 and !item.containsKey('exampleUrl'))"> - when a.id=#{item.id} then #{item.exampleUrl} - </if> - </foreach> - </trim> - <trim prefix="status=(case" suffix="ELSE status end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <choose> - <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))"> - when a.id=#{item.id} then #{item.status} - </when> - <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))"> - when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement} - </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 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="holderType=(case" suffix="ELSE holderType end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('holderType')) or (colPickMode==1 and !item.containsKey('holderType'))"> + when a.id=#{item.id} then #{item.holderType} + </when> + <when test="(colPickMode==0 and item.containsKey('holderTypeIncrement')) or (colPickMode==1 and !item.containsKey('holderTypeIncrement'))"> + when a.id=#{item.id} then ifnull(a.holderType,0) + #{item.holderTypeIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="industryId=(case" suffix="ELSE industryId end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('industryId')) or (colPickMode==1 and !item.containsKey('industryId'))"> + when a.id=#{item.id} then #{item.industryId} + </when> + <when test="(colPickMode==0 and item.containsKey('industryIdIncrement')) or (colPickMode==1 and !item.containsKey('industryIdIncrement'))"> + when a.id=#{item.id} then ifnull(a.industryId,0) + #{item.industryIdIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="classifyId=(case" suffix="ELSE classifyId end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('classifyId')) or (colPickMode==1 and !item.containsKey('classifyId'))"> + when a.id=#{item.id} then #{item.classifyId} + </when> + <when test="(colPickMode==0 and item.containsKey('classifyIdIncrement')) or (colPickMode==1 and !item.containsKey('classifyIdIncrement'))"> + when a.id=#{item.id} then ifnull(a.classifyId,0) + #{item.classifyIdIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="transverse=(case" suffix="ELSE transverse end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('transverse')) or (colPickMode==1 and !item.containsKey('transverse'))"> + when a.id=#{item.id} then #{item.transverse} + </when> + <when test="(colPickMode==0 and item.containsKey('transverseIncrement')) or (colPickMode==1 and !item.containsKey('transverseIncrement'))"> + when a.id=#{item.id} then ifnull(a.transverse,0) + #{item.transverseIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="portrait=(case" suffix="ELSE portrait end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('portrait')) or (colPickMode==1 and !item.containsKey('portrait'))"> + when a.id=#{item.id} then #{item.portrait} + </when> + <when test="(colPickMode==0 and item.containsKey('portraitIncrement')) or (colPickMode==1 and !item.containsKey('portraitIncrement'))"> + when a.id=#{item.id} then ifnull(a.portrait,0) + #{item.portraitIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="inspect=(case" suffix="ELSE inspect end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('inspect')) or (colPickMode==1 and !item.containsKey('inspect'))"> + when a.id=#{item.id} then #{item.inspect} + </when> + <when test="(colPickMode==0 and item.containsKey('inspectIncrement')) or (colPickMode==1 and !item.containsKey('inspectIncrement'))"> + when a.id=#{item.id} then ifnull(a.inspect,0) + #{item.inspectIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="oriFileName=(case" suffix="ELSE oriFileName 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> + </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> + </foreach> + </trim> + <trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent 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> + </foreach> + </trim> + <trim prefix="exampleUrl=(case" suffix="ELSE exampleUrl end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('exampleUrl')) or (colPickMode==1 and !item.containsKey('exampleUrl'))"> + when a.id=#{item.id} then #{item.exampleUrl} + </if> + </foreach> + </trim> + <trim prefix="status=(case" suffix="ELSE status end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <choose> + <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))"> + when a.id=#{item.id} then #{item.status} + </when> + <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))"> + when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement} + </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 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> where id in <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> @@ -507,499 +549,559 @@ ${_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 test="conditionParamRef.containsKey('id')"> + <if test="conditionParamRef.id != null "> + ${_conditionType_} a.id = #{${_conditionParam_}.id} </if> - <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> - ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} + <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('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 test="conditionParamRef.containsKey('catalogName')"> + <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> + ${_conditionType_} a.catalogName like #{${_conditionParam_}.catalogName} </if> - <if test="conditionParamRef.containsKey('catalogNameList')"> - ${_conditionType_} a.catalogName in - <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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 test="conditionParamRef.containsKey('catalogCode')"> + <if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''"> + ${_conditionType_} a.catalogCode like #{${_conditionParam_}.catalogCode} </if> - <if test="conditionParamRef.containsKey('catalogCodeList')"> - ${_conditionType_} a.catalogCode in - <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.catalogCode == null"> + ${_conditionType_} a.catalogCode is null </if> - <if test="conditionParamRef.containsKey('holderType')"> - <if test="conditionParamRef.holderType != null "> - ${_conditionType_} a.holderType = #{${_conditionParam_}.holderType} - </if> - <if test="conditionParamRef.holderType == null"> - ${_conditionType_} a.holderType is null - </if> - </if> - <if test="conditionParamRef.containsKey('holderTypeList')"> - ${_conditionType_} a.holderType in - <foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null"> - ${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart} + </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('holderType')"> + <if test="conditionParamRef.holderType != null "> + ${_conditionType_} a.holderType = #{${_conditionParam_}.holderType} </if> - <if test="conditionParamRef.containsKey('holderTypeEnd') and conditionParamRef.holderTypeEnd != null"> - ${_conditionType_} a.holderType <![CDATA[ <= ]]> #{${_conditionParam_}.holderTypeEnd} + <if test="conditionParamRef.holderType == null"> + ${_conditionType_} a.holderType is null </if> + </if> + <if test="conditionParamRef.containsKey('holderTypeList')"> + ${_conditionType_} a.holderType in + <foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null"> + ${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart} + </if> + <if test="conditionParamRef.containsKey('holderTypeEnd') and conditionParamRef.holderTypeEnd != null"> + ${_conditionType_} a.holderType <![CDATA[ <= ]]> #{${_conditionParam_}.holderTypeEnd} + </if> - <if test="conditionParamRef.containsKey('industryId')"> - <if test="conditionParamRef.industryId != null "> - ${_conditionType_} a.industryId = #{${_conditionParam_}.industryId} - </if> - <if test="conditionParamRef.industryId == null"> - ${_conditionType_} a.industryId is null - </if> + <if test="conditionParamRef.containsKey('industryId')"> + <if test="conditionParamRef.industryId != null "> + ${_conditionType_} a.industryId = #{${_conditionParam_}.industryId} </if> - <if test="conditionParamRef.containsKey('industryIdList')"> - ${_conditionType_} a.industryId in - <foreach collection="conditionParamRef.industryIdList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('industryIdStart') and conditionParamRef.industryIdStart != null"> - ${_conditionType_} a.industryId <![CDATA[ >= ]]> #{${_conditionParam_}.industryIdStart} - </if> - <if test="conditionParamRef.containsKey('industryIdEnd') and conditionParamRef.industryIdEnd != null"> - ${_conditionType_} a.industryId <![CDATA[ <= ]]> #{${_conditionParam_}.industryIdEnd} + <if test="conditionParamRef.industryId == null"> + ${_conditionType_} a.industryId is null </if> + </if> + <if test="conditionParamRef.containsKey('industryIdList')"> + ${_conditionType_} a.industryId in + <foreach collection="conditionParamRef.industryIdList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('industryIdStart') and conditionParamRef.industryIdStart != null"> + ${_conditionType_} a.industryId <![CDATA[ >= ]]> #{${_conditionParam_}.industryIdStart} + </if> + <if test="conditionParamRef.containsKey('industryIdEnd') and conditionParamRef.industryIdEnd != null"> + ${_conditionType_} a.industryId <![CDATA[ <= ]]> #{${_conditionParam_}.industryIdEnd} + </if> - <if test="conditionParamRef.containsKey('classifyId')"> - <if test="conditionParamRef.classifyId != null "> - ${_conditionType_} a.classifyId = #{${_conditionParam_}.classifyId} - </if> - <if test="conditionParamRef.classifyId == null"> - ${_conditionType_} a.classifyId is null - </if> + <if test="conditionParamRef.containsKey('classifyId')"> + <if test="conditionParamRef.classifyId != null "> + ${_conditionType_} a.classifyId = #{${_conditionParam_}.classifyId} </if> - <if test="conditionParamRef.containsKey('classifyIdList')"> - ${_conditionType_} a.classifyId in - <foreach collection="conditionParamRef.classifyIdList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('classifyIdStart') and conditionParamRef.classifyIdStart != null"> - ${_conditionType_} a.classifyId <![CDATA[ >= ]]> #{${_conditionParam_}.classifyIdStart} - </if> - <if test="conditionParamRef.containsKey('classifyIdEnd') and conditionParamRef.classifyIdEnd != null"> - ${_conditionType_} a.classifyId <![CDATA[ <= ]]> #{${_conditionParam_}.classifyIdEnd} + <if test="conditionParamRef.classifyId == null"> + ${_conditionType_} a.classifyId is null </if> + </if> + <if test="conditionParamRef.containsKey('classifyIdList')"> + ${_conditionType_} a.classifyId in + <foreach collection="conditionParamRef.classifyIdList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('classifyIdStart') and conditionParamRef.classifyIdStart != null"> + ${_conditionType_} a.classifyId <![CDATA[ >= ]]> #{${_conditionParam_}.classifyIdStart} + </if> + <if test="conditionParamRef.containsKey('classifyIdEnd') and conditionParamRef.classifyIdEnd != null"> + ${_conditionType_} a.classifyId <![CDATA[ <= ]]> #{${_conditionParam_}.classifyIdEnd} + </if> - <if test="conditionParamRef.containsKey('transverse')"> - <if test="conditionParamRef.transverse != null "> - ${_conditionType_} a.transverse = #{${_conditionParam_}.transverse} - </if> - <if test="conditionParamRef.transverse == null"> - ${_conditionType_} a.transverse is null - </if> - </if> - <if test="conditionParamRef.containsKey('transverseList')"> - ${_conditionType_} a.transverse in - <foreach collection="conditionParamRef.transverseList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('transverseStart') and conditionParamRef.transverseStart != null"> - ${_conditionType_} a.transverse <![CDATA[ >= ]]> #{${_conditionParam_}.transverseStart} + <if test="conditionParamRef.containsKey('transverse')"> + <if test="conditionParamRef.transverse != null "> + ${_conditionType_} a.transverse = #{${_conditionParam_}.transverse} </if> - <if test="conditionParamRef.containsKey('transverseEnd') and conditionParamRef.transverseEnd != null"> - ${_conditionType_} a.transverse <![CDATA[ <= ]]> #{${_conditionParam_}.transverseEnd} + <if test="conditionParamRef.transverse == null"> + ${_conditionType_} a.transverse is null </if> + </if> + <if test="conditionParamRef.containsKey('transverseList')"> + ${_conditionType_} a.transverse in + <foreach collection="conditionParamRef.transverseList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('transverseStart') and conditionParamRef.transverseStart != null"> + ${_conditionType_} a.transverse <![CDATA[ >= ]]> #{${_conditionParam_}.transverseStart} + </if> + <if test="conditionParamRef.containsKey('transverseEnd') and conditionParamRef.transverseEnd != null"> + ${_conditionType_} a.transverse <![CDATA[ <= ]]> #{${_conditionParam_}.transverseEnd} + </if> - <if test="conditionParamRef.containsKey('portrait')"> - <if test="conditionParamRef.portrait != null "> - ${_conditionType_} a.portrait = #{${_conditionParam_}.portrait} - </if> - <if test="conditionParamRef.portrait == null"> - ${_conditionType_} a.portrait is null - </if> - </if> - <if test="conditionParamRef.containsKey('portraitList')"> - ${_conditionType_} a.portrait in - <foreach collection="conditionParamRef.portraitList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.containsKey('portrait')"> + <if test="conditionParamRef.portrait != null "> + ${_conditionType_} a.portrait = #{${_conditionParam_}.portrait} </if> - <if test="conditionParamRef.containsKey('portraitStart') and conditionParamRef.portraitStart != null"> - ${_conditionType_} a.portrait <![CDATA[ >= ]]> #{${_conditionParam_}.portraitStart} - </if> - <if test="conditionParamRef.containsKey('portraitEnd') and conditionParamRef.portraitEnd != null"> - ${_conditionType_} a.portrait <![CDATA[ <= ]]> #{${_conditionParam_}.portraitEnd} + <if test="conditionParamRef.portrait == null"> + ${_conditionType_} a.portrait is null </if> + </if> + <if test="conditionParamRef.containsKey('portraitList')"> + ${_conditionType_} a.portrait in + <foreach collection="conditionParamRef.portraitList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('portraitStart') and conditionParamRef.portraitStart != null"> + ${_conditionType_} a.portrait <![CDATA[ >= ]]> #{${_conditionParam_}.portraitStart} + </if> + <if test="conditionParamRef.containsKey('portraitEnd') and conditionParamRef.portraitEnd != null"> + ${_conditionType_} a.portrait <![CDATA[ <= ]]> #{${_conditionParam_}.portraitEnd} + </if> - <if test="conditionParamRef.containsKey('inspect')"> - <if test="conditionParamRef.inspect != null "> - ${_conditionType_} a.inspect = #{${_conditionParam_}.inspect} - </if> - <if test="conditionParamRef.inspect == null"> - ${_conditionType_} a.inspect is null - </if> - </if> - <if test="conditionParamRef.containsKey('inspectList')"> - ${_conditionType_} a.inspect in - <foreach collection="conditionParamRef.inspectList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('inspectStart') and conditionParamRef.inspectStart != null"> - ${_conditionType_} a.inspect <![CDATA[ >= ]]> #{${_conditionParam_}.inspectStart} + <if test="conditionParamRef.containsKey('inspect')"> + <if test="conditionParamRef.inspect != null "> + ${_conditionType_} a.inspect = #{${_conditionParam_}.inspect} </if> - <if test="conditionParamRef.containsKey('inspectEnd') and conditionParamRef.inspectEnd != null"> - ${_conditionType_} a.inspect <![CDATA[ <= ]]> #{${_conditionParam_}.inspectEnd} + <if test="conditionParamRef.inspect == null"> + ${_conditionType_} a.inspect is null </if> + </if> + <if test="conditionParamRef.containsKey('inspectList')"> + ${_conditionType_} a.inspect in + <foreach collection="conditionParamRef.inspectList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('inspectStart') and conditionParamRef.inspectStart != null"> + ${_conditionType_} a.inspect <![CDATA[ >= ]]> #{${_conditionParam_}.inspectStart} + </if> + <if test="conditionParamRef.containsKey('inspectEnd') and conditionParamRef.inspectEnd != null"> + ${_conditionType_} a.inspect <![CDATA[ <= ]]> #{${_conditionParam_}.inspectEnd} + </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 test="conditionParamRef.containsKey('oriFileName')"> + <if test="conditionParamRef.oriFileName != null and conditionParamRef.oriFileName != ''"> + ${_conditionType_} a.oriFileName like #{${_conditionParam_}.oriFileName} </if> - <if test="conditionParamRef.containsKey('oriFileNameList')"> - ${_conditionType_} a.oriFileName in - <foreach collection="conditionParamRef.oriFileNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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 test="conditionParamRef.containsKey('originalUrl')"> + <if test="conditionParamRef.originalUrl != null and conditionParamRef.originalUrl != ''"> + ${_conditionType_} a.originalUrl like #{${_conditionParam_}.originalUrl} </if> - <if test="conditionParamRef.containsKey('originalUrlList')"> - ${_conditionType_} a.originalUrl in - <foreach collection="conditionParamRef.originalUrlList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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 test="conditionParamRef.containsKey('oriFormContent')"> + <if test="conditionParamRef.oriFormContent != null and conditionParamRef.oriFormContent != ''"> + ${_conditionType_} a.oriFormContent like #{${_conditionParam_}.oriFormContent} </if> - <if test="conditionParamRef.containsKey('oriFormContentList')"> - ${_conditionType_} a.oriFormContent in - <foreach collection="conditionParamRef.oriFormContentList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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> - <if test="conditionParamRef.dupFileName == null"> - ${_conditionType_} a.dupFileName is null - </if> + <if test="conditionParamRef.containsKey('dupFileName')"> + <if test="conditionParamRef.dupFileName != null and conditionParamRef.dupFileName != ''"> + ${_conditionType_} a.dupFileName like #{${_conditionParam_}.dupFileName} </if> - <if test="conditionParamRef.containsKey('dupFileNameList')"> - ${_conditionType_} a.dupFileName in - <foreach collection="conditionParamRef.dupFileNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.dupFileName == null"> + ${_conditionType_} a.dupFileName is null </if> + </if> + <if test="conditionParamRef.containsKey('dupFileNameList')"> + ${_conditionType_} a.dupFileName in + <foreach collection="conditionParamRef.dupFileNameList" 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 test="conditionParamRef.containsKey('duplicateUrl')"> + <if test="conditionParamRef.duplicateUrl != null and conditionParamRef.duplicateUrl != ''"> + ${_conditionType_} a.duplicateUrl like #{${_conditionParam_}.duplicateUrl} </if> - <if test="conditionParamRef.containsKey('duplicateUrlList')"> - ${_conditionType_} a.duplicateUrl in - <foreach collection="conditionParamRef.duplicateUrlList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('dupFormContent')"> - <if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''"> - ${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent} - </if> - <if test="conditionParamRef.dupFormContent == null"> - ${_conditionType_} a.dupFormContent is null - </if> + <if test="conditionParamRef.containsKey('dupFormContent')"> + <if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''"> + ${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent} </if> - <if test="conditionParamRef.containsKey('dupFormContentList')"> - ${_conditionType_} a.dupFormContent in - <foreach collection="conditionParamRef.dupFormContentList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.dupFormContent == null"> + ${_conditionType_} a.dupFormContent 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('exampleUrl')"> - <if test="conditionParamRef.exampleUrl != null and conditionParamRef.exampleUrl != ''"> - ${_conditionType_} a.exampleUrl like #{${_conditionParam_}.exampleUrl} - </if> - <if test="conditionParamRef.exampleUrl == null"> - ${_conditionType_} a.exampleUrl is null - </if> + <if test="conditionParamRef.containsKey('exampleUrl')"> + <if test="conditionParamRef.exampleUrl != null and conditionParamRef.exampleUrl != ''"> + ${_conditionType_} a.exampleUrl like #{${_conditionParam_}.exampleUrl} </if> - <if test="conditionParamRef.containsKey('exampleUrlList')"> - ${_conditionType_} a.exampleUrl in - <foreach collection="conditionParamRef.exampleUrlList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.exampleUrl == null"> + ${_conditionType_} a.exampleUrl is null </if> - <if test="conditionParamRef.containsKey('status')"> - <if test="conditionParamRef.status != null "> - ${_conditionType_} a.status = #{${_conditionParam_}.status} - </if> - <if test="conditionParamRef.status == null"> - ${_conditionType_} a.status is null - </if> + </if> + <if test="conditionParamRef.containsKey('exampleUrlList')"> + ${_conditionType_} a.exampleUrl in + <foreach collection="conditionParamRef.exampleUrlList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('status')"> + <if test="conditionParamRef.status != null "> + ${_conditionType_} a.status = #{${_conditionParam_}.status} </if> - <if test="conditionParamRef.containsKey('statusList')"> - ${_conditionType_} a.status in - <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.status == null"> + ${_conditionType_} a.status is null </if> - <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> - ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} + </if> + <if test="conditionParamRef.containsKey('statusList')"> + ${_conditionType_} a.status in + <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> + ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} + </if> + <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null"> + ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} + </if> + + <if test="conditionParamRef.containsKey('createUserId')"> + <if test="conditionParamRef.createUserId != null "> + ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} </if> - <if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null"> - ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} + <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('createUserId')"> - <if test="conditionParamRef.createUserId != null "> - ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} - </if> - <if test="conditionParamRef.createUserId == null"> - ${_conditionType_} a.createUserId is null - </if> + + <if test="conditionParamRef.containsKey('createTime')"> + <if test="conditionParamRef.createTime != null "> + ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} </if> - <if test="conditionParamRef.containsKey('createUserIdList')"> - ${_conditionType_} a.createUserId in - <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.createTime == null"> + ${_conditionType_} a.createTime is null </if> - <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> - ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} + </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.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> - ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} + <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('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 test="conditionParamRef.containsKey('updateTime')"> + <if test="conditionParamRef.updateTime != null "> + ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} </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 test="conditionParamRef.updateTime == null"> + ${_conditionType_} a.updateTime is null </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('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> + + <if test="conditionParamRef.containsKey('printerName')"> + <if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''"> + ${_conditionType_} a.printerName like #{${_conditionParam_}.printerName} </if> - <if test="conditionParamRef.containsKey('updateUserIdList')"> - ${_conditionType_} a.updateUserId in - <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.printerName == null"> + ${_conditionType_} a.printerName is null </if> - <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> - ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} + </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.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> - ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} + <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('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 test="conditionParamRef.containsKey('paperSource')"> + <if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''"> + ${_conditionType_} a.paperSource like #{${_conditionParam_}.paperSource} </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 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()"> order by <trim suffixOverrides="," suffix=""> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> - ${item.colName} ${item.sortKind} + ${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('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('holderType')"> - a.holderType - <if test='orderCol.holderType != null and "DESC".equalsIgnoreCase(orderCol.holderType)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('industryId')"> - a.industryId - <if test='orderCol.industryId != null and "DESC".equalsIgnoreCase(orderCol.industryId)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('classifyId')"> - a.classifyId - <if test='orderCol.classifyId != null and "DESC".equalsIgnoreCase(orderCol.classifyId)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('transverse')"> - a.transverse - <if test='orderCol.transverse != null and "DESC".equalsIgnoreCase(orderCol.transverse)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('portrait')"> - a.portrait - <if test='orderCol.portrait != null and "DESC".equalsIgnoreCase(orderCol.portrait)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('inspect')"> - a.inspect - <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> - <if test="orderCol.containsKey('oriFormContent')"> - a.oriFormContent - <if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>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> - <if test="orderCol.containsKey('exampleUrl')"> - a.exampleUrl - <if test='orderCol.exampleUrl != null and "DESC".equalsIgnoreCase(orderCol.exampleUrl)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('status')"> - a.status - <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>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> + <if test="orderCol.containsKey('id')"> + a.id + <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>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('holderType')"> + a.holderType + <if test='orderCol.holderType != null and "DESC".equalsIgnoreCase(orderCol.holderType)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('industryId')"> + a.industryId + <if test='orderCol.industryId != null and "DESC".equalsIgnoreCase(orderCol.industryId)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('classifyId')"> + a.classifyId + <if test='orderCol.classifyId != null and "DESC".equalsIgnoreCase(orderCol.classifyId)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('transverse')"> + a.transverse + <if test='orderCol.transverse != null and "DESC".equalsIgnoreCase(orderCol.transverse)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('portrait')"> + a.portrait + <if test='orderCol.portrait != null and "DESC".equalsIgnoreCase(orderCol.portrait)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('inspect')"> + a.inspect + <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> + <if test="orderCol.containsKey('oriFormContent')"> + a.oriFormContent + <if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>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> + <if test="orderCol.containsKey('exampleUrl')"> + a.exampleUrl + <if test='orderCol.exampleUrl != null and "DESC".equalsIgnoreCase(orderCol.exampleUrl)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('status')"> + a.status + <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>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> + <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> </trim> </if> </sql> diff --git a/certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml b/certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml index 5dd3be8..652b704 100644 --- a/certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml +++ b/certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml @@ -1,110 +1,114 @@ <?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="catalogCode" column="catalogCode" /> - <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="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="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" /> - + <id property="id" column="id" /> + <result property="catalogCode" column="catalogCode" /> + <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="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="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> <!-- 琛ㄦ墍鏈夊垪 --> <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('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))"> - a.catalogCode, - </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> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))"> - a.certificateCode, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))"> - a.enterpriseName, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))"> - a.holderName, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIDCardNo') or colPickMode == 1 and data.containsKey('holderIDCardNo')))"> - a.holderIDCardNo, - </if> - <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerName') or colPickMode == 1 and data.containsKey('pickerName')))"> - a.pickerName, - </if> - <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('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> - a.deviceId, - </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> - <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('id') or colPickMode == 1 and data.containsKey('id')))"> + a.id, + </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('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))"> + a.certificateName, + </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> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))"> + a.enterpriseName, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))"> + a.holderName, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIDCardNo') or colPickMode == 1 and data.containsKey('holderIDCardNo')))"> + a.holderIDCardNo, + </if> + <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerName') or colPickMode == 1 and data.containsKey('pickerName')))"> + a.pickerName, + </if> + <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('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> + a.deviceId, + </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> + <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) + (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark) VALUES - (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId}) + (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId},#{statusRemark}) </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) + (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark) 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.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}) </foreach> </insert> @@ -189,6 +193,9 @@ <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 @@ -201,167 +208,174 @@ <update id="updateBatch" parameterType="paramDto"> update mortals_xhx_print_log as a <trim prefix="set" suffixOverrides=","> - <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="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'))"> - when a.id=#{item.id} then #{item.certificateName} - </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'))"> - when a.id=#{item.id} then #{item.certificateCode} - </if> - </foreach> - </trim> - <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))"> - when a.id=#{item.id} then #{item.enterpriseName} - </if> - </foreach> - </trim> - <trim prefix="holderName=(case" suffix="ELSE holderName end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('holderName')) or (colPickMode==1 and !item.containsKey('holderName'))"> - when a.id=#{item.id} then #{item.holderName} - </if> - </foreach> - </trim> - <trim prefix="holderIDCardNo=(case" suffix="ELSE holderIDCardNo end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('holderIDCardNo')) or (colPickMode==1 and !item.containsKey('holderIDCardNo'))"> - when a.id=#{item.id} then #{item.holderIDCardNo} - </if> - </foreach> - </trim> - <trim prefix="pickerName=(case" suffix="ELSE pickerName end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('pickerName')) or (colPickMode==1 and !item.containsKey('pickerName'))"> - when a.id=#{item.id} then #{item.pickerName} - </if> - </foreach> - </trim> - <trim prefix="pickerIDCardNo=(case" suffix="ELSE pickerIDCardNo end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('pickerIDCardNo')) or (colPickMode==1 and !item.containsKey('pickerIDCardNo'))"> - when a.id=#{item.id} then #{item.pickerIDCardNo} - </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> - <when test="(colPickMode==0 and item.containsKey('printStatus')) or (colPickMode==1 and !item.containsKey('printStatus'))"> - when a.id=#{item.id} then #{item.printStatus} - </when> - <when test="(colPickMode==0 and item.containsKey('printStatusIncrement')) or (colPickMode==1 and !item.containsKey('printStatusIncrement'))"> - when a.id=#{item.id} then ifnull(a.printStatus,0) + #{item.printStatusIncrement} - </when> - </choose> - </foreach> - </trim> - <trim prefix="printDate=(case" suffix="ELSE printDate end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <if test="(colPickMode==0 and item.containsKey('printDate')) or (colPickMode==1 and !item.containsKey('printDate'))"> - when a.id=#{item.id} then #{item.printDate} - </if> - </foreach> - </trim> - <trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> - <foreach collection="data.dataList" item="item" index="index" separator="" > - <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 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 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'))"> + when a.id=#{item.id} then #{item.catalogCode} + </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'))"> + when a.id=#{item.id} then #{item.certificateName} + </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'))"> + when a.id=#{item.id} then #{item.certificateCode} + </if> + </foreach> + </trim> + <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))"> + when a.id=#{item.id} then #{item.enterpriseName} + </if> + </foreach> + </trim> + <trim prefix="holderName=(case" suffix="ELSE holderName end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('holderName')) or (colPickMode==1 and !item.containsKey('holderName'))"> + when a.id=#{item.id} then #{item.holderName} + </if> + </foreach> + </trim> + <trim prefix="holderIDCardNo=(case" suffix="ELSE holderIDCardNo end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('holderIDCardNo')) or (colPickMode==1 and !item.containsKey('holderIDCardNo'))"> + when a.id=#{item.id} then #{item.holderIDCardNo} + </if> + </foreach> + </trim> + <trim prefix="pickerName=(case" suffix="ELSE pickerName end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('pickerName')) or (colPickMode==1 and !item.containsKey('pickerName'))"> + when a.id=#{item.id} then #{item.pickerName} + </if> + </foreach> + </trim> + <trim prefix="pickerIDCardNo=(case" suffix="ELSE pickerIDCardNo end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('pickerIDCardNo')) or (colPickMode==1 and !item.containsKey('pickerIDCardNo'))"> + when a.id=#{item.id} then #{item.pickerIDCardNo} + </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> + <when test="(colPickMode==0 and item.containsKey('printStatus')) or (colPickMode==1 and !item.containsKey('printStatus'))"> + when a.id=#{item.id} then #{item.printStatus} + </when> + <when test="(colPickMode==0 and item.containsKey('printStatusIncrement')) or (colPickMode==1 and !item.containsKey('printStatusIncrement'))"> + when a.id=#{item.id} then ifnull(a.printStatus,0) + #{item.printStatusIncrement} + </when> + </choose> + </foreach> + </trim> + <trim prefix="printDate=(case" suffix="ELSE printDate end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <if test="(colPickMode==0 and item.containsKey('printDate')) or (colPickMode==1 and !item.containsKey('printDate'))"> + when a.id=#{item.id} then #{item.printDate} + </if> + </foreach> + </trim> + <trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> + <foreach collection="data.dataList" item="item" index="index" separator="" > + <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 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 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=")"> @@ -463,447 +477,467 @@ ${_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 test="conditionParamRef.containsKey('id')"> + <if test="conditionParamRef.id != null "> + ${_conditionType_} a.id = #{${_conditionParam_}.id} </if> - <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> - ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} + <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('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 test="conditionParamRef.containsKey('catalogCode')"> + <if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''"> + ${_conditionType_} a.catalogCode like #{${_conditionParam_}.catalogCode} </if> - <if test="conditionParamRef.containsKey('catalogCodeList')"> - ${_conditionType_} a.catalogCode in - <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <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('certificateName')"> - <if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''"> - ${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName} - </if> - <if test="conditionParamRef.certificateName == null"> - ${_conditionType_} a.certificateName is null - </if> + <if test="conditionParamRef.containsKey('certificateName')"> + <if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''"> + ${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName} </if> - <if test="conditionParamRef.containsKey('certificateNameList')"> - ${_conditionType_} a.certificateName in - <foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.certificateName == null"> + ${_conditionType_} a.certificateName is null </if> + </if> + <if test="conditionParamRef.containsKey('certificateNameList')"> + ${_conditionType_} a.certificateName in + <foreach collection="conditionParamRef.certificateNameList" 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} - </if> - <if test="conditionParamRef.certificateCode == null"> - ${_conditionType_} a.certificateCode is null - </if> + <if test="conditionParamRef.containsKey('certificateCode')"> + <if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''"> + ${_conditionType_} a.certificateCode like #{${_conditionParam_}.certificateCode} </if> - <if test="conditionParamRef.containsKey('certificateCodeList')"> - ${_conditionType_} a.certificateCode in - <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.certificateCode == null"> + ${_conditionType_} a.certificateCode is null </if> + </if> + <if test="conditionParamRef.containsKey('certificateCodeList')"> + ${_conditionType_} a.certificateCode in + <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('enterpriseName')"> - <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''"> - ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName} - </if> - <if test="conditionParamRef.enterpriseName == null"> - ${_conditionType_} a.enterpriseName is null - </if> + <if test="conditionParamRef.containsKey('enterpriseName')"> + <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''"> + ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName} </if> - <if test="conditionParamRef.containsKey('enterpriseNameList')"> - ${_conditionType_} a.enterpriseName in - <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.enterpriseName == null"> + ${_conditionType_} a.enterpriseName is null </if> + </if> + <if test="conditionParamRef.containsKey('enterpriseNameList')"> + ${_conditionType_} a.enterpriseName in + <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('holderName')"> - <if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''"> - ${_conditionType_} a.holderName like #{${_conditionParam_}.holderName} - </if> - <if test="conditionParamRef.holderName == null"> - ${_conditionType_} a.holderName is null - </if> + <if test="conditionParamRef.containsKey('holderName')"> + <if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''"> + ${_conditionType_} a.holderName like #{${_conditionParam_}.holderName} </if> - <if test="conditionParamRef.containsKey('holderNameList')"> - ${_conditionType_} a.holderName in - <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.holderName == null"> + ${_conditionType_} a.holderName is null </if> + </if> + <if test="conditionParamRef.containsKey('holderNameList')"> + ${_conditionType_} a.holderName in + <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('holderIDCardNo')"> - <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> - ${_conditionType_} a.holderIDCardNo like #{${_conditionParam_}.holderIDCardNo} - </if> - <if test="conditionParamRef.holderIDCardNo == null"> - ${_conditionType_} a.holderIDCardNo is null - </if> + <if test="conditionParamRef.containsKey('holderIDCardNo')"> + <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> + ${_conditionType_} a.holderIDCardNo like #{${_conditionParam_}.holderIDCardNo} </if> - <if test="conditionParamRef.containsKey('holderIDCardNoList')"> - ${_conditionType_} a.holderIDCardNo in - <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.holderIDCardNo == null"> + ${_conditionType_} a.holderIDCardNo is null </if> + </if> + <if test="conditionParamRef.containsKey('holderIDCardNoList')"> + ${_conditionType_} a.holderIDCardNo in + <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('pickerName')"> - <if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''"> - ${_conditionType_} a.pickerName like #{${_conditionParam_}.pickerName} - </if> - <if test="conditionParamRef.pickerName == null"> - ${_conditionType_} a.pickerName is null - </if> + <if test="conditionParamRef.containsKey('pickerName')"> + <if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''"> + ${_conditionType_} a.pickerName like #{${_conditionParam_}.pickerName} </if> - <if test="conditionParamRef.containsKey('pickerNameList')"> - ${_conditionType_} a.pickerName in - <foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.pickerName == null"> + ${_conditionType_} a.pickerName is null </if> + </if> + <if test="conditionParamRef.containsKey('pickerNameList')"> + ${_conditionType_} a.pickerName in + <foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> - <if test="conditionParamRef.containsKey('pickerIDCardNo')"> - <if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''"> - ${_conditionType_} a.pickerIDCardNo like #{${_conditionParam_}.pickerIDCardNo} - </if> - <if test="conditionParamRef.pickerIDCardNo == null"> - ${_conditionType_} a.pickerIDCardNo is null - </if> + <if test="conditionParamRef.containsKey('pickerIDCardNo')"> + <if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''"> + ${_conditionType_} a.pickerIDCardNo like #{${_conditionParam_}.pickerIDCardNo} </if> - <if test="conditionParamRef.containsKey('pickerIDCardNoList')"> - ${_conditionType_} a.pickerIDCardNo in - <foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.pickerIDCardNo == null"> + ${_conditionType_} a.pickerIDCardNo is null </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('pickerIDCardNoList')"> + ${_conditionType_} a.pickerIDCardNo in + <foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('originalCount')"> + <if test="conditionParamRef.originalCount != null "> + ${_conditionType_} a.originalCount = #{${_conditionParam_}.originalCount} </if> - <if test="conditionParamRef.containsKey('originalCountEnd') and conditionParamRef.originalCountEnd != null"> - ${_conditionType_} a.originalCount <![CDATA[ <= ]]> #{${_conditionParam_}.originalCountEnd} + <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 test="conditionParamRef.containsKey('duplicateCount')"> + <if test="conditionParamRef.duplicateCount != null "> + ${_conditionType_} a.duplicateCount = #{${_conditionParam_}.duplicateCount} </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 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} - </if> - <if test="conditionParamRef.printStatus == null"> - ${_conditionType_} a.printStatus is null - </if> + <if test="conditionParamRef.containsKey('printStatus')"> + <if test="conditionParamRef.printStatus != null "> + ${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus} </if> - <if test="conditionParamRef.containsKey('printStatusList')"> - ${_conditionType_} a.printStatus in - <foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> - </if> - <if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null"> - ${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart} - </if> - <if test="conditionParamRef.containsKey('printStatusEnd') and conditionParamRef.printStatusEnd != null"> - ${_conditionType_} a.printStatus <![CDATA[ <= ]]> #{${_conditionParam_}.printStatusEnd} + <if test="conditionParamRef.printStatus == null"> + ${_conditionType_} a.printStatus is null </if> + </if> + <if test="conditionParamRef.containsKey('printStatusList')"> + ${_conditionType_} a.printStatus in + <foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=","> + #{item} + </foreach> + </if> + <if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null"> + ${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart} + </if> + <if test="conditionParamRef.containsKey('printStatusEnd') and conditionParamRef.printStatusEnd != null"> + ${_conditionType_} a.printStatus <![CDATA[ <= ]]> #{${_conditionParam_}.printStatusEnd} + </if> - <if test="conditionParamRef.containsKey('printDate')"> - <if test="conditionParamRef.printDate != null "> - ${_conditionType_} a.printDate = #{${_conditionParam_}.printDate} - </if> - <if test="conditionParamRef.printDate == null"> - ${_conditionType_} a.printDate is null - </if> - </if> - <if test="conditionParamRef.containsKey('printDateStart') and conditionParamRef.printDateStart != null and conditionParamRef.printDateStart!=''"> - ${_conditionType_} a.printDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.printDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') - </if> - <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('deviceId')"> - <if test="conditionParamRef.deviceId != null "> - ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} - </if> - <if test="conditionParamRef.deviceId == null"> - ${_conditionType_} a.deviceId is null - </if> + <if test="conditionParamRef.containsKey('printDate')"> + <if test="conditionParamRef.printDate != null "> + ${_conditionType_} a.printDate = #{${_conditionParam_}.printDate} </if> - <if test="conditionParamRef.containsKey('deviceIdList')"> - ${_conditionType_} a.deviceId in - <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=","> - #{item} - </foreach> + <if test="conditionParamRef.printDate == null"> + ${_conditionType_} a.printDate is null </if> - <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null"> - ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} + </if> + <if test="conditionParamRef.containsKey('printDateStart') and conditionParamRef.printDateStart != null and conditionParamRef.printDateStart!=''"> + ${_conditionType_} a.printDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.printDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') + </if> + <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('deviceId')"> + <if test="conditionParamRef.deviceId != null "> + ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} </if> - <if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null"> - ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd} + <if test="conditionParamRef.deviceId == null"> + ${_conditionType_} a.deviceId is null </if> + </if> + <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('deviceIdStart') and conditionParamRef.deviceIdStart != null"> + ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} + </if> + <if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null"> + ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd} + </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 test="conditionParamRef.containsKey('createUserId')"> + <if test="conditionParamRef.createUserId != null "> + ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} </if> - <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> - ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} + <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 test="conditionParamRef.containsKey('createTime')"> + <if test="conditionParamRef.createTime != null "> + ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} </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 test="conditionParamRef.createTime == null"> + ${_conditionType_} a.createTime is null </if> - <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> - ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} + </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.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> - ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} + <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 test="conditionParamRef.containsKey('updateTime')"> + <if test="conditionParamRef.updateTime != null "> + ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} </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 test="conditionParamRef.updateTime == null"> + ${_conditionType_} a.updateTime is null </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> + <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> + <if test="conditionParamRef.containsKey('catalogId')"> + <if test="conditionParamRef.catalogId != null "> + ${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId} </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 test="conditionParamRef.catalogId == null"> + ${_conditionType_} a.catalogId is null </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('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.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null"> - ${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd} + <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()"> order by <trim suffixOverrides="," suffix=""> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> - ${item.colName} ${item.sortKind} + ${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('catalogCode')"> - a.catalogCode - <if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('certificateName')"> - a.certificateName - <if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('certificateCode')"> - a.certificateCode - <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('enterpriseName')"> - a.enterpriseName - <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('holderName')"> - a.holderName - <if test='orderCol.holderName != null and "DESC".equalsIgnoreCase(orderCol.holderName)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('holderIDCardNo')"> - a.holderIDCardNo - <if test='orderCol.holderIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.holderIDCardNo)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('pickerName')"> - a.pickerName - <if test='orderCol.pickerName != null and "DESC".equalsIgnoreCase(orderCol.pickerName)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('pickerIDCardNo')"> - a.pickerIDCardNo - <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> - , - </if> - <if test="orderCol.containsKey('printDate')"> - a.printDate - <if test='orderCol.printDate != null and "DESC".equalsIgnoreCase(orderCol.printDate)'>DESC</if> - , - </if> - <if test="orderCol.containsKey('deviceId')"> - a.deviceId - <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>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> - <if test="orderCol.containsKey('catalogId')"> - a.catalogId - <if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if> - , - </if> + <if test="orderCol.containsKey('id')"> + a.id + <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>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('certificateName')"> + a.certificateName + <if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('certificateCode')"> + a.certificateCode + <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('enterpriseName')"> + a.enterpriseName + <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('holderName')"> + a.holderName + <if test='orderCol.holderName != null and "DESC".equalsIgnoreCase(orderCol.holderName)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('holderIDCardNo')"> + a.holderIDCardNo + <if test='orderCol.holderIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.holderIDCardNo)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('pickerName')"> + a.pickerName + <if test='orderCol.pickerName != null and "DESC".equalsIgnoreCase(orderCol.pickerName)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('pickerIDCardNo')"> + a.pickerIDCardNo + <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> + , + </if> + <if test="orderCol.containsKey('printDate')"> + a.printDate + <if test='orderCol.printDate != null and "DESC".equalsIgnoreCase(orderCol.printDate)'>DESC</if> + , + </if> + <if test="orderCol.containsKey('deviceId')"> + a.deviceId + <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>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> + <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> -- 2.24.3