Skip to content

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

新增证照目录模板配置功能

parent a25c3e74
Show whitespace changes
Inline Side-by-side
Showing with 14596 additions and 12457 deletions
certificate-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @ 34d1e119
package com.mortals.xhx.base.login.web;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.ap.SysConstains;
......@@ -8,7 +7,6 @@ import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.ITokenService;
import com.mortals.framework.service.IUser;
import com.mortals.framework.util.AESUtil;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.HttpUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -58,7 +56,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@RequestMapping("login")
public String login( @RequestBody LoginForm loginForm) throws Exception {
String loginName = loginForm.getLoginName();
String password = loginForm.getPassword();
......@@ -70,59 +67,59 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
return resp;
/*JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName();
String password = loginForm.getPassword();
//String securityCode = loginForm.getSecurityCode();
String ip = super.getRequestIP(request);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
return ret.toJSONString();
}
UserEntity userEntity = null;
try {
loginForm.validate();
userEntity = userService.doLogin(loginName, password, ip);
userEntity.setLastLoginAddress(ip);
//saveCurrUser(request, response, userEntity);
recordSysLog(request, userEntity, "用户登录系统成功!");
// 返回拥有的菜单数据
Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
String currUserName = userEntity.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "管理员";
}
userEntity.setLoginTime(System.currentTimeMillis());
userEntity.setToken(IdUtil.fastSimpleUUID());
userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
String token = authTokenService.createToken(userEntity);
JSONObject data = new JSONObject();
data.put("token", token);
data.put("currUserName", currUserName);
data.put("barList", outlookBarList);
data.put("id", userEntity.getId());
data.put("userType", userEntity.getUserType());
//this.generateBlackCookie(request, response, loginName, urls);
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
ret.put("resources", urls);
return ret.toJSONString();
} catch (Exception e) {
log.error("login error ", e);
if (userEntity == null) {
userEntity = new UserEntity();
userEntity.setLoginName(loginName);
}
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString();
}*/
// JSONObject ret = new JSONObject();
// String loginName = loginForm.getLoginName();
// String password = loginForm.getPassword();
// //String securityCode = loginForm.getSecurityCode();
// String ip = super.getRequestIP(request);
// if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
// ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
// ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
// return ret.toJSONString();
// }
// UserEntity userEntity = null;
// try {
// loginForm.validate();
//
// userEntity = userService.doLogin(loginName, password, ip);
// userEntity.setLastLoginAddress(ip);
// //saveCurrUser(request, response, userEntity);
// recordSysLog(request, userEntity, "用户登录系统成功!");
// // 返回拥有的菜单数据
// Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
// List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
// String currUserName = userEntity.getRealName();
// if (currUserName == null || currUserName.trim().length() == 0) {
// currUserName = "管理员";
// }
// userEntity.setLoginTime(System.currentTimeMillis());
// userEntity.setToken(IdUtil.fastSimpleUUID());
// userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
// String token = authTokenService.createToken(userEntity);
// JSONObject data = new JSONObject();
// data.put("token", token);
// data.put("currUserName", currUserName);
// data.put("barList", outlookBarList);
// data.put("id", userEntity.getId());
// data.put("userType", userEntity.getUserType());
//
// //this.generateBlackCookie(request, response, loginName, urls);
// ret.put(KEY_RESULT_DATA, data);
// ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
// ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
// ret.put("resources", urls);
//
// return ret.toJSONString();
// } catch (Exception e) {
// log.error("login error ", e);
// if (userEntity == null) {
// userEntity = new UserEntity();
// userEntity.setLoginName(loginName);
// }
// ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
// ret.put(KEY_RESULT_MSG, super.convertException(e));
// return ret.toJSONString();
// }
}
@RequestMapping("logout")
......
certificate-manager/src/main/java/com/mortals/xhx/module/api/CatalogVO.java
View file @ 34d1e119
......@@ -17,6 +17,14 @@ public class CatalogVO {
* 目录编号
*/
private String catalogCode;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照模板表单内容
*/
......
certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java
View file @ 34d1e119
......@@ -9,10 +9,13 @@ import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogQuery;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateQuery;
import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
import com.mortals.xhx.module.certificate.pdu.PrintListPdu;
import com.mortals.xhx.module.certificate.pdu.PrintLogPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import com.mortals.xhx.module.print.model.PrintCatalogEntity;
import com.mortals.xhx.module.print.model.PrintCatalogQuery;
import com.mortals.xhx.module.print.model.PrintServiceEntity;
......@@ -45,6 +48,8 @@ public class CertificateApi extends BaseJsonBodyController {
private PrintCatalogService printCatalogService;
@Autowired
private PrintWaitQueueService printWaitQueueService;
@Autowired
private CertificateCatalogTemplateService certificateCatalogTemplateService;
@PostMapping({"catalog/list"})
@UnAuth
......@@ -60,8 +65,15 @@ public class CertificateApi extends BaseJsonBodyController {
if(CollectionUtils.isNotEmpty(list)){
List<CatalogVO> catalogList = new ArrayList<>();
for(CertificateCatalogEntity entity:list){
List<CertificateCatalogTemplateEntity> templateEntityList = certificateCatalogTemplateService.find(new CertificateCatalogTemplateQuery().catalogId(entity.getId()));
if(CollectionUtils.isNotEmpty(templateEntityList)){
for (CertificateCatalogTemplateEntity item:templateEntityList){
CatalogVO catalogVO = new CatalogVO(entity.getId(),entity.getCatalogName(),entity.getCatalogCode());
JSONObject formContent = JSONObject.parseObject(entity.getFormContent());
catalogVO.setTemplateId(item.getId());
catalogVO.setTemplateName(item.getTemplateName());
JSONObject formContent = JSONObject.parseObject(item.getFormContent());
JSONArray formList = formContent.getJSONArray("list");
JSONObject json = new JSONObject();
for (int j = 0; j < formList.size(); j++) {
......@@ -72,6 +84,9 @@ public class CertificateApi extends BaseJsonBodyController {
catalogList.add(catalogVO);
}
}
}
model.put("message_info", "获取证照目录成功");
ret.put("data", catalogList);
}else {
......@@ -207,7 +222,7 @@ public class CertificateApi extends BaseJsonBodyController {
if(CollectionUtils.isNotEmpty(list)){
List<PrintWaitQueueVO> waitQueueVOList = new ArrayList<>();
for(PrintWaitQueueEntity printWaitQueueEntity:list){
PrintCatalogEntity printCatalogEntity = printCatalogService.getPrintCatalogByService(pdu.getServiceId(),printWaitQueueEntity.getCatalogId());
PrintCatalogEntity printCatalogEntity = printCatalogService.getPrintCatalogByService(pdu.getServiceId(),printWaitQueueEntity.getCatalogId(),printWaitQueueEntity.getTemplateId());
PrintWaitQueueVO printWaitQueueVO = new PrintWaitQueueVO();
printWaitQueueVO.setCatalogId(printWaitQueueEntity.getCatalogId());
printWaitQueueVO.setCatalogCode(printWaitQueueEntity.getCatalogCode());
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/CertificateCatalogTemplateDao.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import java.util.List;
/**
* 证照目录模板Dao
* 证照目录模板 DAO接口
*
* @author zxfei
* @date 2023-05-23
*/
public interface CertificateCatalogTemplateDao extends ICRUDDao<CertificateCatalogTemplateEntity,Long>{
}
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/dao/ibatis/CertificateCatalogTemplateDaoImpl.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogTemplateDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 证照目录模板DaoImpl DAO接口
*
* @author zxfei
* @date 2023-05-23
*/
@Repository("certificateCatalogTemplateDao")
public class CertificateCatalogTemplateDaoImpl extends BaseCRUDDaoMybatis<CertificateCatalogTemplateEntity,Long> implements CertificateCatalogTemplateDao {
}
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.certificate.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
import lombok.Data;
/**
* 证照目录实体对象
*
* @author zxfei
* @date 2023-05-14
* @date 2023-05-24
*/
@Data
public class CertificateCatalogEntity extends CertificateCatalogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 目录名称
*/
......@@ -48,342 +52,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 是否需要年检，0：否1：是
*/
private Integer inspect;
/**
* 证照模板文件名称
*/
private String templateName;
/**
* 证照模板文件地址
*/
private String templateUrl;
/**
* 证照模板表单内容
*/
private String formContent;
/**
* 证照示例图地址
*/
private String exampleUrl;
/**
* 证照状态，0：禁用1：启用
*/
private Integer status;
/**
* 打印机名称
*/
private String printerName;
/**
* 打印机网络地址
*/
private String printerIp;
/**
* 打印机纸盒
*/
private String paperSource;
/**
* 打印设备Id
*/
private Long deviceId;
/**
* 批量导入模板文件地址
*/
private String excelFile;
/**
* 是否生成PDF，0：否1：是
*/
private Integer isPdf;
/**
* 站点id
*/
private Long siteId;
public CertificateCatalogEntity(){}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 持有者类型，1：自然人；2：法人；3：自然人，法人
* @return Integer
*/
public Integer getHolderType(){
return holderType;
}
/**
* 设置 持有者类型，1：自然人；2：法人；3：自然人，法人
* @param holderType
*/
public void setHolderType(Integer holderType){
this.holderType = holderType;
}
/**
* 获取 所属行业
* @return Long
*/
public Long getIndustryId(){
return industryId;
}
/**
* 设置 所属行业
* @param industryId
*/
public void setIndustryId(Long industryId){
this.industryId = industryId;
}
/**
* 获取 所属分类
* @return Long
*/
public Long getClassifyId(){
return classifyId;
}
/**
* 设置 所属分类
* @param classifyId
*/
public void setClassifyId(Long classifyId){
this.classifyId = classifyId;
}
/**
* 获取 横向尺寸(单位mm)
* @return Integer
*/
public Integer getTransverse(){
return transverse;
}
/**
* 设置 横向尺寸(单位mm)
* @param transverse
*/
public void setTransverse(Integer transverse){
this.transverse = transverse;
}
/**
* 获取 纵向尺寸(单位mm)
* @return Integer
*/
public Integer getPortrait(){
return portrait;
}
/**
* 设置 纵向尺寸(单位mm)
* @param portrait
*/
public void setPortrait(Integer portrait){
this.portrait = portrait;
}
/**
* 获取 是否需要年检，0：否1：是
* @return Integer
*/
public Integer getInspect(){
return inspect;
}
/**
* 设置 是否需要年检，0：否1：是
* @param inspect
*/
public void setInspect(Integer inspect){
this.inspect = inspect;
}
/**
* 获取 证照模板文件名称
* @return String
*/
public String getTemplateName(){
return templateName;
}
/**
* 设置 证照模板文件名称
* @param templateName
*/
public void setTemplateName(String templateName){
this.templateName = templateName;
}
/**
* 获取 证照模板文件地址
* @return String
*/
public String getTemplateUrl(){
return templateUrl;
}
/**
* 设置 证照模板文件地址
* @param templateUrl
*/
public void setTemplateUrl(String templateUrl){
this.templateUrl = templateUrl;
}
/**
* 获取 证照模板表单内容
* @return String
*/
public String getFormContent(){
return formContent;
}
/**
* 设置 证照模板表单内容
* @param formContent
*/
public void setFormContent(String formContent){
this.formContent = formContent;
}
/**
* 获取 证照示例图地址
* @return String
*/
public String getExampleUrl(){
return exampleUrl;
}
/**
* 设置 证照示例图地址
* @param exampleUrl
*/
public void setExampleUrl(String exampleUrl){
this.exampleUrl = exampleUrl;
}
/**
* 获取 证照状态，0：禁用1：启用
* @return Integer
*/
public Integer getStatus(){
return 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;
}
/**
* 获取 打印设备Id
* @return Long
*/
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 打印设备Id
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
/**
* 获取 批量导入模板文件地址
* @return String
*/
public String getExcelFile(){
return excelFile;
}
/**
* 设置 批量导入模板文件地址
* @param excelFile
*/
public void setExcelFile(String excelFile){
this.excelFile = excelFile;
}
/**
* 获取 是否生成PDF，0：否1：是
* @return Integer
*/
public Integer getIsPdf(){
return isPdf;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdf
*/
public void setIsPdf(Integer isPdf){
this.isPdf = isPdf;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -400,42 +72,19 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",catalogName:").append(getCatalogName());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",holderType:").append(getHolderType());
sb.append(",industryId:").append(getIndustryId());
sb.append(",classifyId:").append(getClassifyId());
sb.append(",transverse:").append(getTransverse());
sb.append(",portrait:").append(getPortrait());
sb.append(",inspect:").append(getInspect());
sb.append(",templateName:").append(getTemplateName());
sb.append(",templateUrl:").append(getTemplateUrl());
sb.append(",formContent:").append(getFormContent());
sb.append(",exampleUrl:").append(getExampleUrl());
sb.append(",status:").append(getStatus());
sb.append(",printerName:").append(getPrinterName());
sb.append(",printerIp:").append(getPrinterIp());
sb.append(",paperSource:").append(getPaperSource());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",excelFile:").append(getExcelFile());
sb.append(",isPdf:").append(getIsPdf());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.siteId = -1L;
this.catalogName = "";
this.catalogCode = "";
this.holderType = 1;
this.industryId = null;
this.industryId = -1L;
this.classifyId = null;
this.classifyId = -1L;
this.transverse = 0;
......@@ -443,28 +92,6 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.inspect = 0;
this.templateName = "";
this.templateUrl = "";
this.formContent = "";
this.exampleUrl = "";
this.status = 1;
this.printerName = "";
this.printerIp = "";
this.paperSource = "";
this.deviceId = null;
this.excelFile = "";
this.isPdf = 0;
this.siteId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ 34d1e119
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
* 证照目录查询对象
*
* @author zxfei
* @date 2023-05-14
* @date 2023-05-24
*/
public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */
......@@ -24,6 +24,21 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 目录名称 */
private List<String> catalogNameList;
......@@ -124,26 +139,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 是否需要年检，0：否1：是排除列表 */
private List <Integer> inspectNotList;
/** 证照模板文件名称 */
private List<String> templateNameList;
/** 证照模板文件名称排除列表 */
private List <String> templateNameNotList;
/** 证照模板文件地址 */
private List<String> templateUrlList;
/** 证照模板文件地址排除列表 */
private List <String> templateUrlNotList;
/** 证照模板表单内容 */
private List<String> formContentList;
/** 证照模板表单内容排除列表 */
private List <String> formContentNotList;
/** 证照示例图地址 */
private List<String> exampleUrlList;
/** 证照示例图地址排除列表 */
private List <String> exampleUrlNotList;
/** 开始 证照状态，0：禁用1：启用 */
private Integer statusStart;
......@@ -159,21 +154,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 证照状态，0：禁用1：启用排除列表 */
private List <Integer> statusNotList;
/** 打印机名称 */
private List<String> printerNameList;
/** 打印机名称排除列表 */
private List <String> printerNameNotList;
/** 打印机网络地址 */
private List<String> printerIpList;
/** 打印机网络地址排除列表 */
private List <String> printerIpNotList;
/** 打印机纸盒 */
private List<String> paperSourceList;
/** 打印机纸盒排除列表 */
private List <String> paperSourceNotList;
/** 开始 创建用户 */
private Long createUserIdStart;
......@@ -216,56 +196,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 打印设备Id */
private Long deviceIdStart;
/** 结束 打印设备Id */
private Long deviceIdEnd;
/** 增加 打印设备Id */
private Long deviceIdIncrement;
/** 打印设备Id列表 */
private List <Long> deviceIdList;
/** 打印设备Id排除列表 */
private List <Long> deviceIdNotList;
/** 批量导入模板文件地址 */
private List<String> excelFileList;
/** 批量导入模板文件地址排除列表 */
private List <String> excelFileNotList;
/** 开始 是否生成PDF，0：否1：是 */
private Integer isPdfStart;
/** 结束 是否生成PDF，0：否1：是 */
private Integer isPdfEnd;
/** 增加 是否生成PDF，0：否1：是 */
private Integer isPdfIncrement;
/** 是否生成PDF，0：否1：是列表 */
private List <Integer> isPdfList;
/** 是否生成PDF，0：否1：是排除列表 */
private List <Integer> isPdfNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogQuery> orConditionList;
......@@ -355,6 +285,87 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 目录名称
* @return catalogNameList
......@@ -905,134 +916,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 证照模板文件名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板文件名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板文件名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板文件名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 证照模板文件地址
* @return templateUrlList
*/
public List<String> getTemplateUrlList(){
return this.templateUrlList;
}
/**
* 设置 证照模板文件地址
* @param templateUrlList
*/
public void setTemplateUrlList(List<String> templateUrlList){
this.templateUrlList = templateUrlList;
}
/**
* 获取 证照模板文件地址
* @return templateUrlNotList
*/
public List<String> getTemplateUrlNotList(){
return this.templateUrlNotList;
}
/**
* 设置 证照模板文件地址
* @param templateUrlNotList
*/
public void setTemplateUrlNotList(List<String> templateUrlNotList){
this.templateUrlNotList = templateUrlNotList;
}
/**
* 获取 证照模板表单内容
* @return formContentList
*/
public List<String> getFormContentList(){
return this.formContentList;
}
/**
* 设置 证照模板表单内容
* @param formContentList
*/
public void setFormContentList(List<String> formContentList){
this.formContentList = formContentList;
}
/**
* 获取 证照模板表单内容
* @return formContentNotList
*/
public List<String> getFormContentNotList(){
return this.formContentNotList;
}
/**
* 设置 证照模板表单内容
* @param formContentNotList
*/
public void setFormContentNotList(List<String> formContentNotList){
this.formContentNotList = formContentNotList;
}
/**
* 获取 证照示例图地址
* @return exampleUrlList
*/
public List<String> getExampleUrlList(){
return this.exampleUrlList;
}
/**
* 设置 证照示例图地址
* @param exampleUrlList
*/
public void setExampleUrlList(List<String> exampleUrlList){
this.exampleUrlList = exampleUrlList;
}
/**
* 获取 证照示例图地址
* @return exampleUrlNotList
*/
public List<String> getExampleUrlNotList(){
return this.exampleUrlNotList;
}
/**
* 设置 证照示例图地址
* @param exampleUrlNotList
*/
public void setExampleUrlNotList(List<String> exampleUrlNotList){
this.exampleUrlNotList = exampleUrlNotList;
}
/**
* 获取 开始 证照状态，0：禁用1：启用
* @return statusStart
......@@ -1114,102 +997,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 打印机名称
* @return printerNameList
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
}
/**
* 获取 打印机名称
* @return printerNameNotList
*/
public List<String> getPrinterNameNotList(){
return this.printerNameNotList;
}
/**
* 设置 打印机名称
* @param printerNameNotList
*/
public void setPrinterNameNotList(List<String> printerNameNotList){
this.printerNameNotList = printerNameNotList;
}
/**
* 获取 打印机网络地址
* @return printerIpList
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
}
/**
* 获取 打印机网络地址
* @return printerIpNotList
*/
public List<String> getPrinterIpNotList(){
return this.printerIpNotList;
}
/**
* 设置 打印机网络地址
* @param printerIpNotList
*/
public void setPrinterIpNotList(List<String> printerIpNotList){
this.printerIpNotList = printerIpNotList;
}
/**
* 获取 打印机纸盒
* @return paperSourceList
*/
public List<String> getPaperSourceList(){
return this.paperSourceList;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
}
/**
* 获取 打印机纸盒
* @return paperSourceNotList
*/
public List<String> getPaperSourceNotList(){
return this.paperSourceNotList;
}
/**
* 设置 打印机纸盒
* @param paperSourceNotList
*/
public void setPaperSourceNotList(List<String> paperSourceNotList){
this.paperSourceNotList = paperSourceNotList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
......@@ -1437,331 +1224,110 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 获取 开始 打印设备Id
* @return deviceIdStart
* 设置 序号，主键，自增长
* @param id
*/
public Long getDeviceIdStart(){
return this.deviceIdStart;
public CertificateCatalogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 打印设备Id
* @param deviceIdStart
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
public CertificateCatalogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 获取 结束 打印设备Id
* @return $deviceIdEnd
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public Long getDeviceIdEnd(){
return this.deviceIdEnd;
public CertificateCatalogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
}
/**
* 获取 增加 打印设备Id
* @return deviceIdIncrement
*/
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
}
/**
* 获取 打印设备Id
* @return deviceIdList
*/
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 打印设备Id
* @param deviceIdList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/**
* 获取 打印设备Id
* @return deviceIdNotList
*/
public List<Long> getDeviceIdNotList(){
return this.deviceIdNotList;
}
/**
* 设置 打印设备Id
* @param deviceIdNotList
*/
public void setDeviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
}
/**
* 获取 批量导入模板文件地址
* @return excelFileList
*/
public List<String> getExcelFileList(){
return this.excelFileList;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileList
*/
public void setExcelFileList(List<String> excelFileList){
this.excelFileList = excelFileList;
}
/**
* 获取 批量导入模板文件地址
* @return excelFileNotList
*/
public List<String> getExcelFileNotList(){
return this.excelFileNotList;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileNotList
*/
public void setExcelFileNotList(List<String> excelFileNotList){
this.excelFileNotList = excelFileNotList;
}
/**
* 获取 开始 是否生成PDF，0：否1：是
* @return isPdfStart
*/
public Integer getIsPdfStart(){
return this.isPdfStart;
}
/**
* 设置 开始 是否生成PDF，0：否1：是
* @param isPdfStart
*/
public void setIsPdfStart(Integer isPdfStart){
this.isPdfStart = isPdfStart;
}
/**
* 获取 结束 是否生成PDF，0：否1：是
* @return $isPdfEnd
*/
public Integer getIsPdfEnd(){
return this.isPdfEnd;
}
/**
* 设置 结束 是否生成PDF，0：否1：是
* @param isPdfEnd
*/
public void setIsPdfEnd(Integer isPdfEnd){
this.isPdfEnd = isPdfEnd;
}
/**
* 获取 增加 是否生成PDF，0：否1：是
* @return isPdfIncrement
*/
public Integer getIsPdfIncrement(){
return this.isPdfIncrement;
}
/**
* 设置 增加 是否生成PDF，0：否1：是
* @param isPdfIncrement
*/
public void setIsPdfIncrement(Integer isPdfIncrement){
this.isPdfIncrement = isPdfIncrement;
}
/**
* 获取 是否生成PDF，0：否1：是
* @return isPdfList
*/
public List<Integer> getIsPdfList(){
return this.isPdfList;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIsPdfList(List<Integer> isPdfList){
this.isPdfList = isPdfList;
public CertificateCatalogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 获取 是否生成PDF，0：否1：是
* @return isPdfNotList
* 设置 序号，主键，自增长
* @param idList
*/
public List<Integer> getIsPdfNotList(){
return this.isPdfNotList;
public CertificateCatalogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIsPdfNotList(List<Integer> isPdfNotList){
this.isPdfNotList = isPdfNotList;
public CertificateCatalogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 获取 开始 站点id
* @return siteIdStart
* 设置 站点id
* @param siteId
*/
public Long getSiteIdStart(){
return this.siteIdStart;
public CertificateCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
public CertificateCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
public CertificateCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
public CertificateCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
public CertificateCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
public CertificateCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public CertificateCatalogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public CertificateCatalogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public CertificateCatalogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public CertificateCatalogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public CertificateCatalogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public CertificateCatalogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
......@@ -2127,82 +1693,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
return this;
}
/**
* 设置 证照模板文件名称
* @param templateName
*/
public CertificateCatalogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板文件名称
* @param templateNameList
*/
public CertificateCatalogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 证照模板文件地址
* @param templateUrl
*/
public CertificateCatalogQuery templateUrl(String templateUrl){
setTemplateUrl(templateUrl);
return this;
}
/**
* 设置 证照模板文件地址
* @param templateUrlList
*/
public CertificateCatalogQuery templateUrlList(List<String> templateUrlList){
this.templateUrlList = templateUrlList;
return this;
}
/**
* 设置 证照模板表单内容
* @param formContent
*/
public CertificateCatalogQuery formContent(String formContent){
setFormContent(formContent);
return this;
}
/**
* 设置 证照模板表单内容
* @param formContentList
*/
public CertificateCatalogQuery formContentList(List<String> formContentList){
this.formContentList = formContentList;
return this;
}
/**
* 设置 证照示例图地址
* @param exampleUrl
*/
public CertificateCatalogQuery exampleUrl(String exampleUrl){
setExampleUrl(exampleUrl);
return this;
}
/**
* 设置 证照示例图地址
* @param exampleUrlList
*/
public CertificateCatalogQuery exampleUrlList(List<String> exampleUrlList){
this.exampleUrlList = exampleUrlList;
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param status
......@@ -2257,63 +1747,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
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;
}
/**
* 设置 创建用户
* @param createUserId
......@@ -2424,187 +1857,6 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 设置 打印设备Id
* @param deviceId
*/
public CertificateCatalogQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 开始 打印设备Id
* @param deviceIdStart
*/
public CertificateCatalogQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
return this;
}
/**
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public CertificateCatalogQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/**
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public CertificateCatalogQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
return this;
}
/**
* 设置 打印设备Id
* @param deviceIdList
*/
public CertificateCatalogQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
return this;
}
/**
* 设置 打印设备Id
* @param deviceIdNotList
*/
public CertificateCatalogQuery deviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
return this;
}
/**
* 设置 批量导入模板文件地址
* @param excelFile
*/
public CertificateCatalogQuery excelFile(String excelFile){
setExcelFile(excelFile);
return this;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileList
*/
public CertificateCatalogQuery excelFileList(List<String> excelFileList){
this.excelFileList = excelFileList;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdf
*/
public CertificateCatalogQuery isPdf(Integer isPdf){
setIsPdf(isPdf);
return this;
}
/**
* 设置 开始 是否生成PDF，0：否1：是
* @param isPdfStart
*/
public CertificateCatalogQuery isPdfStart(Integer isPdfStart){
this.isPdfStart = isPdfStart;
return this;
}
/**
* 设置 结束 是否生成PDF，0：否1：是
* @param isPdfEnd
*/
public CertificateCatalogQuery isPdfEnd(Integer isPdfEnd){
this.isPdfEnd = isPdfEnd;
return this;
}
/**
* 设置 增加 是否生成PDF，0：否1：是
* @param isPdfIncrement
*/
public CertificateCatalogQuery isPdfIncrement(Integer isPdfIncrement){
this.isPdfIncrement = isPdfIncrement;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfList
*/
public CertificateCatalogQuery isPdfList(List<Integer> isPdfList){
this.isPdfList = isPdfList;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfNotList
*/
public CertificateCatalogQuery isPdfNotList(List<Integer> isPdfNotList){
this.isPdfNotList = isPdfNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public CertificateCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public CertificateCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public CertificateCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public CertificateCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public CertificateCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public CertificateCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogTemplateEntity.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogTemplateVo;
import lombok.Data;
/**
* 证照目录模板实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class CertificateCatalogTemplateEntity extends CertificateCatalogTemplateVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 目录id
*/
private Long catalogId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 模板类型1普通2正本3副本
*/
private Integer templateType;
/**
* 证照模板文件名称
*/
private String templateFileName;
/**
* 证照模板文件地址
*/
private String templateFileUrl;
/**
* 证照模板表单内容
*/
private String formContent;
/**
* 证照示例图地址
*/
private String exampleFileUrl;
/**
* 证照状态，0：禁用1：启用
*/
private Integer status;
/**
* 批量导入模板文件地址
*/
private String excelFile;
/**
* 是否生成PDF，0：否1：是
*/
private Integer isPdf;
/**
* 打印设备Id
*/
private Long deviceId;
/**
* 打印机名称
*/
private String printerName;
/**
* 打印机网络地址
*/
private String printerIp;
/**
* 打印机纸盒
*/
private String paperSource;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof CertificateCatalogTemplateEntity) {
CertificateCatalogTemplateEntity tmp = (CertificateCatalogTemplateEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.siteId = -1L;
this.catalogId = -1L;
this.templateName = "";
this.templateType = 0;
this.templateFileName = "";
this.templateFileUrl = "";
this.formContent = "";
this.exampleFileUrl = "";
this.status = 1;
this.excelFile = "";
this.isPdf = 0;
this.deviceId = -1L;
this.printerName = "";
this.printerIp = "";
this.paperSource = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogTemplateQuery.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.model;
import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
/**
* 证照目录模板查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class CertificateCatalogTemplateQuery extends CertificateCatalogTemplateEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 目录id */
private Long catalogIdStart;
/** 结束 目录id */
private Long catalogIdEnd;
/** 增加 目录id */
private Long catalogIdIncrement;
/** 目录id列表 */
private List <Long> catalogIdList;
/** 目录id排除列表 */
private List <Long> catalogIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 开始 模板类型1普通2正本3副本 */
private Integer templateTypeStart;
/** 结束 模板类型1普通2正本3副本 */
private Integer templateTypeEnd;
/** 增加 模板类型1普通2正本3副本 */
private Integer templateTypeIncrement;
/** 模板类型1普通2正本3副本列表 */
private List <Integer> templateTypeList;
/** 模板类型1普通2正本3副本排除列表 */
private List <Integer> templateTypeNotList;
/** 证照模板文件名称 */
private List<String> templateFileNameList;
/** 证照模板文件名称排除列表 */
private List <String> templateFileNameNotList;
/** 证照模板文件地址 */
private List<String> templateFileUrlList;
/** 证照模板文件地址排除列表 */
private List <String> templateFileUrlNotList;
/** 证照模板表单内容 */
private List<String> formContentList;
/** 证照模板表单内容排除列表 */
private List <String> formContentNotList;
/** 证照示例图地址 */
private List<String> exampleFileUrlList;
/** 证照示例图地址排除列表 */
private List <String> exampleFileUrlNotList;
/** 开始 证照状态，0：禁用1：启用 */
private Integer statusStart;
/** 结束 证照状态，0：禁用1：启用 */
private Integer statusEnd;
/** 增加 证照状态，0：禁用1：启用 */
private Integer statusIncrement;
/** 证照状态，0：禁用1：启用列表 */
private List <Integer> statusList;
/** 证照状态，0：禁用1：启用排除列表 */
private List <Integer> statusNotList;
/** 批量导入模板文件地址 */
private List<String> excelFileList;
/** 批量导入模板文件地址排除列表 */
private List <String> excelFileNotList;
/** 开始 是否生成PDF，0：否1：是 */
private Integer isPdfStart;
/** 结束 是否生成PDF，0：否1：是 */
private Integer isPdfEnd;
/** 增加 是否生成PDF，0：否1：是 */
private Integer isPdfIncrement;
/** 是否生成PDF，0：否1：是列表 */
private List <Integer> isPdfList;
/** 是否生成PDF，0：否1：是排除列表 */
private List <Integer> isPdfNotList;
/** 开始 打印设备Id */
private Long deviceIdStart;
/** 结束 打印设备Id */
private Long deviceIdEnd;
/** 增加 打印设备Id */
private Long deviceIdIncrement;
/** 打印设备Id列表 */
private List <Long> deviceIdList;
/** 打印设备Id排除列表 */
private List <Long> deviceIdNotList;
/** 打印机名称 */
private List<String> printerNameList;
/** 打印机名称排除列表 */
private List <String> printerNameNotList;
/** 打印机网络地址 */
private List<String> printerIpList;
/** 打印机网络地址排除列表 */
private List <String> printerIpNotList;
/** 打印机纸盒 */
private List<String> paperSourceList;
/** 打印机纸盒排除列表 */
private List <String> paperSourceNotList;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogTemplateQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<CertificateCatalogTemplateQuery> andConditionList;
public CertificateCatalogTemplateQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 目录id
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 目录id
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 目录id
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 目录id
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 目录id
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 目录id
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 目录id
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 目录id
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 获取 目录id
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 目录id
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 开始 模板类型1普通2正本3副本
* @return templateTypeStart
*/
public Integer getTemplateTypeStart(){
return this.templateTypeStart;
}
/**
* 设置 开始 模板类型1普通2正本3副本
* @param templateTypeStart
*/
public void setTemplateTypeStart(Integer templateTypeStart){
this.templateTypeStart = templateTypeStart;
}
/**
* 获取 结束 模板类型1普通2正本3副本
* @return $templateTypeEnd
*/
public Integer getTemplateTypeEnd(){
return this.templateTypeEnd;
}
/**
* 设置 结束 模板类型1普通2正本3副本
* @param templateTypeEnd
*/
public void setTemplateTypeEnd(Integer templateTypeEnd){
this.templateTypeEnd = templateTypeEnd;
}
/**
* 获取 增加 模板类型1普通2正本3副本
* @return templateTypeIncrement
*/
public Integer getTemplateTypeIncrement(){
return this.templateTypeIncrement;
}
/**
* 设置 增加 模板类型1普通2正本3副本
* @param templateTypeIncrement
*/
public void setTemplateTypeIncrement(Integer templateTypeIncrement){
this.templateTypeIncrement = templateTypeIncrement;
}
/**
* 获取 模板类型1普通2正本3副本
* @return templateTypeList
*/
public List<Integer> getTemplateTypeList(){
return this.templateTypeList;
}
/**
* 设置 模板类型1普通2正本3副本
* @param templateTypeList
*/
public void setTemplateTypeList(List<Integer> templateTypeList){
this.templateTypeList = templateTypeList;
}
/**
* 获取 模板类型1普通2正本3副本
* @return templateTypeNotList
*/
public List<Integer> getTemplateTypeNotList(){
return this.templateTypeNotList;
}
/**
* 设置 模板类型1普通2正本3副本
* @param templateTypeNotList
*/
public void setTemplateTypeNotList(List<Integer> templateTypeNotList){
this.templateTypeNotList = templateTypeNotList;
}
/**
* 获取 证照模板文件名称
* @return templateFileNameList
*/
public List<String> getTemplateFileNameList(){
return this.templateFileNameList;
}
/**
* 设置 证照模板文件名称
* @param templateFileNameList
*/
public void setTemplateFileNameList(List<String> templateFileNameList){
this.templateFileNameList = templateFileNameList;
}
/**
* 获取 证照模板文件名称
* @return templateFileNameNotList
*/
public List<String> getTemplateFileNameNotList(){
return this.templateFileNameNotList;
}
/**
* 设置 证照模板文件名称
* @param templateFileNameNotList
*/
public void setTemplateFileNameNotList(List<String> templateFileNameNotList){
this.templateFileNameNotList = templateFileNameNotList;
}
/**
* 获取 证照模板文件地址
* @return templateFileUrlList
*/
public List<String> getTemplateFileUrlList(){
return this.templateFileUrlList;
}
/**
* 设置 证照模板文件地址
* @param templateFileUrlList
*/
public void setTemplateFileUrlList(List<String> templateFileUrlList){
this.templateFileUrlList = templateFileUrlList;
}
/**
* 获取 证照模板文件地址
* @return templateFileUrlNotList
*/
public List<String> getTemplateFileUrlNotList(){
return this.templateFileUrlNotList;
}
/**
* 设置 证照模板文件地址
* @param templateFileUrlNotList
*/
public void setTemplateFileUrlNotList(List<String> templateFileUrlNotList){
this.templateFileUrlNotList = templateFileUrlNotList;
}
/**
* 获取 证照模板表单内容
* @return formContentList
*/
public List<String> getFormContentList(){
return this.formContentList;
}
/**
* 设置 证照模板表单内容
* @param formContentList
*/
public void setFormContentList(List<String> formContentList){
this.formContentList = formContentList;
}
/**
* 获取 证照模板表单内容
* @return formContentNotList
*/
public List<String> getFormContentNotList(){
return this.formContentNotList;
}
/**
* 设置 证照模板表单内容
* @param formContentNotList
*/
public void setFormContentNotList(List<String> formContentNotList){
this.formContentNotList = formContentNotList;
}
/**
* 获取 证照示例图地址
* @return exampleFileUrlList
*/
public List<String> getExampleFileUrlList(){
return this.exampleFileUrlList;
}
/**
* 设置 证照示例图地址
* @param exampleFileUrlList
*/
public void setExampleFileUrlList(List<String> exampleFileUrlList){
this.exampleFileUrlList = exampleFileUrlList;
}
/**
* 获取 证照示例图地址
* @return exampleFileUrlNotList
*/
public List<String> getExampleFileUrlNotList(){
return this.exampleFileUrlNotList;
}
/**
* 设置 证照示例图地址
* @param exampleFileUrlNotList
*/
public void setExampleFileUrlNotList(List<String> exampleFileUrlNotList){
this.exampleFileUrlNotList = exampleFileUrlNotList;
}
/**
* 获取 开始 证照状态，0：禁用1：启用
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 设置 开始 证照状态，0：禁用1：启用
* @param statusStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 获取 结束 证照状态，0：禁用1：启用
* @return $statusEnd
*/
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 设置 结束 证照状态，0：禁用1：启用
* @param statusEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 获取 增加 证照状态，0：禁用1：启用
* @return statusIncrement
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 设置 增加 证照状态，0：禁用1：启用
* @param statusIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 获取 证照状态，0：禁用1：启用
* @return statusList
*/
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param statusList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 获取 证照状态，0：禁用1：启用
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 获取 批量导入模板文件地址
* @return excelFileList
*/
public List<String> getExcelFileList(){
return this.excelFileList;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileList
*/
public void setExcelFileList(List<String> excelFileList){
this.excelFileList = excelFileList;
}
/**
* 获取 批量导入模板文件地址
* @return excelFileNotList
*/
public List<String> getExcelFileNotList(){
return this.excelFileNotList;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileNotList
*/
public void setExcelFileNotList(List<String> excelFileNotList){
this.excelFileNotList = excelFileNotList;
}
/**
* 获取 开始 是否生成PDF，0：否1：是
* @return isPdfStart
*/
public Integer getIsPdfStart(){
return this.isPdfStart;
}
/**
* 设置 开始 是否生成PDF，0：否1：是
* @param isPdfStart
*/
public void setIsPdfStart(Integer isPdfStart){
this.isPdfStart = isPdfStart;
}
/**
* 获取 结束 是否生成PDF，0：否1：是
* @return $isPdfEnd
*/
public Integer getIsPdfEnd(){
return this.isPdfEnd;
}
/**
* 设置 结束 是否生成PDF，0：否1：是
* @param isPdfEnd
*/
public void setIsPdfEnd(Integer isPdfEnd){
this.isPdfEnd = isPdfEnd;
}
/**
* 获取 增加 是否生成PDF，0：否1：是
* @return isPdfIncrement
*/
public Integer getIsPdfIncrement(){
return this.isPdfIncrement;
}
/**
* 设置 增加 是否生成PDF，0：否1：是
* @param isPdfIncrement
*/
public void setIsPdfIncrement(Integer isPdfIncrement){
this.isPdfIncrement = isPdfIncrement;
}
/**
* 获取 是否生成PDF，0：否1：是
* @return isPdfList
*/
public List<Integer> getIsPdfList(){
return this.isPdfList;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfList
*/
public void setIsPdfList(List<Integer> isPdfList){
this.isPdfList = isPdfList;
}
/**
* 获取 是否生成PDF，0：否1：是
* @return isPdfNotList
*/
public List<Integer> getIsPdfNotList(){
return this.isPdfNotList;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfNotList
*/
public void setIsPdfNotList(List<Integer> isPdfNotList){
this.isPdfNotList = isPdfNotList;
}
/**
* 获取 开始 打印设备Id
* @return deviceIdStart
*/
public Long getDeviceIdStart(){
return this.deviceIdStart;
}
/**
* 设置 开始 打印设备Id
* @param deviceIdStart
*/
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
}
/**
* 获取 结束 打印设备Id
* @return $deviceIdEnd
*/
public Long getDeviceIdEnd(){
return this.deviceIdEnd;
}
/**
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
}
/**
* 获取 增加 打印设备Id
* @return deviceIdIncrement
*/
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
}
/**
* 获取 打印设备Id
* @return deviceIdList
*/
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 打印设备Id
* @param deviceIdList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/**
* 获取 打印设备Id
* @return deviceIdNotList
*/
public List<Long> getDeviceIdNotList(){
return this.deviceIdNotList;
}
/**
* 设置 打印设备Id
* @param deviceIdNotList
*/
public void setDeviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
}
/**
* 获取 打印机名称
* @return printerNameList
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
}
/**
* 获取 打印机名称
* @return printerNameNotList
*/
public List<String> getPrinterNameNotList(){
return this.printerNameNotList;
}
/**
* 设置 打印机名称
* @param printerNameNotList
*/
public void setPrinterNameNotList(List<String> printerNameNotList){
this.printerNameNotList = printerNameNotList;
}
/**
* 获取 打印机网络地址
* @return printerIpList
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
}
/**
* 获取 打印机网络地址
* @return printerIpNotList
*/
public List<String> getPrinterIpNotList(){
return this.printerIpNotList;
}
/**
* 设置 打印机网络地址
* @param printerIpNotList
*/
public void setPrinterIpNotList(List<String> printerIpNotList){
this.printerIpNotList = printerIpNotList;
}
/**
* 获取 打印机纸盒
* @return paperSourceList
*/
public List<String> getPaperSourceList(){
return this.paperSourceList;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
}
/**
* 获取 打印机纸盒
* @return paperSourceNotList
*/
public List<String> getPaperSourceNotList(){
return this.paperSourceNotList;
}
/**
* 设置 打印机纸盒
* @param paperSourceNotList
*/
public void setPaperSourceNotList(List<String> paperSourceNotList){
this.paperSourceNotList = paperSourceNotList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public CertificateCatalogTemplateQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public CertificateCatalogTemplateQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public CertificateCatalogTemplateQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public CertificateCatalogTemplateQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public CertificateCatalogTemplateQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public CertificateCatalogTemplateQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public CertificateCatalogTemplateQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public CertificateCatalogTemplateQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public CertificateCatalogTemplateQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public CertificateCatalogTemplateQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public CertificateCatalogTemplateQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public CertificateCatalogTemplateQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 目录id
* @param catalogId
*/
public CertificateCatalogTemplateQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 目录id
* @param catalogIdStart
*/
public CertificateCatalogTemplateQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 目录id
* @param catalogIdEnd
*/
public CertificateCatalogTemplateQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 目录id
* @param catalogIdIncrement
*/
public CertificateCatalogTemplateQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 目录id
* @param catalogIdList
*/
public CertificateCatalogTemplateQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 设置 目录id
* @param catalogIdNotList
*/
public CertificateCatalogTemplateQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public CertificateCatalogTemplateQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public CertificateCatalogTemplateQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 模板类型1普通2正本3副本
* @param templateType
*/
public CertificateCatalogTemplateQuery templateType(Integer templateType){
setTemplateType(templateType);
return this;
}
/**
* 设置 开始 模板类型1普通2正本3副本
* @param templateTypeStart
*/
public CertificateCatalogTemplateQuery templateTypeStart(Integer templateTypeStart){
this.templateTypeStart = templateTypeStart;
return this;
}
/**
* 设置 结束 模板类型1普通2正本3副本
* @param templateTypeEnd
*/
public CertificateCatalogTemplateQuery templateTypeEnd(Integer templateTypeEnd){
this.templateTypeEnd = templateTypeEnd;
return this;
}
/**
* 设置 增加 模板类型1普通2正本3副本
* @param templateTypeIncrement
*/
public CertificateCatalogTemplateQuery templateTypeIncrement(Integer templateTypeIncrement){
this.templateTypeIncrement = templateTypeIncrement;
return this;
}
/**
* 设置 模板类型1普通2正本3副本
* @param templateTypeList
*/
public CertificateCatalogTemplateQuery templateTypeList(List<Integer> templateTypeList){
this.templateTypeList = templateTypeList;
return this;
}
/**
* 设置 模板类型1普通2正本3副本
* @param templateTypeNotList
*/
public CertificateCatalogTemplateQuery templateTypeNotList(List<Integer> templateTypeNotList){
this.templateTypeNotList = templateTypeNotList;
return this;
}
/**
* 设置 证照模板文件名称
* @param templateFileName
*/
public CertificateCatalogTemplateQuery templateFileName(String templateFileName){
setTemplateFileName(templateFileName);
return this;
}
/**
* 设置 证照模板文件名称
* @param templateFileNameList
*/
public CertificateCatalogTemplateQuery templateFileNameList(List<String> templateFileNameList){
this.templateFileNameList = templateFileNameList;
return this;
}
/**
* 设置 证照模板文件地址
* @param templateFileUrl
*/
public CertificateCatalogTemplateQuery templateFileUrl(String templateFileUrl){
setTemplateFileUrl(templateFileUrl);
return this;
}
/**
* 设置 证照模板文件地址
* @param templateFileUrlList
*/
public CertificateCatalogTemplateQuery templateFileUrlList(List<String> templateFileUrlList){
this.templateFileUrlList = templateFileUrlList;
return this;
}
/**
* 设置 证照模板表单内容
* @param formContent
*/
public CertificateCatalogTemplateQuery formContent(String formContent){
setFormContent(formContent);
return this;
}
/**
* 设置 证照模板表单内容
* @param formContentList
*/
public CertificateCatalogTemplateQuery formContentList(List<String> formContentList){
this.formContentList = formContentList;
return this;
}
/**
* 设置 证照示例图地址
* @param exampleFileUrl
*/
public CertificateCatalogTemplateQuery exampleFileUrl(String exampleFileUrl){
setExampleFileUrl(exampleFileUrl);
return this;
}
/**
* 设置 证照示例图地址
* @param exampleFileUrlList
*/
public CertificateCatalogTemplateQuery exampleFileUrlList(List<String> exampleFileUrlList){
this.exampleFileUrlList = exampleFileUrlList;
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param status
*/
public CertificateCatalogTemplateQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 开始 证照状态，0：禁用1：启用
* @param statusStart
*/
public CertificateCatalogTemplateQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 证照状态，0：禁用1：启用
* @param statusEnd
*/
public CertificateCatalogTemplateQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 证照状态，0：禁用1：启用
* @param statusIncrement
*/
public CertificateCatalogTemplateQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param statusList
*/
public CertificateCatalogTemplateQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 证照状态，0：禁用1：启用
* @param statusNotList
*/
public CertificateCatalogTemplateQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 批量导入模板文件地址
* @param excelFile
*/
public CertificateCatalogTemplateQuery excelFile(String excelFile){
setExcelFile(excelFile);
return this;
}
/**
* 设置 批量导入模板文件地址
* @param excelFileList
*/
public CertificateCatalogTemplateQuery excelFileList(List<String> excelFileList){
this.excelFileList = excelFileList;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdf
*/
public CertificateCatalogTemplateQuery isPdf(Integer isPdf){
setIsPdf(isPdf);
return this;
}
/**
* 设置 开始 是否生成PDF，0：否1：是
* @param isPdfStart
*/
public CertificateCatalogTemplateQuery isPdfStart(Integer isPdfStart){
this.isPdfStart = isPdfStart;
return this;
}
/**
* 设置 结束 是否生成PDF，0：否1：是
* @param isPdfEnd
*/
public CertificateCatalogTemplateQuery isPdfEnd(Integer isPdfEnd){
this.isPdfEnd = isPdfEnd;
return this;
}
/**
* 设置 增加 是否生成PDF，0：否1：是
* @param isPdfIncrement
*/
public CertificateCatalogTemplateQuery isPdfIncrement(Integer isPdfIncrement){
this.isPdfIncrement = isPdfIncrement;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfList
*/
public CertificateCatalogTemplateQuery isPdfList(List<Integer> isPdfList){
this.isPdfList = isPdfList;
return this;
}
/**
* 设置 是否生成PDF，0：否1：是
* @param isPdfNotList
*/
public CertificateCatalogTemplateQuery isPdfNotList(List<Integer> isPdfNotList){
this.isPdfNotList = isPdfNotList;
return this;
}
/**
* 设置 打印设备Id
* @param deviceId
*/
public CertificateCatalogTemplateQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 开始 打印设备Id
* @param deviceIdStart
*/
public CertificateCatalogTemplateQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
return this;
}
/**
* 设置 结束 打印设备Id
* @param deviceIdEnd
*/
public CertificateCatalogTemplateQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/**
* 设置 增加 打印设备Id
* @param deviceIdIncrement
*/
public CertificateCatalogTemplateQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
return this;
}
/**
* 设置 打印设备Id
* @param deviceIdList
*/
public CertificateCatalogTemplateQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
return this;
}
/**
* 设置 打印设备Id
* @param deviceIdNotList
*/
public CertificateCatalogTemplateQuery deviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
return this;
}
/**
* 设置 打印机名称
* @param printerName
*/
public CertificateCatalogTemplateQuery printerName(String printerName){
setPrinterName(printerName);
return this;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public CertificateCatalogTemplateQuery printerNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
return this;
}
/**
* 设置 打印机网络地址
* @param printerIp
*/
public CertificateCatalogTemplateQuery printerIp(String printerIp){
setPrinterIp(printerIp);
return this;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public CertificateCatalogTemplateQuery printerIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
return this;
}
/**
* 设置 打印机纸盒
* @param paperSource
*/
public CertificateCatalogTemplateQuery paperSource(String paperSource){
setPaperSource(paperSource);
return this;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public CertificateCatalogTemplateQuery paperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public CertificateCatalogTemplateQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public CertificateCatalogTemplateQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public CertificateCatalogTemplateQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public CertificateCatalogTemplateQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public CertificateCatalogTemplateQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CertificateCatalogTemplateQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public CertificateCatalogTemplateQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public CertificateCatalogTemplateQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public CertificateCatalogTemplateQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public CertificateCatalogTemplateQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public CertificateCatalogTemplateQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public CertificateCatalogTemplateQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<CertificateCatalogTemplateQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<CertificateCatalogTemplateQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<CertificateCatalogTemplateQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<CertificateCatalogTemplateQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/vo/CertificateCatalogTemplateVo.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 证照目录模板视图对象
*
* @author zxfei
* @date 2023-05-23
*/
@Data
public class CertificateCatalogTemplateVo extends BaseEntityLong {
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java
View file @ 34d1e119
......@@ -10,6 +10,8 @@ public class ApplyLogPdu {
* 证照目录ID
*/
private Long catalogId;
/** 目录模板ID **/
private Long templateId;
/**
* 证件编号
*/
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/CertificateCatalogTemplateService.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogTemplateDao;
/**
* CertificateCatalogTemplateService
*
* 证照目录模板 service接口
*
* @author zxfei
* @date 2023-05-23
*/
public interface CertificateCatalogTemplateService extends ICRUDService<CertificateCatalogTemplateEntity,Long>{
CertificateCatalogTemplateDao getDao();
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.certificate.service.impl;
import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.template.MetaTemplate;
import com.deepoove.poi.util.RegexUtils;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.code.ClassifyType;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.common.formdesign.*;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.ExcelUtil;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import java.util.*;
import java.util.List;
/**
......@@ -71,11 +58,6 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
if(entity.getIndustryId()==null){
throw new AppException("所属行业不能为空");
}
entity.setStatus(StatusEnum.ENABLE.getValue());
if(StringUtils.isNotEmpty(entity.getTemplateUrl())){
//entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
parseDocxToJson(entity,false);
}
}
......@@ -96,25 +78,9 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
if(entity.getIndustryId()==null){
throw new AppException("所属行业不能为空");
}
CertificateCatalogEntity old = this.get(entity.getId());
if(!old.getTemplateUrl().equals(entity.getTemplateUrl())) {
if (StringUtils.isNotEmpty(entity.getTemplateUrl())) {
//entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
parseDocxToJson(entity, false);
}
}
}
// @Override
// protected void validData(CertificateCatalogEntity entity, Context context) throws AppException {
// Map<String,Object> condition = new HashMap<>();
// condition.put("catalogName",entity.getCatalogName());
// List<CertificateCatalogEntity> list = this.dao.getList(condition);
// if(CollectionUtils.isNotEmpty(list)){
// throw new AppException("目录名称重复");
// }
// }
@Override
protected CertificateCatalogEntity findBefore(CertificateCatalogEntity params, PageInfo pageInfo, Context context) throws AppException {
......@@ -138,108 +104,6 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
}
}
private void parseDocxToJson(CertificateCatalogEntity entity,boolean onlyExcel) {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String filepath = rootPath + entity.getTemplateUrl();
ConfigureBuilder builder = Configure.builder();
builder.setValidErrorHandler(new Configure.DiscardHandler());
builder.useDefaultEL(false);
builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}"));
//builder.buildGramer("[","]");
XWPFTemplate template = XWPFTemplate.compile(filepath, builder.build());
FormDesignRoot root = new FormDesignRoot();
FormDesignConfig config = new FormDesignConfig();
config.initAttribute();
root.setConfig(config);
List<ListItem> collect = new ArrayList<>();
HashSet<String> hs = new HashSet<>(); //去除重复标签
List<String> excelList = new ArrayList<>(); //Excel模板
// excelList.add("证照目录ID");
// excelList.add("证照编号");
// excelList.add("证照名称");
// excelList.add("颁发时间");
// excelList.add("取件人姓名");
// excelList.add("取件人证件号码");
// excelList.add("持有者名称");
// excelList.add("持有者证件号码");
// excelList.add("企业名称");
for (MetaTemplate item : template.getElementTemplates()) {
if(hs.contains(item.variable())){
continue;
}else {
hs.add(item.variable());
}
//识别简单输入
String val = StrUtil.strip(item.variable(), "{{", "}}");
excelList.add(val);
List<String> keys = StrSplitter.split(val, "_", true, true);
//切分分隔符后动态 创建组件 i_1_姓名（第一个代表类型，第二个如果是多个累加，第三个显示label）
if (keys.size() > 2) {
String label = keys.get(2);
String type = keys.get(0);
ComponentCons cons = new ComponentCons();
cons.setLabel(label);
cons.setVal(val);
cons.setEl(item.variable());
cons.setUploadFileUrl(uploadUrl);
if (type.equalsIgnoreCase(ComponentEnum.DYNAMIC_TABLE.getValue())) {
HashSet<String> dhs = new HashSet<>(); //去除重复标签
List<TableColItem> colList = new ArrayList<>();
//表格 结构化绑定数据
ConfigureBuilder builderTable = Configure.builder();
builderTable.setValidErrorHandler(new Configure.DiscardHandler());
builderTable.useDefaultEL(false);
builderTable.buildGramer("[", "]");
XWPFTemplate templateTable = XWPFTemplate.compile(filepath, builderTable.build());
for (MetaTemplate col : templateTable.getElementTemplates()) {
if(dhs.contains(col.variable())){
continue;
}else {
dhs.add(col.variable());
}
String colVal = StrUtil.strip(col.variable(), "[", "]");
if (!StrUtil.startWith(colVal, label)) {
continue;
}
List<String> colKeys = StrSplitter.split(colVal, "_", true, true);
//提取当前table中的列元素
if (colKeys.size() > 3) {
String colLabel = colKeys.get(3);
String colType = colKeys.get(1);
TableColItem tableColItem = new TableColItem();
tableColItem.setLabel(colLabel);
tableColItem.setColType(colType);
tableColItem.setVal(colVal);
colList.add(tableColItem);
//System.out.println("列元素" + col.variable());
}
}
cons.setColList(colList);
DesignComponent designComponent = DesignComponent.createType(type);
ListItem listItem = designComponent.buildDefaultComponent(cons);
collect.add(listItem);
continue;
}
DesignComponent designComponent = DesignComponent.createType(type);
ListItem listItem = designComponent.buildDefaultComponent(cons);
if(type.equals(ComponentEnum.QRCODE.getValue())){
listItem.setValue(qrcode);
}
collect.add(listItem);
}
}
root.setList(collect);
String fileName = "file/uploadfile/excel/"+entity.getCatalogName()+"_批量导入模板.xls";
String excelFilePath = rootPath + fileName;
ExcelUtil.createCatalogTemplate(excelFilePath, excelList);
entity.setExcelFile(fileName);
if(!onlyExcel) {
entity.setFormContent(JSON.toJSONString(root));
}
}
public static void main(String[] args){
// String excelFilePath = "D:/mortals/app/data/cpm/" + "excel/test1.xls";
......@@ -255,12 +119,12 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
@Override
public void generateExcel(Long id, Context context) {
CertificateCatalogEntity entity = dao.get(id);
parseDocxToJson(entity,true);
CertificateCatalogEntity updata = new CertificateCatalogEntity();
updata.setId(entity.getId());
updata.setExcelFile(entity.getExcelFile());
updata.setUpdateTime(new Date());
dao.update(updata);
// CertificateCatalogEntity entity = dao.get(id);
// parseDocxToJson(entity,true);
// CertificateCatalogEntity updata = new CertificateCatalogEntity();
// updata.setId(entity.getId());
// updata.setExcelFile(entity.getExcelFile());
// updata.setUpdateTime(new Date());
// dao.update(updata);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogTemplateServiceImpl.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.service.impl;
import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.template.MetaTemplate;
import com.deepoove.poi.util.RegexUtils;
import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.code.StatusEnum;
import com.mortals.xhx.common.formdesign.*;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.ExcelUtil;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.certificate.dao.CertificateCatalogTemplateDao;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
/**
* CertificateCatalogTemplateService
* 证照目录模板 service实现
*
* @author zxfei
* @date 2023-05-23
*/
@Service("certificateCatalogTemplateService")
@Slf4j
public class CertificateCatalogTemplateServiceImpl extends AbstractCRUDServiceImpl<CertificateCatalogTemplateDao, CertificateCatalogTemplateEntity, Long> implements CertificateCatalogTemplateService {
@Value("${upload.path}")
private String filePath;
@Value("${upload.url:http://192.168.0.98:17216/cpm/file/commonupload?prePath=/file/uploadfile}")
private String uploadUrl;
@Value("${qrcode.url:http://rhpt.scjg.chengdu.gov.cn:8091/adap/spjy/process/generateQrCode.do?dto.applyId=}")
private String qrcode;
@Override
protected void saveBefore(CertificateCatalogTemplateEntity entity, Context context) throws AppException {
if(entity.getCatalogId()==null){
throw new AppException("证照目录不能为空");
}
entity.setStatus(StatusEnum.ENABLE.getValue());
if(StringUtils.isNotEmpty(entity.getTemplateFileUrl())){
//entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
parseDocxToJson(entity,false);
}
}
@Override
protected void updateBefore(CertificateCatalogTemplateEntity entity, Context context) throws AppException {
CertificateCatalogTemplateEntity old = this.get(entity.getId());
if(!old.getTemplateFileUrl().equals(entity.getTemplateFileUrl())) {
if (StringUtils.isNotEmpty(entity.getTemplateFileUrl())) {
//entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
parseDocxToJson(entity, false);
}
}
}
private void parseDocxToJson(CertificateCatalogTemplateEntity entity, boolean onlyExcel) {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String filepath = rootPath + entity.getTemplateFileUrl();
ConfigureBuilder builder = Configure.builder();
builder.setValidErrorHandler(new Configure.DiscardHandler());
builder.useDefaultEL(false);
builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}"));
//builder.buildGramer("[","]");
XWPFTemplate template = XWPFTemplate.compile(filepath, builder.build());
FormDesignRoot root = new FormDesignRoot();
FormDesignConfig config = new FormDesignConfig();
config.initAttribute();
root.setConfig(config);
List<ListItem> collect = new ArrayList<>();
HashSet<String> hs = new HashSet<>(); //去除重复标签
List<String> excelList = new ArrayList<>(); //Excel模板
for (MetaTemplate item : template.getElementTemplates()) {
if(hs.contains(item.variable())){
continue;
}else {
hs.add(item.variable());
}
//识别简单输入
String val = StrUtil.strip(item.variable(), "{{", "}}");
excelList.add(val);
List<String> keys = StrSplitter.split(val, "_", true, true);
//切分分隔符后动态 创建组件 i_1_姓名（第一个代表类型，第二个如果是多个累加，第三个显示label）
if (keys.size() > 2) {
String label = keys.get(2);
String type = keys.get(0);
ComponentCons cons = new ComponentCons();
cons.setLabel(label);
cons.setVal(val);
cons.setEl(item.variable());
cons.setUploadFileUrl(uploadUrl);
if (type.equalsIgnoreCase(ComponentEnum.DYNAMIC_TABLE.getValue())) {
HashSet<String> dhs = new HashSet<>(); //去除重复标签
List<TableColItem> colList = new ArrayList<>();
//表格 结构化绑定数据
ConfigureBuilder builderTable = Configure.builder();
builderTable.setValidErrorHandler(new Configure.DiscardHandler());
builderTable.useDefaultEL(false);
builderTable.buildGramer("[", "]");
XWPFTemplate templateTable = XWPFTemplate.compile(filepath, builderTable.build());
for (MetaTemplate col : templateTable.getElementTemplates()) {
if(dhs.contains(col.variable())){
continue;
}else {
dhs.add(col.variable());
}
String colVal = StrUtil.strip(col.variable(), "[", "]");
if (!StrUtil.startWith(colVal, label)) {
continue;
}
List<String> colKeys = StrSplitter.split(colVal, "_", true, true);
//提取当前table中的列元素
if (colKeys.size() > 3) {
String colLabel = colKeys.get(3);
String colType = colKeys.get(1);
TableColItem tableColItem = new TableColItem();
tableColItem.setLabel(colLabel);
tableColItem.setColType(colType);
tableColItem.setVal(colVal);
colList.add(tableColItem);
//System.out.println("列元素" + col.variable());
}
}
cons.setColList(colList);
DesignComponent designComponent = DesignComponent.createType(type);
ListItem listItem = designComponent.buildDefaultComponent(cons);
collect.add(listItem);
continue;
}
DesignComponent designComponent = DesignComponent.createType(type);
ListItem listItem = designComponent.buildDefaultComponent(cons);
if(type.equals(ComponentEnum.QRCODE.getValue())){
listItem.setValue(qrcode);
}
collect.add(listItem);
}
}
root.setList(collect);
String fileName = "file/uploadfile/excel/"+entity.getTemplateName()+"_批量导入模板.xls";
String excelFilePath = rootPath + fileName;
ExcelUtil.createCatalogTemplate(excelFilePath, excelList);
entity.setExcelFile(fileName);
if(!onlyExcel) {
entity.setFormContent(JSON.toJSONString(root));
}
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateCatalogTemplateController.java 0 → 100644
View file @ 34d1e119
package com.mortals.xhx.module.certificate.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 证照目录模板
*
* @author zxfei
* @date 2023-05-23
*/
@RestController
@RequestMapping("certificate/catalog/template")
public class CertificateCatalogTemplateController extends BaseCRUDJsonBodyMappingController<CertificateCatalogTemplateService,CertificateCatalogTemplateEntity,Long> {
@Autowired
private ParamService paramService;
public CertificateCatalogTemplateController(){
super.setModuleDesc( "证照目录模板");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "templateType", paramService.getParamBySecondOrganize("CertificateCatalogTemplate","templateType"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("CertificateCatalogTemplate","status"));
this.addDict(model, "isPdf", paramService.getParamBySecondOrganize("CertificateCatalogTemplate","isPdf"));
super.init(model, context);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/mid/web/DataInterfaceController.java
View file @ 34d1e119
......@@ -7,19 +7,15 @@ import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.mid.MidReq;
import com.mortals.xhx.feign.mid.IMidFeign;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogQuery;
import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.mid.pdu.*;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
import com.mortals.xhx.module.record.model.ApplyLogQuery;
import com.mortals.xhx.module.record.service.ApplyLogService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
......
certificate-manager/src/main/java/com/mortals/xhx/module/print/model/PrintCatalogEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.print.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.print.model.vo.PrintCatalogVo;
import lombok.Data;
/**
* 证照目录打印配置实体对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照目录打印配置实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class PrintCatalogEntity extends PrintCatalogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 打印服务配置ID
*/
private Long serviceId;
/**
* 证照目录ID
*/
......@@ -29,6 +37,14 @@ public class PrintCatalogEntity extends PrintCatalogVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 打印机名称
*/
private String printerName;
......@@ -40,134 +56,6 @@ public class PrintCatalogEntity extends PrintCatalogVo {
* 打印机纸盒
*/
private String paperSource;
/**
* 打印服务配置ID
*/
private Long serviceId;
/**
* 站点id
*/
private Long siteId;
public PrintCatalogEntity(){}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 打印机名称
* @return String
*/
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;
}
/**
* 获取 打印服务配置ID
* @return Long
*/
public Long getServiceId(){
return serviceId;
}
/**
* 设置 打印服务配置ID
* @param serviceId
*/
public void setServiceId(Long serviceId){
this.serviceId = serviceId;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -184,35 +72,26 @@ public class PrintCatalogEntity extends PrintCatalogVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",printerName:").append(getPrinterName());
sb.append(",printerIp:").append(getPrinterIp());
sb.append(",paperSource:").append(getPaperSource());
sb.append(",serviceId:").append(getServiceId());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.catalogId = null;
this.siteId = -1L;
this.serviceId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.printerName = "";
this.printerIp = "";
this.paperSource = "";
this.serviceId = null;
this.siteId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/print/model/PrintCatalogQuery.java
View file @ 34d1e119
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.print.model;
import java.util.List;
import com.mortals.xhx.module.print.model.PrintCatalogEntity;
/**
* 证照目录打印配置查询对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照目录打印配置查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class PrintCatalogQuery extends PrintCatalogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -24,6 +24,36 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 打印服务配置ID */
private Long serviceIdStart;
/** 结束 打印服务配置ID */
private Long serviceIdEnd;
/** 增加 打印服务配置ID */
private Long serviceIdIncrement;
/** 打印服务配置ID列表 */
private List <Long> serviceIdList;
/** 打印服务配置ID排除列表 */
private List <Long> serviceIdNotList;
/** 开始 证照目录ID */
private Long catalogIdStart;
......@@ -49,6 +79,26 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 打印机名称 */
private List<String> printerNameList;
......@@ -106,36 +156,6 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 打印服务配置ID */
private Long serviceIdStart;
/** 结束 打印服务配置ID */
private Long serviceIdEnd;
/** 增加 打印服务配置ID */
private Long serviceIdIncrement;
/** 打印服务配置ID列表 */
private List <Long> serviceIdList;
/** 打印服务配置ID排除列表 */
private List <Long> serviceIdNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintCatalogQuery> orConditionList;
......@@ -225,6 +245,168 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 打印服务配置ID
* @return serviceIdStart
*/
public Long getServiceIdStart(){
return this.serviceIdStart;
}
/**
* 设置 开始 打印服务配置ID
* @param serviceIdStart
*/
public void setServiceIdStart(Long serviceIdStart){
this.serviceIdStart = serviceIdStart;
}
/**
* 获取 结束 打印服务配置ID
* @return $serviceIdEnd
*/
public Long getServiceIdEnd(){
return this.serviceIdEnd;
}
/**
* 设置 结束 打印服务配置ID
* @param serviceIdEnd
*/
public void setServiceIdEnd(Long serviceIdEnd){
this.serviceIdEnd = serviceIdEnd;
}
/**
* 获取 增加 打印服务配置ID
* @return serviceIdIncrement
*/
public Long getServiceIdIncrement(){
return this.serviceIdIncrement;
}
/**
* 设置 增加 打印服务配置ID
* @param serviceIdIncrement
*/
public void setServiceIdIncrement(Long serviceIdIncrement){
this.serviceIdIncrement = serviceIdIncrement;
}
/**
* 获取 打印服务配置ID
* @return serviceIdList
*/
public List<Long> getServiceIdList(){
return this.serviceIdList;
}
/**
* 设置 打印服务配置ID
* @param serviceIdList
*/
public void setServiceIdList(List<Long> serviceIdList){
this.serviceIdList = serviceIdList;
}
/**
* 获取 打印服务配置ID
* @return serviceIdNotList
*/
public List<Long> getServiceIdNotList(){
return this.serviceIdNotList;
}
/**
* 设置 打印服务配置ID
* @param serviceIdNotList
*/
public void setServiceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
......@@ -371,58 +553,171 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
}
/**
* 获取 打印机名称
* @return printerNameList
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 打印机名称
* @param printerNameList
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 打印机名称
* @return printerNameNotList
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public List<String> getPrinterNameNotList(){
return this.printerNameNotList;
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 打印机名称
* @param printerNameNotList
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setPrinterNameNotList(List<String> printerNameNotList){
this.printerNameNotList = printerNameNotList;
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 打印机网络地址
* @return printerIpList
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 打印机网络地址
* @param printerIpList
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 打印机网络地址
* @return printerIpNotList
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<String> getPrinterIpNotList(){
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 打印机名称
* @return printerNameList
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
}
/**
* 获取 打印机名称
* @return printerNameNotList
*/
public List<String> getPrinterNameNotList(){
return this.printerNameNotList;
}
/**
* 设置 打印机名称
* @param printerNameNotList
*/
public void setPrinterNameNotList(List<String> printerNameNotList){
this.printerNameNotList = printerNameNotList;
}
/**
* 获取 打印机网络地址
* @return printerIpList
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
}
/**
* 获取 打印机网络地址
* @return printerIpNotList
*/
public List<String> getPrinterIpNotList(){
return this.printerIpNotList;
}
......@@ -693,218 +988,164 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
}
/**
* 获取 开始 打印服务配置ID
* @return serviceIdStart
*/
public Long getServiceIdStart(){
return this.serviceIdStart;
}
/**
* 设置 开始 打印服务配置ID
* @param serviceIdStart
*/
public void setServiceIdStart(Long serviceIdStart){
this.serviceIdStart = serviceIdStart;
}
/**
* 获取 结束 打印服务配置ID
* @return $serviceIdEnd
*/
public Long getServiceIdEnd(){
return this.serviceIdEnd;
}
/**
* 设置 结束 打印服务配置ID
* @param serviceIdEnd
*/
public void setServiceIdEnd(Long serviceIdEnd){
this.serviceIdEnd = serviceIdEnd;
}
/**
* 获取 增加 打印服务配置ID
* @return serviceIdIncrement
* 设置 序号，主键，自增长
* @param id
*/
public Long getServiceIdIncrement(){
return this.serviceIdIncrement;
public PrintCatalogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 增加 打印服务配置ID
* @param serviceIdIncrement
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setServiceIdIncrement(Long serviceIdIncrement){
this.serviceIdIncrement = serviceIdIncrement;
public PrintCatalogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 获取 打印服务配置ID
* @return serviceIdList
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public List<Long> getServiceIdList(){
return this.serviceIdList;
public PrintCatalogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 打印服务配置ID
* @param serviceIdList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setServiceIdList(List<Long> serviceIdList){
this.serviceIdList = serviceIdList;
public PrintCatalogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 获取 打印服务配置ID
* @return serviceIdNotList
* 设置 序号，主键，自增长
* @param idList
*/
public List<Long> getServiceIdNotList(){
return this.serviceIdNotList;
public PrintCatalogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 打印服务配置ID
* @param serviceIdNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setServiceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
public PrintCatalogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 获取 开始 站点id
* @return siteIdStart
* 设置 站点id
* @param siteId
*/
public Long getSiteIdStart(){
return this.siteIdStart;
public PrintCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
public PrintCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
public PrintCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
public PrintCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
public PrintCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
public PrintCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param id
* 设置 打印服务配置ID
* @param serviceId
*/
public PrintCatalogQuery id(Long id){
setId(id);
public PrintCatalogQuery serviceId(Long serviceId){
setServiceId(serviceId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 打印服务配置ID
* @param serviceIdStart
*/
public PrintCatalogQuery idStart(Long idStart){
this.idStart = idStart;
public PrintCatalogQuery serviceIdStart(Long serviceIdStart){
this.serviceIdStart = serviceIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 打印服务配置ID
* @param serviceIdEnd
*/
public PrintCatalogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public PrintCatalogQuery serviceIdEnd(Long serviceIdEnd){
this.serviceIdEnd = serviceIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 打印服务配置ID
* @param serviceIdIncrement
*/
public PrintCatalogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public PrintCatalogQuery serviceIdIncrement(Long serviceIdIncrement){
this.serviceIdIncrement = serviceIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 打印服务配置ID
* @param serviceIdList
*/
public PrintCatalogQuery idList(List<Long> idList){
this.idList = idList;
public PrintCatalogQuery serviceIdList(List<Long> serviceIdList){
this.serviceIdList = serviceIdList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 打印服务配置ID
* @param serviceIdNotList
*/
public PrintCatalogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
public PrintCatalogQuery serviceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
return this;
}
......@@ -1000,6 +1241,79 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintCatalogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintCatalogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintCatalogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintCatalogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintCatalogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintCatalogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintCatalogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintCatalogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 打印机名称
......@@ -1167,114 +1481,6 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
}
/**
* 设置 打印服务配置ID
* @param serviceId
*/
public PrintCatalogQuery serviceId(Long serviceId){
setServiceId(serviceId);
return this;
}
/**
* 设置 开始 打印服务配置ID
* @param serviceIdStart
*/
public PrintCatalogQuery serviceIdStart(Long serviceIdStart){
this.serviceIdStart = serviceIdStart;
return this;
}
/**
* 设置 结束 打印服务配置ID
* @param serviceIdEnd
*/
public PrintCatalogQuery serviceIdEnd(Long serviceIdEnd){
this.serviceIdEnd = serviceIdEnd;
return this;
}
/**
* 设置 增加 打印服务配置ID
* @param serviceIdIncrement
*/
public PrintCatalogQuery serviceIdIncrement(Long serviceIdIncrement){
this.serviceIdIncrement = serviceIdIncrement;
return this;
}
/**
* 设置 打印服务配置ID
* @param serviceIdList
*/
public PrintCatalogQuery serviceIdList(List<Long> serviceIdList){
this.serviceIdList = serviceIdList;
return this;
}
/**
* 设置 打印服务配置ID
* @param serviceIdNotList
*/
public PrintCatalogQuery serviceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public PrintCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/print/service/PrintCatalogService.java
View file @ 34d1e119
......@@ -18,5 +18,5 @@ public interface PrintCatalogService extends ICRUDService<PrintCatalogEntity,Lon
* @param catalogId
* @return
*/
PrintCatalogEntity getPrintCatalogByService(Long serviceId,Long catalogId) throws AppException;
PrintCatalogEntity getPrintCatalogByService(Long serviceId,Long catalogId,Long templateId) throws AppException;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/print/service/impl/PrintCatalogServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.print.service.impl;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import com.mortals.xhx.module.print.model.PrintCatalogQuery;
import com.mortals.xhx.module.print.model.PrintServiceEntity;
import com.mortals.xhx.module.print.service.PrintServiceService;
......@@ -30,6 +32,8 @@ public class PrintCatalogServiceImpl extends AbstractCRUDServiceImpl<PrintCatalo
private CertificateCatalogService certificateCatalogService;
@Autowired
private PrintServiceService printServiceService;
@Autowired
private CertificateCatalogTemplateService certificateCatalogTemplateService;
@Override
protected void validData(PrintCatalogEntity entity, Context context) throws AppException {
......@@ -53,7 +57,7 @@ public class PrintCatalogServiceImpl extends AbstractCRUDServiceImpl<PrintCatalo
}
@Override
public PrintCatalogEntity getPrintCatalogByService(Long serviceId, Long catalogId) throws AppException {
public PrintCatalogEntity getPrintCatalogByService(Long serviceId, Long catalogId,Long templateId) throws AppException {
PrintServiceEntity printServiceEntity = printServiceService.get(serviceId);
if(printServiceEntity == null){
throw new AppException("打印服务id不正确");
......@@ -71,14 +75,18 @@ public class PrintCatalogServiceImpl extends AbstractCRUDServiceImpl<PrintCatalo
if(catalogEntity == null){
throw new AppException("证照目录id不正确");
}
CertificateCatalogTemplateEntity catalogTemplateEntity = certificateCatalogTemplateService.get(templateId);
if(catalogTemplateEntity == null){
throw new AppException("证照目录模板id不正确");
}
data = new PrintCatalogEntity();
data.setServiceUrl(printServiceEntity.getServiceUrl());
data.setCatalogCode(catalogEntity.getCatalogCode());
data.setCatalogName(catalogEntity.getCatalogName());
data.setCatalogId(catalogEntity.getId());
data.setPrinterIp(catalogEntity.getPrinterIp());
data.setPrinterName(catalogEntity.getPrinterName());
data.setPaperSource(catalogEntity.getPaperSource());
data.setPrinterIp(catalogTemplateEntity.getPrinterIp());
data.setPrinterName(catalogTemplateEntity.getPrinterName());
data.setPaperSource(catalogTemplateEntity.getPaperSource());
}
return data;
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.record.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
......@@ -7,16 +6,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
import lombok.Data;
/**
* 证照申请实体对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照申请实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
......@@ -34,6 +38,14 @@ public class ApplyLogEntity extends ApplyLogVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证件编号
*/
private String certificateCode;
......@@ -113,368 +125,6 @@ public class ApplyLogEntity extends ApplyLogVo {
* 归档状态0否1是
*/
private Integer recordStatus;
/**
* 站点id
*/
private Long siteId;
public ApplyLogEntity(){}
/**
* 获取 证照档案ID
* @return Long
*/
public Long getRecordId(){
return recordId;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证件编号
* @return String
*/
public String getCertificateCode(){
return certificateCode;
}
/**
* 设置 证件编号
* @param certificateCode
*/
public void setCertificateCode(String certificateCode){
this.certificateCode = certificateCode;
}
/**
* 获取 证件名称
* @return String
*/
public String getCertificateName(){
return certificateName;
}
/**
* 设置 证件名称
* @param certificateName
*/
public void setCertificateName(String certificateName){
this.certificateName = certificateName;
}
/**
* 获取 颁发时间
* @return Date
*/
public Date getIssueTime(){
return issueTime;
}
/**
* 设置 颁发时间
* @param issueTime
*/
public void setIssueTime(Date issueTime){
this.issueTime = issueTime;
}
/**
* 获取 取件人姓名
* @return String
*/
public String getPickerName(){
return pickerName;
}
/**
* 设置 取件人姓名
* @param pickerName
*/
public void setPickerName(String pickerName){
this.pickerName = pickerName;
}
/**
* 获取 取件人证件号码
* @return String
*/
public String getPickerIDCardNo(){
return pickerIDCardNo;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNo
*/
public void setPickerIDCardNo(String pickerIDCardNo){
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 持有者类型，1：自然人，2：法人，3：自然人法人
* @return Integer
*/
public Integer getHolderType(){
return holderType;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderType
*/
public void setHolderType(Integer holderType){
this.holderType = holderType;
}
/**
* 获取 持有者证件类型，1：身份证，2：组织机构代码等
* @return Integer
*/
public Integer getHolderIdType(){
return holderIdType;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdType
*/
public void setHolderIdType(Integer holderIdType){
this.holderIdType = holderIdType;
}
/**
* 获取 持有者名称
* @return String
*/
public String getHolderName(){
return holderName;
}
/**
* 设置 持有者名称
* @param holderName
*/
public void setHolderName(String holderName){
this.holderName = holderName;
}
/**
* 获取 持有者证件号码
* @return String
*/
public String getHolderIDCardNo(){
return holderIDCardNo;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public void setHolderIDCardNo(String holderIDCardNo){
this.holderIDCardNo = holderIDCardNo;
}
/**
* 获取 企业名称
* @return String
*/
public String getEnterpriseName(){
return enterpriseName;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public void setEnterpriseName(String enterpriseName){
this.enterpriseName = enterpriseName;
}
/**
* 获取 有效期起始
* @return Date
*/
public Date getValidityStart(){
return validityStart;
}
/**
* 设置 有效期起始
* @param validityStart
*/
public void setValidityStart(Date validityStart){
this.validityStart = validityStart;
}
/**
* 获取 有效期截止
* @return Date
*/
public Date getValidityEnd(){
return validityEnd;
}
/**
* 设置 有效期截止
* @param validityEnd
*/
public void setValidityEnd(Date validityEnd){
this.validityEnd = validityEnd;
}
/**
* 获取 专网ID
* @return String
*/
public String getPrivateID(){
return privateID;
}
/**
* 设置 专网ID
* @param privateID
*/
public void setPrivateID(String privateID){
this.privateID = privateID;
}
/**
* 获取 证件附件地址
* @return String
*/
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 证件附件地址
* @param certificateUrl
*/
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 证件预览地址
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 证件预览地址
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 证照模板正本表单内容
* @return String
*/
public String getFormContent(){
return formContent;
}
/**
* 设置 证照模板正本表单内容
* @param formContent
*/
public void setFormContent(String formContent){
this.formContent = formContent;
}
/**
* 获取 证照模板正本表单内容
* @return String
*/
public String getFormTemplate(){
return formTemplate;
}
/**
* 设置 证照模板正本表单内容
* @param formTemplate
*/
public void setFormTemplate(String formTemplate){
this.formTemplate = formTemplate;
}
/**
* 获取 生成状态1未生成2已生成
* @return Integer
*/
public Integer getGenerateStatus(){
return generateStatus;
}
/**
* 设置 生成状态1未生成2已生成
* @param generateStatus
*/
public void setGenerateStatus(Integer generateStatus){
this.generateStatus = generateStatus;
}
/**
* 获取 档案操作类型1新增2变更
* @return Integer
*/
public Integer getOperType(){
return operType;
}
/**
* 设置 档案操作类型1新增2变更
* @param operType
*/
public void setOperType(Integer operType){
this.operType = operType;
}
/**
* 获取 归档状态0否1是
* @return Integer
*/
public Integer getRecordStatus(){
return recordStatus;
}
/**
* 设置 归档状态0否1是
* @param recordStatus
*/
public void setRecordStatus(Integer recordStatus){
this.recordStatus = recordStatus;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -491,46 +141,22 @@ public class ApplyLogEntity extends ApplyLogVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",issueTime:").append(getIssueTime());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",holderType:").append(getHolderType());
sb.append(",holderIdType:").append(getHolderIdType());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",validityStart:").append(getValidityStart());
sb.append(",validityEnd:").append(getValidityEnd());
sb.append(",privateID:").append(getPrivateID());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",formContent:").append(getFormContent());
sb.append(",formTemplate:").append(getFormTemplate());
sb.append(",generateStatus:").append(getGenerateStatus());
sb.append(",operType:").append(getOperType());
sb.append(",recordStatus:").append(getRecordStatus());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = null;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateCode = "";
this.certificateName = "";
......@@ -570,7 +196,5 @@ public class ApplyLogEntity extends ApplyLogVo {
this.operType = 1;
this.recordStatus = 0;
this.siteId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 34d1e119
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
/**
* 证照申请查询对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照申请查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -25,6 +25,21 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */
private Long recordIdStart;
......@@ -65,6 +80,26 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证件编号 */
private List<String> certificateCodeList;
......@@ -260,21 +295,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 归档状态0否1是排除列表 */
private List <Integer> recordStatusNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ApplyLogQuery> orConditionList;
......@@ -364,6 +384,87 @@ public class ApplyLogQuery extends ApplyLogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
......@@ -590,6 +691,119 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.catalogNameNotList = catalogNameNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 证件编号
* @return certificateCodeList
......@@ -1702,137 +1916,110 @@ public class ApplyLogQuery extends ApplyLogEntity {
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 序号，主键，自增长
* @param id
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public ApplyLogQuery id(Long id){
setId(id);
return this;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
public ApplyLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public ApplyLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 获取 站点id
* @return siteIdList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public ApplyLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 序号，主键，自增长
* @param idList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public ApplyLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 获取 站点id
* @return siteIdNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
public ApplyLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
* @param siteId
*/
public ApplyLogQuery id(Long id){
setId(id);
public ApplyLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 站点id
* @param siteIdStart
*/
public ApplyLogQuery idStart(Long idStart){
this.idStart = idStart;
public ApplyLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 站点id
* @param siteIdEnd
*/
public ApplyLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public ApplyLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 站点id
* @param siteIdIncrement
*/
public ApplyLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public ApplyLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 站点id
* @param siteIdList
*/
public ApplyLogQuery idList(List<Long> idList){
this.idList = idList;
public ApplyLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 站点id
* @param siteIdNotList
*/
public ApplyLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
public ApplyLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
......@@ -1982,6 +2169,79 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public ApplyLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public ApplyLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public ApplyLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public ApplyLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public ApplyLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public ApplyLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public ApplyLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public ApplyLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 证件编号
......@@ -2593,60 +2853,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public ApplyLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public ApplyLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public ApplyLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public ApplyLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public ApplyLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public ApplyLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.record.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
......@@ -7,16 +6,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo;
import lombok.Data;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录ID
*/
......@@ -38,6 +42,14 @@ public class PrintLogEntity extends PrintLogVo {
*/
private String certificateCode;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 企业名称
*/
private String enterpriseName;
......@@ -73,228 +85,6 @@ public class PrintLogEntity extends PrintLogVo {
* 打印设备
*/
private Long deviceId;
/**
* 站点id
*/
private Long siteId;
public PrintLogEntity(){}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
public String getCertificateName(){
return certificateName;
}
/**
* 设置 证照名称
* @param certificateName
*/
public void setCertificateName(String certificateName){
this.certificateName = certificateName;
}
/**
* 获取 证照编号
* @return String
*/
public String getCertificateCode(){
return certificateCode;
}
/**
* 设置 证照编号
* @param certificateCode
*/
public void setCertificateCode(String certificateCode){
this.certificateCode = certificateCode;
}
/**
* 获取 企业名称
* @return String
*/
public String getEnterpriseName(){
return enterpriseName;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public void setEnterpriseName(String enterpriseName){
this.enterpriseName = enterpriseName;
}
/**
* 获取 持有者姓名
* @return String
*/
public String getHolderName(){
return holderName;
}
/**
* 设置 持有者姓名
* @param holderName
*/
public void setHolderName(String holderName){
this.holderName = holderName;
}
/**
* 获取 持有者证件号码
* @return String
*/
public String getHolderIDCardNo(){
return holderIDCardNo;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public void setHolderIDCardNo(String holderIDCardNo){
this.holderIDCardNo = holderIDCardNo;
}
/**
* 获取 取件人姓名
* @return String
*/
public String getPickerName(){
return pickerName;
}
/**
* 设置 取件人姓名
* @param pickerName
*/
public void setPickerName(String pickerName){
this.pickerName = pickerName;
}
/**
* 获取 取件人证件号码
* @return String
*/
public String getPickerIDCardNo(){
return pickerIDCardNo;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNo
*/
public void setPickerIDCardNo(String pickerIDCardNo){
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 打印状态1打印成功0失败
* @return Integer
*/
public Integer getPrintStatus(){
return printStatus;
}
/**
* 设置 打印状态1打印成功0失败
* @param printStatus
*/
public void setPrintStatus(Integer printStatus){
this.printStatus = printStatus;
}
/**
* 获取 打印时间
* @return Date
*/
public Date getPrintDate(){
return printDate;
}
/**
* 设置 打印时间
* @param printDate
*/
public void setPrintDate(Date printDate){
this.printDate = printDate;
}
/**
* 获取 打印结果描述
* @return String
*/
public String getStatusRemark(){
return statusRemark;
}
/**
* 设置 打印结果描述
* @param statusRemark
*/
public void setStatusRemark(String statusRemark){
this.statusRemark = statusRemark;
}
/**
* 获取 打印设备
* @return Long
*/
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 打印设备
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -311,29 +101,11 @@ public class PrintLogEntity extends PrintLogVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",printStatus:").append(getPrintStatus());
sb.append(",printDate:").append(getPrintDate());
sb.append(",statusRemark:").append(getStatusRemark());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.catalogId = null;
this.siteId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
......@@ -343,6 +115,10 @@ public class PrintLogEntity extends PrintLogVo {
this.certificateCode = "";
this.templateId = -1L;
this.templateName = "";
this.enterpriseName = "";
this.holderName = "";
......@@ -359,8 +135,6 @@ public class PrintLogEntity extends PrintLogVo {
this.statusRemark = "";
this.deviceId = null;
this.siteId = null;
this.deviceId = -1L;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 34d1e119
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.record.model.PrintLogEntity;
/**
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -25,6 +25,21 @@ public class PrintLogQuery extends PrintLogEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照目录ID */
private Long catalogIdStart;
......@@ -60,6 +75,26 @@ public class PrintLogQuery extends PrintLogEntity {
/** 证照编号排除列表 */
private List <String> certificateCodeNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 企业名称 */
private List<String> enterpriseNameList;
......@@ -168,21 +203,6 @@ public class PrintLogQuery extends PrintLogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintLogQuery> orConditionList;
......@@ -272,6 +292,87 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
......@@ -481,6 +582,119 @@ public class PrintLogQuery extends PrintLogEntity {
this.certificateCodeNotList = certificateCodeNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 企业名称
* @return enterpriseNameList
......@@ -1094,137 +1308,110 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 序号，主键，自增长
* @param id
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public PrintLogQuery id(Long id){
setId(id);
return this;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
public PrintLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public PrintLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 获取 站点id
* @return siteIdList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public PrintLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 序号，主键，自增长
* @param idList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public PrintLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 获取 站点id
* @return siteIdNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
public PrintLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
* @param siteId
*/
public PrintLogQuery id(Long id){
setId(id);
public PrintLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintLogQuery idStart(Long idStart){
this.idStart = idStart;
public PrintLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public PrintLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public PrintLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 站点id
* @param siteIdList
*/
public PrintLogQuery idList(List<Long> idList){
this.idList = idList;
public PrintLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 站点id
* @param siteIdNotList
*/
public PrintLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
public PrintLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
......@@ -1358,6 +1545,79 @@ public class PrintLogQuery extends PrintLogEntity {
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 企业名称
......@@ -1691,60 +1951,6 @@ public class PrintLogQuery extends PrintLogEntity {
}
/**
* 设置 站点id
* @param siteId
*/
public PrintLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.record.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
import lombok.Data;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
......@@ -37,6 +41,14 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
private String certificateName;
......@@ -80,256 +92,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
* 允许打印次数
*/
private Integer total;
/**
* 站点id
*/
private Long siteId;
public PrintWaitQueueEntity(){}
/**
* 获取 证照档案ID
* @return Long
*/
public Long getRecordId(){
return recordId;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 获取 申请ID
* @return Long
*/
public Long getApplyId(){
return applyId;
}
/**
* 设置 申请ID
* @param applyId
*/
public void setApplyId(Long applyId){
this.applyId = applyId;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
public String getCertificateName(){
return certificateName;
}
/**
* 设置 证照名称
* @param certificateName
*/
public void setCertificateName(String certificateName){
this.certificateName = certificateName;
}
/**
* 获取 证照编号
* @return String
*/
public String getCertificateCode(){
return certificateCode;
}
/**
* 设置 证照编号
* @param certificateCode
*/
public void setCertificateCode(String certificateCode){
this.certificateCode = certificateCode;
}
/**
* 获取 企业名称
* @return String
*/
public String getEnterpriseName(){
return enterpriseName;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public void setEnterpriseName(String enterpriseName){
this.enterpriseName = enterpriseName;
}
/**
* 获取 持有者姓名
* @return String
*/
public String getHolderName(){
return holderName;
}
/**
* 设置 持有者姓名
* @param holderName
*/
public void setHolderName(String holderName){
this.holderName = holderName;
}
/**
* 获取 持有者证件号码
* @return String
*/
public String getHolderIDCardNo(){
return holderIDCardNo;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public void setHolderIDCardNo(String holderIDCardNo){
this.holderIDCardNo = holderIDCardNo;
}
/**
* 获取 取件人姓名
* @return String
*/
public String getPickerName(){
return pickerName;
}
/**
* 设置 取件人姓名
* @param pickerName
*/
public void setPickerName(String pickerName){
this.pickerName = pickerName;
}
/**
* 获取 取件人证件号码
* @return String
*/
public String getPickerIDCardNo(){
return pickerIDCardNo;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNo
*/
public void setPickerIDCardNo(String pickerIDCardNo){
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 证件预览地址
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 证件预览地址
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 证件附件地址
* @return String
*/
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 证件附件地址
* @param certificateUrl
*/
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 是否完成打印0否1是
* @return Integer
*/
public Integer getPrintStatus(){
return printStatus;
}
/**
* 设置 是否完成打印0否1是
* @param printStatus
*/
public void setPrintStatus(Integer printStatus){
this.printStatus = printStatus;
}
/**
* 获取 允许打印次数
* @return Integer
*/
public Integer getTotal(){
return total;
}
/**
* 设置 允许打印次数
* @param total
*/
public void setTotal(Integer total){
this.total = total;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -346,40 +108,24 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",applyId:").append(getApplyId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",printStatus:").append(getPrintStatus());
sb.append(",total:").append(getTotal());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.siteId = -1L;
this.applyId = null;
this.recordId = -1L;
this.catalogId = null;
this.applyId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -401,7 +147,5 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.printStatus = 0;
this.total = 1;
this.siteId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java
View file @ 34d1e119
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model;
import java.util.List;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/**
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -24,6 +24,21 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */
private Long recordIdStart;
......@@ -79,6 +94,26 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证照名称 */
private List<String> certificateNameList;
......@@ -196,21 +231,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintWaitQueueQuery> orConditionList;
......@@ -300,6 +320,87 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
......@@ -607,6 +708,119 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.catalogNameNotList = catalogNameNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 证照名称
* @return certificateNameList
......@@ -1284,137 +1498,110 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 序号，主键，自增长
* @param id
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public PrintWaitQueueQuery id(Long id){
setId(id);
return this;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
public PrintWaitQueueQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public PrintWaitQueueQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 获取 站点id
* @return siteIdList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public PrintWaitQueueQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 序号，主键，自增长
* @param idList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public PrintWaitQueueQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 获取 站点id
* @return siteIdNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
public PrintWaitQueueQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
* @param siteId
*/
public PrintWaitQueueQuery id(Long id){
setId(id);
public PrintWaitQueueQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintWaitQueueQuery idStart(Long idStart){
this.idStart = idStart;
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintWaitQueueQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintWaitQueueQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 站点id
* @param siteIdList
*/
public PrintWaitQueueQuery idList(List<Long> idList){
this.idList = idList;
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 站点id
* @param siteIdNotList
*/
public PrintWaitQueueQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
......@@ -1618,6 +1805,79 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintWaitQueueQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintWaitQueueQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintWaitQueueQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintWaitQueueQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintWaitQueueQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintWaitQueueQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintWaitQueueQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintWaitQueueQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 证照名称
......@@ -2007,60 +2267,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 站点id
* @param siteId
*/
public PrintWaitQueueQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 34d1e119
package com.mortals.xhx.module.record.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo;
import lombok.Data;
/**
* 证照持有实体对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照持有实体对象
*
* @author zxfei
* @date 2023-05-24
*/
@Data
public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
......@@ -33,6 +37,14 @@ public class RetainLogEntity extends RetainLogVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
private String certificateName;
......@@ -64,200 +76,6 @@ public class RetainLogEntity extends RetainLogVo {
* 证件预览地址
*/
private String previewUrl;
/**
* 站点id
*/
private Long siteId;
public RetainLogEntity(){}
/**
* 获取 证照档案ID
* @return Long
*/
public Long getRecordId(){
return recordId;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public void setRecordId(Long recordId){
this.recordId = recordId;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 目录名称
* @return String
*/
public String getCatalogName(){
return catalogName;
}
/**
* 设置 目录名称
* @param catalogName
*/
public void setCatalogName(String catalogName){
this.catalogName = catalogName;
}
/**
* 获取 证照名称
* @return String
*/
public String getCertificateName(){
return certificateName;
}
/**
* 设置 证照名称
* @param certificateName
*/
public void setCertificateName(String certificateName){
this.certificateName = certificateName;
}
/**
* 获取 证照编号
* @return String
*/
public String getCertificateCode(){
return certificateCode;
}
/**
* 设置 证照编号
* @param certificateCode
*/
public void setCertificateCode(String certificateCode){
this.certificateCode = certificateCode;
}
/**
* 获取 企业名称
* @return String
*/
public String getEnterpriseName(){
return enterpriseName;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public void setEnterpriseName(String enterpriseName){
this.enterpriseName = enterpriseName;
}
/**
* 获取 持有者姓名
* @return String
*/
public String getHolderName(){
return holderName;
}
/**
* 设置 持有者姓名
* @param holderName
*/
public void setHolderName(String holderName){
this.holderName = holderName;
}
/**
* 获取 持有者证件号码
* @return String
*/
public String getHolderIDCardNo(){
return holderIDCardNo;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public void setHolderIDCardNo(String holderIDCardNo){
this.holderIDCardNo = holderIDCardNo;
}
/**
* 获取 证照状态，1正常2注销
* @return Integer
*/
public Integer getCertificateStatus(){
return certificateStatus;
}
/**
* 设置 证照状态，1正常2注销
* @param certificateStatus
*/
public void setCertificateStatus(Integer certificateStatus){
this.certificateStatus = certificateStatus;
}
/**
* 获取 证件附件地址
* @return String
*/
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 证件附件地址
* @param certificateUrl
*/
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 证件预览地址
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 证件预览地址
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -274,34 +92,22 @@ public class RetainLogEntity extends RetainLogVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",recordId:").append(getRecordId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",catalogName:").append(getCatalogName());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",certificateStatus:").append(getCertificateStatus());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",siteId:").append(getSiteId());
return sb.toString();
}
public void initAttrValue(){
this.recordId = null;
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = null;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -317,7 +123,5 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateUrl = "";
this.previewUrl = "";
this.siteId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 34d1e119
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model;
import java.util.List;
import com.mortals.xhx.module.record.model.RetainLogEntity;
/**
* 证照持有查询对象
*
* @author zxfei
* @date 2023-05-14
*/
* 证照持有查询对象
*
* @author zxfei
* @date 2023-05-24
*/
public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -24,6 +24,21 @@ public class RetainLogQuery extends RetainLogEntity {
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */
private Long recordIdStart;
......@@ -64,6 +79,26 @@ public class RetainLogQuery extends RetainLogEntity {
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证照名称 */
private List<String> certificateNameList;
......@@ -156,21 +191,6 @@ public class RetainLogQuery extends RetainLogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<RetainLogQuery> orConditionList;
......@@ -260,6 +280,87 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 证照档案ID
* @return recordIdStart
......@@ -486,6 +587,119 @@ public class RetainLogQuery extends RetainLogEntity {
this.catalogNameNotList = catalogNameNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 证照名称
* @return certificateNameList
......@@ -1018,137 +1232,110 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 序号，主键，自增长
* @param id
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public RetainLogQuery id(Long id){
setId(id);
return this;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
public RetainLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public RetainLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 获取 站点id
* @return siteIdList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public RetainLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 序号，主键，自增长
* @param idList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public RetainLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 获取 站点id
* @return siteIdNotList
* 设置 序号，主键，自增长
* @param idNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
public RetainLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
* @param siteId
*/
public RetainLogQuery id(Long id){
setId(id);
public RetainLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
* 设置 开始 站点id
* @param siteIdStart
*/
public RetainLogQuery idStart(Long idStart){
this.idStart = idStart;
public RetainLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
* 设置 结束 站点id
* @param siteIdEnd
*/
public RetainLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
public RetainLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
* 设置 增加 站点id
* @param siteIdIncrement
*/
public RetainLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
public RetainLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
* 设置 站点id
* @param siteIdList
*/
public RetainLogQuery idList(List<Long> idList){
this.idList = idList;
public RetainLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
* 设置 站点id
* @param siteIdNotList
*/
public RetainLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
public RetainLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
......@@ -1298,6 +1485,79 @@ public class RetainLogQuery extends RetainLogEntity {
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public RetainLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public RetainLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public RetainLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public RetainLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public RetainLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public RetainLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public RetainLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public RetainLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 证照名称
......@@ -1595,60 +1855,6 @@ public class RetainLogQuery extends RetainLogEntity {
}
/**
* 设置 站点id
* @param siteId
*/
public RetainLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public RetainLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public RetainLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public RetainLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public RetainLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public RetainLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/ApplyLogService.java
View file @ 34d1e119
......@@ -50,7 +50,7 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{
* @param context
* @return
*/
String importData(List<Map<Integer, Object>> dataList,Map<String,String> fileMap,Long catalogId,Context context) throws AppException;
String importData(List<Map<Integer, Object>> dataList,Map<String,String> fileMap,Long catalogId,Long templateId,Context context) throws AppException;
/**
* api接口提交数据
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/RetainLogService.java
View file @ 34d1e119
......@@ -14,11 +14,4 @@ import com.mortals.xhx.module.record.model.RetainLogEntity;
*/
public interface RetainLogService extends ICRUDService<RetainLogEntity,Long>{
/**
* 添加持有记录
* @param applyLogEntity
* @param context
* @throws AppException
*/
void creatRetainLog(ApplyLogEntity applyLogEntity, Context context) throws AppException;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 34d1e119
......@@ -22,12 +22,10 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.utils.*;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogQuery;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
import com.mortals.xhx.module.certificate.model.*;
import com.mortals.xhx.module.certificate.pdu.ApplyLogPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.record.dao.RecordDao;
import com.mortals.xhx.module.record.model.ApplyLogQuery;
......@@ -76,7 +74,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
@Autowired
private CertificateCatalogService certificateCatalogService;
@Autowired
private CertificateCatalogTemplateService certificateCatalogTemplateService;
@Autowired
private PrintWaitQueueService printWaitQueueService;
......@@ -143,6 +142,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(entity.getCatalogId()==null){
throw new AppException("目录ID不能为空");
}
if(entity.getTemplateId()==null){
throw new AppException("目录模板ID不能为空");
}
super.validData(entity, context);
}
......@@ -196,9 +198,10 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
@Override
public String previewOriginal(ApplyLogEntity applyLogEntity, Context context) throws AppException {
validData(applyLogEntity,context);
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateUrl(),applyLogEntity.getFormContent());
// CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(applyLogEntity.getTemplateId());
// applyLogEntity.setCatalogCode(catalog.getCatalogCode());
DocTemplateVO docTemplate = new DocTemplateVO(templateEntity.getTemplateFileUrl(),applyLogEntity.getFormContent());
return preview(docTemplate, context,false);
}
......@@ -211,10 +214,12 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
applyLogEntity.setCatalogName(catalog.getCatalogName());
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(applyLogEntity.getTemplateId());
applyLogEntity.setTemplateName(templateEntity.getTemplateName());
//applyLogEntity.setFormTemplate(catalog.getFormContent());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateUrl(),applyLogEntity.getFormContent());
DocTemplateVO docTemplate = new DocTemplateVO(templateEntity.getTemplateFileUrl(),applyLogEntity.getFormContent());
boolean hasPDF = false;
if(catalog.getIsPdf()!=null && catalog.getIsPdf()==1){
if(templateEntity.getIsPdf()!=null && templateEntity.getIsPdf()==1){
hasPDF = true;
}
String paths = preview(docTemplate, context,hasPDF);
......@@ -424,7 +429,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
}
@Override
public String importData(List<Map<Integer, Object>> dataList, Map<String,String> fileMap, Long catalogId, Context context) throws AppException {
public String importData(List<Map<Integer, Object>> dataList, Map<String,String> fileMap, Long catalogId, Long templateId, Context context) throws AppException {
if(catalogId==null){
throw new AppException("目录ID不能为空");
}
......@@ -432,9 +437,15 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(catalog==null){
throw new AppException("目录ID不正确");
}
JSONObject formContent = JSONObject.parseObject(catalog.getFormContent());
if(templateId==null){
throw new AppException("目录模板ID不能为空");
}
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(templateId);
if(templateEntity==null){
throw new AppException("目录模板ID不正确");
}
JSONObject formContent = JSONObject.parseObject(templateEntity.getFormContent());
JSONArray formList = formContent.getJSONArray("list");
Map<Integer, Object> header = dataList.get(0); //表头
List<ApplyLogEntity> applyLogList = new ArrayList<>();
for (int r=1;r<dataList.size();r++){
......@@ -521,10 +532,16 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(catalog==null){
throw new AppException("目录ID不正确");
}
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(pdu.getTemplateId());
if(templateEntity==null){
throw new AppException("目录模板ID不正确");
}
ApplyLogEntity entity = new ApplyLogEntity();
entity.setCatalogId(catalog.getId());
entity.setCatalogCode(catalog.getCatalogCode());
entity.setCatalogName(catalog.getCatalogName());
entity.setTemplateId(templateEntity.getId());
entity.setTemplateName(templateEntity.getTemplateName());
entity.setCertificateCode(pdu.getCertificateCode());
entity.setCertificateName(pdu.getCertificateName());
entity.setHolderName(pdu.getHolderName());
......@@ -561,7 +578,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
}
});
entity.setFormContent(JSONObject.toJSONString(formMap));
JSONObject formTemplate = JSONObject.parseObject(catalog.getFormContent());
JSONObject formTemplate = JSONObject.parseObject(templateEntity.getFormContent());
JSONArray formList = formTemplate.getJSONArray("list");
JSONObject json = new JSONObject();
for (int j = 0; j < formList.size(); j++) {
......@@ -588,10 +605,15 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
List<CertificateCatalogEntity> catalogEntityList = this.certificateCatalogService.find(new CertificateCatalogQuery().classifyId(certificateClassifyEntity.getId()));
if(CollectionUtils.isNotEmpty(catalogEntityList)){
for(CertificateCatalogEntity catalogEntity:catalogEntityList){
List<CertificateCatalogTemplateEntity> templateEntityList = certificateCatalogTemplateService.find(new CertificateCatalogTemplateQuery().catalogId(catalogEntity.getId()));
if(CollectionUtils.isNotEmpty(templateEntityList)){
for (CertificateCatalogTemplateEntity templateEntity:templateEntityList){
ApplyLogEntity entity = new ApplyLogEntity();
entity.setCatalogId(catalogEntity.getId());
entity.setCatalogCode(catalogEntity.getCatalogCode());
entity.setCatalogName(catalogEntity.getCatalogName());
entity.setTemplateId(templateEntity.getId());
entity.setTemplateName(templateEntity.getTemplateName());
entity.setCertificateCode(pdu.getCertificateCode());
entity.setCertificateName(pdu.getCertificateName());
entity.setSiteId(pdu.getSiteId());
......@@ -629,7 +651,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
}
});
entity.setFormContent(JSONObject.toJSONString(formMap));
JSONObject formTemplate = JSONObject.parseObject(catalogEntity.getFormContent());
JSONObject formTemplate = JSONObject.parseObject(templateEntity.getFormContent());
JSONArray formList = formTemplate.getJSONArray("list");
JSONObject json = new JSONObject();
for (int j = 0; j < formList.size(); j++) {
......@@ -646,6 +668,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
throw new AppException("微中台数据生成证照失败");
}
}
}
}
}else {
throw new AppException("目录类型不正确，无法找到相应证照目录");
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintLogServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.record.service.impl;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.common.code.CertificateStatus;
import com.mortals.xhx.common.code.ClassifyType;
import com.mortals.xhx.common.code.PrintStatus;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
import com.mortals.xhx.module.record.model.ApplyLogQuery;
import com.mortals.xhx.module.record.model.PrintLogQuery;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.record.dao.PrintLogDao;
import com.mortals.xhx.module.record.model.PrintLogEntity;
import com.mortals.xhx.module.record.model.PrintLogQuery;
import com.mortals.xhx.module.record.service.PrintLogService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.record.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.util.HttpUtil;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.code.CertificateStatus;
import com.mortals.xhx.common.code.GenerateStatus;
import com.mortals.xhx.common.code.PrintStatus;
import com.mortals.xhx.common.code.YesNoEnum;
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.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateCatalogTemplateService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.print.model.PrintCatalogEntity;
import com.mortals.xhx.module.print.model.PrintCatalogQuery;
......@@ -16,23 +22,17 @@ import com.mortals.xhx.module.print.model.PrintServiceQuery;
import com.mortals.xhx.module.print.service.PrintCatalogService;
import com.mortals.xhx.module.print.service.PrintServiceService;
import com.mortals.xhx.module.record.dao.PrintLogDao;
import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
import com.mortals.xhx.module.record.dao.RetainLogDao;
import com.mortals.xhx.module.record.model.*;
import com.mortals.xhx.module.record.service.PrintLogService;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* PrintWaitQueueService
......@@ -68,6 +68,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private PrintServiceService printServiceService;
@Autowired
private PrintCatalogService printCatalogService;
@Autowired
private CertificateCatalogTemplateService certificateCatalogTemplateService;
@Override
protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
......@@ -85,17 +87,19 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printWaitQueueEntity.setPrinterIp(printCatalogEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(printCatalogEntity.getPrinterName());
}else {
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId());
printWaitQueueEntity.setPaperSource(catalogEntity.getPaperSource());
printWaitQueueEntity.setPrinterIp(catalogEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(catalogEntity.getPrinterName());
//CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId());
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(printWaitQueueEntity.getTemplateId());
printWaitQueueEntity.setPaperSource(templateEntity.getPaperSource());
printWaitQueueEntity.setPrinterIp(templateEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(templateEntity.getPrinterName());
}
printWaitQueueEntity.setPrinterServiceUrl(printServiceEntity.getServiceUrl());
}else {
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId());
printWaitQueueEntity.setPaperSource(catalogEntity.getPaperSource());
printWaitQueueEntity.setPrinterIp(catalogEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(catalogEntity.getPrinterName());
//CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId());
CertificateCatalogTemplateEntity templateEntity = certificateCatalogTemplateService.get(printWaitQueueEntity.getTemplateId());
printWaitQueueEntity.setPaperSource(templateEntity.getPaperSource());
printWaitQueueEntity.setPrinterIp(templateEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(templateEntity.getPrinterName());
printWaitQueueEntity.setPrinterServiceUrl("http://127.0.0.1:8037");
}
}
......@@ -122,6 +126,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
waitQueueEntity.setCatalogId(applyLogEntity.getCatalogId());
waitQueueEntity.setCatalogCode(applyLogEntity.getCatalogCode());
waitQueueEntity.setCatalogName(applyLogEntity.getCatalogName());
waitQueueEntity.setTemplateId(applyLogEntity.getTemplateId());
waitQueueEntity.setTemplateName(applyLogEntity.getTemplateName());
waitQueueEntity.setCertificateName(applyLogEntity.getCertificateName());
waitQueueEntity.setCertificateCode(applyLogEntity.getCertificateCode());
waitQueueEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
......@@ -170,6 +176,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
printLogEntity.setTemplateId(waitQueueEntity.getTemplateId());
printLogEntity.setTemplateName(waitQueueEntity.getTemplateName());
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
......@@ -193,6 +201,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
retainLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
retainLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
retainLogEntity.setTemplateId(waitQueueEntity.getTemplateId());
retainLogEntity.setTemplateName(waitQueueEntity.getTemplateName());
retainLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
retainLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
retainLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
......@@ -207,6 +217,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
printLogEntity.setTemplateId(waitQueueEntity.getTemplateId());
printLogEntity.setTemplateName(waitQueueEntity.getTemplateName());
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RecordServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.record.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.record.dao.RecordDao;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.RecordService;
import org.springframework.stereotype.Service;
/**
* RecordService
* 证照申请 service实现
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RetainLogServiceImpl.java
View file @ 34d1e119
package com.mortals.xhx.module.record.service.impl;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.common.code.CertificateStatus;
import com.mortals.xhx.common.code.ClassifyType;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.record.model.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.record.dao.RetainLogDao;
import com.mortals.xhx.module.record.model.RetainLogEntity;
import com.mortals.xhx.module.record.model.RetainLogQuery;
import com.mortals.xhx.module.record.service.RetainLogService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -31,11 +25,6 @@ import java.util.List;
@Service("retainLogService")
public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao, RetainLogEntity, Long> implements RetainLogService {
@Autowired
private CertificateCatalogService certificateCatalogService;
@Autowired
private CertificateClassifyService certificateClassifyService;
@Override
protected RetainLogEntity findBefore(RetainLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
RetainLogQuery query = new RetainLogQuery();
......@@ -55,26 +44,4 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
return query;
}
@Override
public void creatRetainLog(ApplyLogEntity applyLogEntity, Context context) throws AppException {
RetainLogEntity retainLogEntity = new RetainLogEntity();
retainLogEntity.setCatalogId(applyLogEntity.getCatalogId());
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(applyLogEntity.getCatalogId());
retainLogEntity.setRecordId(applyLogEntity.getRecordId());
retainLogEntity.setCatalogId(catalogEntity.getId());
retainLogEntity.setCatalogCode(catalogEntity.getCatalogCode());
retainLogEntity.setCatalogName(catalogEntity.getCatalogName());
retainLogEntity.setCertificateName(applyLogEntity.getCertificateName());
retainLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
retainLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
retainLogEntity.setHolderName(applyLogEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
retainLogEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
retainLogEntity.setCreateUserId(applyLogEntity.getCreateUserId());
retainLogEntity.setCreateTime(new Date());
dao.insert(retainLogEntity);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java
View file @ 34d1e119
......@@ -136,7 +136,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
}
@PostMapping({"/import"})
public String importFile(MultipartFile file, Long catalogId) {
public String importFile(MultipartFile file, Long catalogId,Long templateId) {
JSONObject ret = new JSONObject();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
......@@ -147,7 +147,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
List<Map<Integer, Object>> returnList = ImportExcelUtil.readExcelContent(fileName,file.getInputStream(),1,null,null);
Map<String, PictureData> pictureDataMap = ReadExcelPictureUtil.readExcelPictureMap(file);
Map<String,String> fileMap = ReadExcelPictureUtil.savePicture(this.filePath,pictureDataMap);
String message = this.service.importData(returnList, fileMap, catalogId, context);
String message = this.service.importData(returnList, fileMap, catalogId, templateId, context);
model.put("message_info", message);
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var13) {
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/web/RecordController.java
View file @ 34d1e119
package com.mortals.xhx.module.record.web;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.RecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.record.model.RecordEntity;
import com.mortals.xhx.module.record.service.RecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 证照申请
......
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml
View file @ 34d1e119
<?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="siteId" column="siteId" />
<result property="catalogName" column="catalogName" />
<result property="catalogCode" column="catalogCode" />
<result property="holderType" column="holderType" />
......@@ -14,22 +15,11 @@
<result property="transverse" column="transverse" />
<result property="portrait" column="portrait" />
<result property="inspect" column="inspect" />
<result property="templateName" column="templateName" />
<result property="templateUrl" column="templateUrl" />
<result property="formContent" column="formContent" />
<result property="exampleUrl" column="exampleUrl" />
<result property="status" column="status" />
<result property="printerName" column="printerName" />
<result property="printerIp" column="printerIp" />
<result property="paperSource" column="paperSource" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="deviceId" column="deviceId" />
<result property="excelFile" column="excelFile" />
<result property="isPdf" column="isPdf" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -40,6 +30,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</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>
......@@ -64,30 +57,9 @@
<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('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateUrl') or colPickMode == 1 and data.containsKey('templateUrl')))">
a.templateUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exampleUrl') or colPickMode == 1 and data.containsKey('exampleUrl')))">
a.exampleUrl,
</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('printerName') or colPickMode == 1 and data.containsKey('printerName')))">
a.printerName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerIp') or colPickMode == 1 and data.containsKey('printerIp')))">
a.printerIp,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paperSource') or colPickMode == 1 and data.containsKey('paperSource')))">
a.paperSource,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
......@@ -100,35 +72,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('excelFile') or colPickMode == 1 and data.containsKey('excelFile')))">
a.excelFile,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isPdf') or colPickMode == 1 and data.containsKey('isPdf')))">
a.isPdf,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</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,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf,siteId)
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId},#{excelFile},#{isPdf},#{siteId})
(#{siteId},#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{status},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf,siteId)
(siteId,catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,status,createUserId,createTime,updateUserId,updateTime)
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.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId},#{item.excelFile},#{item.isPdf},#{item.siteId})
(#{item.siteId},#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -138,6 +98,12 @@
update mortals_xhx_certificate_catalog as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
......@@ -180,33 +146,12 @@
<if test="(colPickMode==0 and data.containsKey('inspectIncrement')) or (colPickMode==1 and !data.containsKey('inspectIncrement'))">
a.inspect=ifnull(a.inspect,0) + #{data.inspectIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateUrl')) or (colPickMode==1 and !data.containsKey('templateUrl'))">
a.templateUrl=#{data.templateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent},
</if>
<if test="(colPickMode==0 and data.containsKey('exampleUrl')) or (colPickMode==1 and !data.containsKey('exampleUrl'))">
a.exampleUrl=#{data.exampleUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('printerName')) or (colPickMode==1 and !data.containsKey('printerName'))">
a.printerName=#{data.printerName},
</if>
<if test="(colPickMode==0 and data.containsKey('printerIp')) or (colPickMode==1 and !data.containsKey('printerIp'))">
a.printerIp=#{data.printerIp},
</if>
<if test="(colPickMode==0 and data.containsKey('paperSource')) or (colPickMode==1 and !data.containsKey('paperSource'))">
a.paperSource=#{data.paperSource},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
......@@ -225,27 +170,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.deviceId=#{data.deviceId},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('excelFile')) or (colPickMode==1 and !data.containsKey('excelFile'))">
a.excelFile=#{data.excelFile},
</if>
<if test="(colPickMode==0 and data.containsKey('isPdf')) or (colPickMode==1 and !data.containsKey('isPdf'))">
a.isPdf=#{data.isPdf},
</if>
<if test="(colPickMode==0 and data.containsKey('isPdfIncrement')) or (colPickMode==1 and !data.containsKey('isPdfIncrement'))">
a.isPdf=ifnull(a.isPdf,0) + #{data.isPdfIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -258,6 +182,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_certificate_catalog as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogName=(case" suffix="ELSE catalogName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogName')) or (colPickMode==1 and !item.containsKey('catalogName'))">
......@@ -344,34 +280,6 @@
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="templateUrl=(case" suffix="ELSE templateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateUrl')) or (colPickMode==1 and !item.containsKey('templateUrl'))">
when a.id=#{item.id} then #{item.templateUrl}
</if>
</foreach>
</trim>
<trim prefix="formContent=(case" suffix="ELSE formContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
when a.id=#{item.id} then #{item.formContent}
</if>
</foreach>
</trim>
<trim prefix="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>
......@@ -384,27 +292,6 @@
</choose>
</foreach>
</trim>
<trim prefix="printerName=(case" suffix="ELSE printerName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerName')) or (colPickMode==1 and !item.containsKey('printerName'))">
when a.id=#{item.id} then #{item.printerName}
</if>
</foreach>
</trim>
<trim prefix="printerIp=(case" suffix="ELSE printerIp end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerIp')) or (colPickMode==1 and !item.containsKey('printerIp'))">
when a.id=#{item.id} then #{item.printerIp}
</if>
</foreach>
</trim>
<trim prefix="paperSource=(case" suffix="ELSE paperSource end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('paperSource')) or (colPickMode==1 and !item.containsKey('paperSource'))">
when a.id=#{item.id} then #{item.paperSource}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -443,49 +330,6 @@
</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="excelFile=(case" suffix="ELSE excelFile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('excelFile')) or (colPickMode==1 and !item.containsKey('excelFile'))">
when a.id=#{item.id} then #{item.excelFile}
</if>
</foreach>
</trim>
<trim prefix="isPdf=(case" suffix="ELSE isPdf end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('isPdf')) or (colPickMode==1 and !item.containsKey('isPdf'))">
when a.id=#{item.id} then #{item.isPdf}
</when>
<when test="(colPickMode==0 and item.containsKey('isPdfIncrement')) or (colPickMode==1 and !item.containsKey('isPdfIncrement'))">
when a.id=#{item.id} then ifnull(a.isPdf,0) + #{item.isPdfIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -629,6 +473,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
......@@ -833,90 +704,6 @@
${_conditionType_} a.inspect <![CDATA[ <= ]]> #{${_conditionParam_}.inspectEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateUrl')">
<if test="conditionParamRef.templateUrl != null and conditionParamRef.templateUrl != ''">
${_conditionType_} a.templateUrl like #{${_conditionParam_}.templateUrl}
</if>
<if test="conditionParamRef.templateUrl == null">
${_conditionType_} a.templateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateUrlList') and conditionParamRef.templateUrlList.size() > 0">
${_conditionType_} a.templateUrl in
<foreach collection="conditionParamRef.templateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateUrlNotList') and conditionParamRef.templateUrlNotList.size() > 0">
${_conditionType_} a.templateUrl not in
<foreach collection="conditionParamRef.templateUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formContent')">
<if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
</if>
<if test="conditionParamRef.formContent == null">
${_conditionType_} a.formContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
${_conditionType_} a.formContent in
<foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
${_conditionType_} a.formContent not in
<foreach collection="conditionParamRef.formContentNotList" 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>
<if test="conditionParamRef.containsKey('exampleUrlList') and conditionParamRef.exampleUrlList.size() > 0">
${_conditionType_} a.exampleUrl in
<foreach collection="conditionParamRef.exampleUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('exampleUrlNotList') and conditionParamRef.exampleUrlNotList.size() > 0">
${_conditionType_} a.exampleUrl not in
<foreach collection="conditionParamRef.exampleUrlNotList" 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}
......@@ -944,69 +731,6 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
${_conditionType_} a.printerName like #{${_conditionParam_}.printerName}
</if>
<if test="conditionParamRef.printerName == null">
${_conditionType_} a.printerName is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerNameList') and conditionParamRef.printerNameList.size() > 0">
${_conditionType_} a.printerName in
<foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerNameNotList') and conditionParamRef.printerNameNotList.size() > 0">
${_conditionType_} a.printerName not in
<foreach collection="conditionParamRef.printerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIp')">
<if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''">
${_conditionType_} a.printerIp like #{${_conditionParam_}.printerIp}
</if>
<if test="conditionParamRef.printerIp == null">
${_conditionType_} a.printerIp is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerIpList') and conditionParamRef.printerIpList.size() > 0">
${_conditionType_} a.printerIp in
<foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIpNotList') and conditionParamRef.printerIpNotList.size() > 0">
${_conditionType_} a.printerIp not in
<foreach collection="conditionParamRef.printerIpNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSource')">
<if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''">
${_conditionType_} a.paperSource like #{${_conditionParam_}.paperSource}
</if>
<if test="conditionParamRef.paperSource == null">
${_conditionType_} a.paperSource is null
</if>
</if>
<if test="conditionParamRef.containsKey('paperSourceList') and conditionParamRef.paperSourceList.size() > 0">
${_conditionType_} a.paperSource in
<foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSourceNotList') and conditionParamRef.paperSourceNotList.size() > 0">
${_conditionType_} a.paperSource not in
<foreach collection="conditionParamRef.paperSourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
......@@ -1091,108 +815,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if>
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" 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('excelFile')">
<if test="conditionParamRef.excelFile != null and conditionParamRef.excelFile != ''">
${_conditionType_} a.excelFile like #{${_conditionParam_}.excelFile}
</if>
<if test="conditionParamRef.excelFile == null">
${_conditionType_} a.excelFile is null
</if>
</if>
<if test="conditionParamRef.containsKey('excelFileList') and conditionParamRef.excelFileList.size() > 0">
${_conditionType_} a.excelFile in
<foreach collection="conditionParamRef.excelFileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('excelFileNotList') and conditionParamRef.excelFileNotList.size() > 0">
${_conditionType_} a.excelFile not in
<foreach collection="conditionParamRef.excelFileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdf')">
<if test="conditionParamRef.isPdf != null ">
${_conditionType_} a.isPdf = #{${_conditionParam_}.isPdf}
</if>
<if test="conditionParamRef.isPdf == null">
${_conditionType_} a.isPdf is null
</if>
</if>
<if test="conditionParamRef.containsKey('isPdfList') and conditionParamRef.isPdfList.size() > 0">
${_conditionType_} a.isPdf in
<foreach collection="conditionParamRef.isPdfList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdfNotList') and conditionParamRef.isPdfNotList.size() > 0">
${_conditionType_} a.isPdf not in
<foreach collection="conditionParamRef.isPdfNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdfStart') and conditionParamRef.isPdfStart != null">
${_conditionType_} a.isPdf <![CDATA[ >= ]]> #{${_conditionParam_}.isPdfStart}
</if>
<if test="conditionParamRef.containsKey('isPdfEnd') and conditionParamRef.isPdfEnd != null">
${_conditionType_} a.isPdf <![CDATA[ <= ]]> #{${_conditionParam_}.isPdfEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1211,6 +833,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogName')">
a.catalogName
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
......@@ -1251,46 +878,11 @@
<if test='orderCol.inspect != null and "DESC".equalsIgnoreCase(orderCol.inspect)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateUrl')">
a.templateUrl
<if test='orderCol.templateUrl != null and "DESC".equalsIgnoreCase(orderCol.templateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('formContent')">
a.formContent
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('exampleUrl')">
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('printerName')">
a.printerName
<if test='orderCol.printerName != null and "DESC".equalsIgnoreCase(orderCol.printerName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerIp')">
a.printerIp
<if test='orderCol.printerIp != null and "DESC".equalsIgnoreCase(orderCol.printerIp)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paperSource')">
a.paperSource
<if test='orderCol.paperSource != null and "DESC".equalsIgnoreCase(orderCol.paperSource)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......@@ -1311,26 +903,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>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('excelFile')">
a.excelFile
<if test='orderCol.excelFile != null and "DESC".equalsIgnoreCase(orderCol.excelFile)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isPdf')">
a.isPdf
<if test='orderCol.isPdf != null and "DESC".equalsIgnoreCase(orderCol.isPdf)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogTemplateMapper.xml 0 → 100644
View file @ 34d1e119
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateCatalogTemplateDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="CertificateCatalogTemplateEntity" id="CertificateCatalogTemplateEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="catalogId" column="catalogId" />
<result property="templateName" column="templateName" />
<result property="templateType" column="templateType" />
<result property="templateFileName" column="templateFileName" />
<result property="templateFileUrl" column="templateFileUrl" />
<result property="formContent" column="formContent" />
<result property="exampleFileUrl" column="exampleFileUrl" />
<result property="status" column="status" />
<result property="excelFile" column="excelFile" />
<result property="isPdf" column="isPdf" />
<result property="deviceId" column="deviceId" />
<result property="printerName" column="printerName" />
<result property="printerIp" column="printerIp" />
<result property="paperSource" column="paperSource" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</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('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateType') or colPickMode == 1 and data.containsKey('templateType')))">
a.templateType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateFileName') or colPickMode == 1 and data.containsKey('templateFileName')))">
a.templateFileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateFileUrl') or colPickMode == 1 and data.containsKey('templateFileUrl')))">
a.templateFileUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
a.formContent,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exampleFileUrl') or colPickMode == 1 and data.containsKey('exampleFileUrl')))">
a.exampleFileUrl,
</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('excelFile') or colPickMode == 1 and data.containsKey('excelFile')))">
a.excelFile,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isPdf') or colPickMode == 1 and data.containsKey('isPdf')))">
a.isPdf,
</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('printerName') or colPickMode == 1 and data.containsKey('printerName')))">
a.printerName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerIp') or colPickMode == 1 and data.containsKey('printerIp')))">
a.printerIp,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paperSource') or colPickMode == 1 and data.containsKey('paperSource')))">
a.paperSource,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateCatalogTemplateEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_catalog_template
(siteId,catalogId,templateName,templateType,templateFileName,templateFileUrl,formContent,exampleFileUrl,status,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{siteId},#{catalogId},#{templateName},#{templateType},#{templateFileName},#{templateFileUrl},#{formContent},#{exampleFileUrl},#{status},#{excelFile},#{isPdf},#{deviceId},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog_template
(siteId,catalogId,templateName,templateType,templateFileName,templateFileUrl,formContent,exampleFileUrl,status,excelFile,isPdf,deviceId,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.catalogId},#{item.templateName},#{item.templateType},#{item.templateFileName},#{item.templateFileUrl},#{item.formContent},#{item.exampleFileUrl},#{item.status},#{item.excelFile},#{item.isPdf},#{item.deviceId},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_certificate_catalog_template as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateType')) or (colPickMode==1 and !data.containsKey('templateType'))">
a.templateType=#{data.templateType},
</if>
<if test="(colPickMode==0 and data.containsKey('templateTypeIncrement')) or (colPickMode==1 and !data.containsKey('templateTypeIncrement'))">
a.templateType=ifnull(a.templateType,0) + #{data.templateTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateFileName')) or (colPickMode==1 and !data.containsKey('templateFileName'))">
a.templateFileName=#{data.templateFileName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateFileUrl')) or (colPickMode==1 and !data.containsKey('templateFileUrl'))">
a.templateFileUrl=#{data.templateFileUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
a.formContent=#{data.formContent},
</if>
<if test="(colPickMode==0 and data.containsKey('exampleFileUrl')) or (colPickMode==1 and !data.containsKey('exampleFileUrl'))">
a.exampleFileUrl=#{data.exampleFileUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('excelFile')) or (colPickMode==1 and !data.containsKey('excelFile'))">
a.excelFile=#{data.excelFile},
</if>
<if test="(colPickMode==0 and data.containsKey('isPdf')) or (colPickMode==1 and !data.containsKey('isPdf'))">
a.isPdf=#{data.isPdf},
</if>
<if test="(colPickMode==0 and data.containsKey('isPdfIncrement')) or (colPickMode==1 and !data.containsKey('isPdfIncrement'))">
a.isPdf=ifnull(a.isPdf,0) + #{data.isPdfIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.deviceId=#{data.deviceId},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('printerName')) or (colPickMode==1 and !data.containsKey('printerName'))">
a.printerName=#{data.printerName},
</if>
<if test="(colPickMode==0 and data.containsKey('printerIp')) or (colPickMode==1 and !data.containsKey('printerIp'))">
a.printerIp=#{data.printerIp},
</if>
<if test="(colPickMode==0 and data.containsKey('paperSource')) or (colPickMode==1 and !data.containsKey('paperSource'))">
a.paperSource=#{data.paperSource},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_certificate_catalog_template as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="templateType=(case" suffix="ELSE templateType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateType')) or (colPickMode==1 and !item.containsKey('templateType'))">
when a.id=#{item.id} then #{item.templateType}
</when>
<when test="(colPickMode==0 and item.containsKey('templateTypeIncrement')) or (colPickMode==1 and !item.containsKey('templateTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.templateType,0) + #{item.templateTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateFileName=(case" suffix="ELSE templateFileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateFileName')) or (colPickMode==1 and !item.containsKey('templateFileName'))">
when a.id=#{item.id} then #{item.templateFileName}
</if>
</foreach>
</trim>
<trim prefix="templateFileUrl=(case" suffix="ELSE templateFileUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateFileUrl')) or (colPickMode==1 and !item.containsKey('templateFileUrl'))">
when a.id=#{item.id} then #{item.templateFileUrl}
</if>
</foreach>
</trim>
<trim prefix="formContent=(case" suffix="ELSE formContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
when a.id=#{item.id} then #{item.formContent}
</if>
</foreach>
</trim>
<trim prefix="exampleFileUrl=(case" suffix="ELSE exampleFileUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('exampleFileUrl')) or (colPickMode==1 and !item.containsKey('exampleFileUrl'))">
when a.id=#{item.id} then #{item.exampleFileUrl}
</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="excelFile=(case" suffix="ELSE excelFile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('excelFile')) or (colPickMode==1 and !item.containsKey('excelFile'))">
when a.id=#{item.id} then #{item.excelFile}
</if>
</foreach>
</trim>
<trim prefix="isPdf=(case" suffix="ELSE isPdf end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('isPdf')) or (colPickMode==1 and !item.containsKey('isPdf'))">
when a.id=#{item.id} then #{item.isPdf}
</when>
<when test="(colPickMode==0 and item.containsKey('isPdfIncrement')) or (colPickMode==1 and !item.containsKey('isPdfIncrement'))">
when a.id=#{item.id} then ifnull(a.isPdf,0) + #{item.isPdfIncrement}
</when>
</choose>
</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="printerName=(case" suffix="ELSE printerName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerName')) or (colPickMode==1 and !item.containsKey('printerName'))">
when a.id=#{item.id} then #{item.printerName}
</if>
</foreach>
</trim>
<trim prefix="printerIp=(case" suffix="ELSE printerIp end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('printerIp')) or (colPickMode==1 and !item.containsKey('printerIp'))">
when a.id=#{item.id} then #{item.printerIp}
</if>
</foreach>
</trim>
<trim prefix="paperSource=(case" suffix="ELSE paperSource end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('paperSource')) or (colPickMode==1 and !item.containsKey('paperSource'))">
when a.id=#{item.id} then #{item.paperSource}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="CertificateCatalogTemplateEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_certificate_catalog_template as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_certificate_catalog_template as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_certificate_catalog_template where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_certificate_catalog_template where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_certificate_catalog_template where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_certificate_catalog_template as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="CertificateCatalogTemplateEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_certificate_catalog_template as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_certificate_catalog_template as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" 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('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" 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('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateType')">
<if test="conditionParamRef.templateType != null ">
${_conditionType_} a.templateType = #{${_conditionParam_}.templateType}
</if>
<if test="conditionParamRef.templateType == null">
${_conditionType_} a.templateType is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateTypeList') and conditionParamRef.templateTypeList.size() > 0">
${_conditionType_} a.templateType in
<foreach collection="conditionParamRef.templateTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateTypeNotList') and conditionParamRef.templateTypeNotList.size() > 0">
${_conditionType_} a.templateType not in
<foreach collection="conditionParamRef.templateTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateTypeStart') and conditionParamRef.templateTypeStart != null">
${_conditionType_} a.templateType <![CDATA[ >= ]]> #{${_conditionParam_}.templateTypeStart}
</if>
<if test="conditionParamRef.containsKey('templateTypeEnd') and conditionParamRef.templateTypeEnd != null">
${_conditionType_} a.templateType <![CDATA[ <= ]]> #{${_conditionParam_}.templateTypeEnd}
</if>
<if test="conditionParamRef.containsKey('templateFileName')">
<if test="conditionParamRef.templateFileName != null and conditionParamRef.templateFileName != ''">
${_conditionType_} a.templateFileName like #{${_conditionParam_}.templateFileName}
</if>
<if test="conditionParamRef.templateFileName == null">
${_conditionType_} a.templateFileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateFileNameList') and conditionParamRef.templateFileNameList.size() > 0">
${_conditionType_} a.templateFileName in
<foreach collection="conditionParamRef.templateFileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateFileNameNotList') and conditionParamRef.templateFileNameNotList.size() > 0">
${_conditionType_} a.templateFileName not in
<foreach collection="conditionParamRef.templateFileNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateFileUrl')">
<if test="conditionParamRef.templateFileUrl != null and conditionParamRef.templateFileUrl != ''">
${_conditionType_} a.templateFileUrl like #{${_conditionParam_}.templateFileUrl}
</if>
<if test="conditionParamRef.templateFileUrl == null">
${_conditionType_} a.templateFileUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateFileUrlList') and conditionParamRef.templateFileUrlList.size() > 0">
${_conditionType_} a.templateFileUrl in
<foreach collection="conditionParamRef.templateFileUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateFileUrlNotList') and conditionParamRef.templateFileUrlNotList.size() > 0">
${_conditionType_} a.templateFileUrl not in
<foreach collection="conditionParamRef.templateFileUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formContent')">
<if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
</if>
<if test="conditionParamRef.formContent == null">
${_conditionType_} a.formContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
${_conditionType_} a.formContent in
<foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
${_conditionType_} a.formContent not in
<foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('exampleFileUrl')">
<if test="conditionParamRef.exampleFileUrl != null and conditionParamRef.exampleFileUrl != ''">
${_conditionType_} a.exampleFileUrl like #{${_conditionParam_}.exampleFileUrl}
</if>
<if test="conditionParamRef.exampleFileUrl == null">
${_conditionType_} a.exampleFileUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('exampleFileUrlList') and conditionParamRef.exampleFileUrlList.size() > 0">
${_conditionType_} a.exampleFileUrl in
<foreach collection="conditionParamRef.exampleFileUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('exampleFileUrlNotList') and conditionParamRef.exampleFileUrlNotList.size() > 0">
${_conditionType_} a.exampleFileUrl not in
<foreach collection="conditionParamRef.exampleFileUrlNotList" 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.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" 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('excelFile')">
<if test="conditionParamRef.excelFile != null and conditionParamRef.excelFile != ''">
${_conditionType_} a.excelFile like #{${_conditionParam_}.excelFile}
</if>
<if test="conditionParamRef.excelFile == null">
${_conditionType_} a.excelFile is null
</if>
</if>
<if test="conditionParamRef.containsKey('excelFileList') and conditionParamRef.excelFileList.size() > 0">
${_conditionType_} a.excelFile in
<foreach collection="conditionParamRef.excelFileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('excelFileNotList') and conditionParamRef.excelFileNotList.size() > 0">
${_conditionType_} a.excelFile not in
<foreach collection="conditionParamRef.excelFileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdf')">
<if test="conditionParamRef.isPdf != null ">
${_conditionType_} a.isPdf = #{${_conditionParam_}.isPdf}
</if>
<if test="conditionParamRef.isPdf == null">
${_conditionType_} a.isPdf is null
</if>
</if>
<if test="conditionParamRef.containsKey('isPdfList') and conditionParamRef.isPdfList.size() > 0">
${_conditionType_} a.isPdf in
<foreach collection="conditionParamRef.isPdfList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdfNotList') and conditionParamRef.isPdfNotList.size() > 0">
${_conditionType_} a.isPdf not in
<foreach collection="conditionParamRef.isPdfNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isPdfStart') and conditionParamRef.isPdfStart != null">
${_conditionType_} a.isPdf <![CDATA[ >= ]]> #{${_conditionParam_}.isPdfStart}
</if>
<if test="conditionParamRef.containsKey('isPdfEnd') and conditionParamRef.isPdfEnd != null">
${_conditionType_} a.isPdf <![CDATA[ <= ]]> #{${_conditionParam_}.isPdfEnd}
</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>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" 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('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
${_conditionType_} a.printerName like #{${_conditionParam_}.printerName}
</if>
<if test="conditionParamRef.printerName == null">
${_conditionType_} a.printerName is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerNameList') and conditionParamRef.printerNameList.size() > 0">
${_conditionType_} a.printerName in
<foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerNameNotList') and conditionParamRef.printerNameNotList.size() > 0">
${_conditionType_} a.printerName not in
<foreach collection="conditionParamRef.printerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIp')">
<if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''">
${_conditionType_} a.printerIp like #{${_conditionParam_}.printerIp}
</if>
<if test="conditionParamRef.printerIp == null">
${_conditionType_} a.printerIp is null
</if>
</if>
<if test="conditionParamRef.containsKey('printerIpList') and conditionParamRef.printerIpList.size() > 0">
${_conditionType_} a.printerIp in
<foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIpNotList') and conditionParamRef.printerIpNotList.size() > 0">
${_conditionType_} a.printerIp not in
<foreach collection="conditionParamRef.printerIpNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSource')">
<if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''">
${_conditionType_} a.paperSource like #{${_conditionParam_}.paperSource}
</if>
<if test="conditionParamRef.paperSource == null">
${_conditionType_} a.paperSource is null
</if>
</if>
<if test="conditionParamRef.containsKey('paperSourceList') and conditionParamRef.paperSourceList.size() > 0">
${_conditionType_} a.paperSource in
<foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSourceNotList') and conditionParamRef.paperSourceNotList.size() > 0">
${_conditionType_} a.paperSource not in
<foreach collection="conditionParamRef.paperSourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>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('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateType')">
a.templateType
<if test='orderCol.templateType != null and "DESC".equalsIgnoreCase(orderCol.templateType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateFileName')">
a.templateFileName
<if test='orderCol.templateFileName != null and "DESC".equalsIgnoreCase(orderCol.templateFileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateFileUrl')">
a.templateFileUrl
<if test='orderCol.templateFileUrl != null and "DESC".equalsIgnoreCase(orderCol.templateFileUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('formContent')">
a.formContent
<if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('exampleFileUrl')">
a.exampleFileUrl
<if test='orderCol.exampleFileUrl != null and "DESC".equalsIgnoreCase(orderCol.exampleFileUrl)'>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('excelFile')">
a.excelFile
<if test='orderCol.excelFile != null and "DESC".equalsIgnoreCase(orderCol.excelFile)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isPdf')">
a.isPdf
<if test='orderCol.isPdf != null and "DESC".equalsIgnoreCase(orderCol.isPdf)'>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('printerName')">
a.printerName
<if test='orderCol.printerName != null and "DESC".equalsIgnoreCase(orderCol.printerName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerIp')">
a.printerIp
<if test='orderCol.printerIp != null and "DESC".equalsIgnoreCase(orderCol.printerIp)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paperSource')">
a.paperSource
<if test='orderCol.paperSource != null and "DESC".equalsIgnoreCase(orderCol.paperSource)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/print/PrintCatalogMapper.xml
View file @ 34d1e119
<?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.print.dao.ibatis.PrintCatalogDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="PrintCatalogEntity" id="PrintCatalogEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="serviceId" column="serviceId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="printerName" column="printerName" />
<result property="printerIp" column="printerIp" />
<result property="paperSource" column="paperSource" />
......@@ -16,8 +20,6 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="serviceId" column="serviceId" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -28,6 +30,12 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceId') or colPickMode == 1 and data.containsKey('serviceId')))">
a.serviceId,
</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>
......@@ -37,6 +45,12 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printerName') or colPickMode == 1 and data.containsKey('printerName')))">
a.printerName,
</if>
......@@ -58,29 +72,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceId') or colPickMode == 1 and data.containsKey('serviceId')))">
a.serviceId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_catalog
(catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId,siteId)
(siteId,serviceId,catalogId,catalogCode,catalogName,templateId,templateName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogId},#{catalogCode},#{catalogName},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{serviceId},#{siteId})
(#{siteId},#{serviceId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_catalog
(catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId,siteId)
(siteId,serviceId,catalogId,catalogCode,catalogName,templateId,templateName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.serviceId},#{item.siteId})
(#{item.siteId},#{item.serviceId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -90,6 +98,18 @@
update mortals_xhx_print_catalog as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceId')) or (colPickMode==1 and !data.containsKey('serviceId'))">
a.serviceId=#{data.serviceId},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceIdIncrement')) or (colPickMode==1 and !data.containsKey('serviceIdIncrement'))">
a.serviceId=ifnull(a.serviceId,0) + #{data.serviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
......@@ -102,6 +122,15 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('printerName')) or (colPickMode==1 and !data.containsKey('printerName'))">
a.printerName=#{data.printerName},
</if>
......@@ -129,18 +158,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceId')) or (colPickMode==1 and !data.containsKey('serviceId'))">
a.serviceId=#{data.serviceId},
</if>
<if test="(colPickMode==0 and data.containsKey('serviceIdIncrement')) or (colPickMode==1 and !data.containsKey('serviceIdIncrement'))">
a.serviceId=ifnull(a.serviceId,0) + #{data.serviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -153,6 +170,30 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_catalog as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="serviceId=(case" suffix="ELSE serviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('serviceId')) or (colPickMode==1 and !item.containsKey('serviceId'))">
when a.id=#{item.id} then #{item.serviceId}
</when>
<when test="(colPickMode==0 and item.containsKey('serviceIdIncrement')) or (colPickMode==1 and !item.containsKey('serviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.serviceId,0) + #{item.serviceIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -178,6 +219,25 @@
when a.id=#{item.id} then #{item.catalogName}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="printerName=(case" suffix="ELSE printerName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -238,30 +298,6 @@
</if>
</foreach>
</trim>
<trim prefix="serviceId=(case" suffix="ELSE serviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('serviceId')) or (colPickMode==1 and !item.containsKey('serviceId'))">
when a.id=#{item.id} then #{item.serviceId}
</when>
<when test="(colPickMode==0 and item.containsKey('serviceIdIncrement')) or (colPickMode==1 and !item.containsKey('serviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.serviceId,0) + #{item.serviceIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -405,6 +441,60 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('serviceId')">
<if test="conditionParamRef.serviceId != null ">
${_conditionType_} a.serviceId = #{${_conditionParam_}.serviceId}
</if>
<if test="conditionParamRef.serviceId == null">
${_conditionType_} a.serviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceIdList') and conditionParamRef.serviceIdList.size() > 0">
${_conditionType_} a.serviceId in
<foreach collection="conditionParamRef.serviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceIdNotList') and conditionParamRef.serviceIdNotList.size() > 0">
${_conditionType_} a.serviceId not in
<foreach collection="conditionParamRef.serviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceIdStart') and conditionParamRef.serviceIdStart != null">
${_conditionType_} a.serviceId <![CDATA[ >= ]]> #{${_conditionParam_}.serviceIdStart}
</if>
<if test="conditionParamRef.containsKey('serviceIdEnd') and conditionParamRef.serviceIdEnd != null">
${_conditionType_} a.serviceId <![CDATA[ <= ]]> #{${_conditionParam_}.serviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
......@@ -474,6 +564,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
......@@ -621,60 +759,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('serviceId')">
<if test="conditionParamRef.serviceId != null ">
${_conditionType_} a.serviceId = #{${_conditionParam_}.serviceId}
</if>
<if test="conditionParamRef.serviceId == null">
${_conditionType_} a.serviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceIdList') and conditionParamRef.serviceIdList.size() > 0">
${_conditionType_} a.serviceId in
<foreach collection="conditionParamRef.serviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceIdNotList') and conditionParamRef.serviceIdNotList.size() > 0">
${_conditionType_} a.serviceId not in
<foreach collection="conditionParamRef.serviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceIdStart') and conditionParamRef.serviceIdStart != null">
${_conditionType_} a.serviceId <![CDATA[ >= ]]> #{${_conditionParam_}.serviceIdStart}
</if>
<if test="conditionParamRef.containsKey('serviceIdEnd') and conditionParamRef.serviceIdEnd != null">
${_conditionType_} a.serviceId <![CDATA[ <= ]]> #{${_conditionParam_}.serviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -693,6 +777,16 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serviceId')">
a.serviceId
<if test='orderCol.serviceId != null and "DESC".equalsIgnoreCase(orderCol.serviceId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
......@@ -708,6 +802,16 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printerName')">
a.printerName
<if test='orderCol.printerName != null and "DESC".equalsIgnoreCase(orderCol.printerName)'>DESC</if>
......@@ -743,16 +847,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serviceId')">
a.serviceId
<if test='orderCol.serviceId != null and "DESC".equalsIgnoreCase(orderCol.serviceId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 34d1e119
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="ApplyLogEntity" id="ApplyLogEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="certificateCode" column="certificateCode" />
<result property="certificateName" column="certificateName" />
<result property="issueTime" column="issueTime" />
......@@ -34,7 +37,6 @@
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="recordStatus" column="recordStatus" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -45,6 +47,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
......@@ -57,6 +62,12 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode,
</if>
......@@ -129,26 +140,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordStatus') or colPickMode == 1 and data.containsKey('recordStatus')))">
a.recordStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_apply_log
(recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus,siteId)
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus)
VALUES
(#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{recordStatus},#{siteId})
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{recordStatus})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log
(recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus,siteId)
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.recordStatus},#{item.siteId})
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.recordStatus})
</foreach>
</insert>
......@@ -158,6 +166,12 @@
update mortals_xhx_apply_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
......@@ -176,6 +190,15 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode},
</if>
......@@ -269,12 +292,6 @@
<if test="(colPickMode==0 and data.containsKey('recordStatusIncrement')) or (colPickMode==1 and !data.containsKey('recordStatusIncrement'))">
a.recordStatus=ifnull(a.recordStatus,0) + #{data.recordStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -287,6 +304,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_apply_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -324,6 +353,25 @@
when a.id=#{item.id} then #{item.catalogName}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="certificateCode=(case" suffix="ELSE certificateCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -528,18 +576,6 @@
</choose>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -683,6 +719,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
......@@ -779,6 +842,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateCode')">
<if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''">
......@@ -1295,33 +1406,6 @@
${_conditionType_} a.recordStatus <![CDATA[ <= ]]> #{${_conditionParam_}.recordStatusEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1340,6 +1424,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
......@@ -1360,6 +1449,16 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateCode')">
a.certificateCode
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
......@@ -1480,11 +1579,6 @@
<if test='orderCol.recordStatus != null and "DESC".equalsIgnoreCase(orderCol.recordStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 34d1e119
<?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="siteId" column="siteId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="enterpriseName" column="enterpriseName" />
<result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" />
......@@ -24,7 +27,6 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -35,6 +37,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</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>
......@@ -50,6 +55,12 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseName,
</if>
......@@ -89,26 +100,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_log
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,catalogId,catalogCode,catalogName,certificateName,certificateCode,templateId,templateName,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
(#{siteId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{templateId},#{templateName},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,catalogId,catalogCode,catalogName,certificateName,certificateCode,templateId,templateName,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.printStatus},#{item.printDate},#{item.statusRemark},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
(#{item.siteId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.templateId},#{item.templateName},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.printStatus},#{item.printDate},#{item.statusRemark},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -118,6 +126,12 @@
update mortals_xhx_print_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
......@@ -136,6 +150,15 @@
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseName=#{data.enterpriseName},
</if>
......@@ -187,12 +210,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -205,6 +222,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -244,6 +273,25 @@
when a.id=#{item.id} then #{item.certificateCode}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -356,18 +404,6 @@
</if>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -511,6 +547,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
......@@ -622,6 +685,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
......@@ -901,33 +1012,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -946,6 +1030,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
......@@ -971,6 +1060,16 @@
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('enterpriseName')">
a.enterpriseName
<if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
......@@ -1036,11 +1135,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml
View file @ 34d1e119
<?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.PrintWaitQueueDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="PrintWaitQueueEntity" id="PrintWaitQueueEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="recordId" column="recordId" />
<result property="applyId" column="applyId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
......@@ -26,7 +29,6 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -37,6 +39,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
......@@ -52,6 +57,12 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
......@@ -97,26 +108,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_wait_queue
(recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
(#{siteId},#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_wait_queue
(recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.applyId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.total},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
(#{item.siteId},#{item.recordId},#{item.applyId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.total},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -126,6 +134,12 @@
update mortals_xhx_print_wait_queue as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
......@@ -150,6 +164,15 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
......@@ -207,12 +230,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -225,6 +242,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_wait_queue as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -274,6 +303,25 @@
when a.id=#{item.id} then #{item.catalogName}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -400,18 +448,6 @@
</if>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -555,6 +591,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
......@@ -678,6 +741,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
......@@ -1005,33 +1116,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1050,6 +1134,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
......@@ -1075,6 +1164,16 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
......@@ -1150,11 +1249,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 34d1e119
<?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.RetainLogDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="RetainLogEntity" id="RetainLogEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
......@@ -22,7 +25,6 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
</resultMap>
......@@ -33,6 +35,9 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId,
</if>
......@@ -45,6 +50,12 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
......@@ -81,26 +92,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_retain_log
(recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log
(recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,siteId)
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -110,6 +118,12 @@
update mortals_xhx_retain_log as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId},
</if>
......@@ -128,6 +142,15 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
......@@ -173,12 +196,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -191,6 +208,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_retain_log as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -228,6 +257,25 @@
when a.id=#{item.id} then #{item.catalogName}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -328,18 +376,6 @@
</if>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -483,6 +519,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
......@@ -579,6 +642,54 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
......@@ -837,33 +948,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -882,6 +966,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')">
a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
......@@ -902,6 +991,16 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
......@@ -962,11 +1061,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment