Skip to content

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

Merge remote-tracking branch 'origin/master'

parents e9a71445 673f7664
Show whitespace changes
Inline Side-by-side
Showing with 328 additions and 67 deletions
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java
View file @ 03f46fe3
......@@ -44,4 +44,12 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar
*/
Map<String, String> getParamBySecondOrganize(String firstOrganize,String secondOrganize, String... excludeParamKeys);
/**
* 通过Key设置参数值 value
* @param key
* @param value
* @return
*/
void setValueByKey(String key,String value);
}
\ No newline at end of file
one-certificate-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java
View file @ 03f46fe3
......@@ -13,6 +13,7 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -71,6 +72,31 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
).collect(Collectors.toMap(ParamEntity::getParamKey, ParamEntity::getParamValue, (o, n) -> n));
}
@Override
public void setValueByKey(String key, String value) {
List<ParamEntity> list = this.getCacheList();
ParamEntity entity = null;
for(ParamEntity paramEntity:list){
if(key.equals(paramEntity.getParamKey())){
entity = paramEntity;
break;
}
}
if(entity!=null){
entity.setParamValue(String.valueOf(value));
this.update(entity);
}else {
entity = new ParamEntity();
entity.setParamValue(String.valueOf(value));
entity.setParamKey(key);
entity.setName("key");
entity.setCreateTime(new Date());
entity.setCreateUserId(1l);
entity.setCreateUserName("系统管理员");
this.save(entity);
}
}
@Override
public boolean needRefresh() {
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java 0 → 100644
View file @ 03f46fe3
package com.mortals.xhx.module.certificate.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.IUser;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.base.system.param.service.ParamService;
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.CertificateClassifyQuery;
import com.mortals.xhx.module.certificate.pdu.PrintListPdu;
import com.mortals.xhx.module.certificate.pdu.PrintLogPdu;
import com.mortals.xhx.module.certificate.pdu.PrintSettingPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import com.mortals.xhx.module.record.model.PrintWaitQueueQuery;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("print")
public class CertificatePrintController extends BaseJsonBodyController {
@Autowired
private ParamService paramService;
@Autowired
private CertificateClassifyService certificateClassifyService;
@Autowired
private CertificateCatalogService certificateCatalogService;
@Autowired
private PrintWaitQueueService printWaitQueueService;
@PostMapping({"setting/info"})
public Rest<Object> list(@RequestBody PrintSettingPdu settingPdu) {
IUser user = this.getCurUser();
if(user==null){
throw new AppException("用户未登录");
}
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "查询打印设置信息" ;
int code=1;
try {
CertificateClassifyEntity query = new CertificateClassifyEntity();
query.setShowFront(YesNoEnum.YES.getValue());
query.setSiteId(settingPdu.getSiteId());
List<CertificateClassifyEntity> showList = certificateClassifyService.find(query);
query.setShowFront(YesNoEnum.NO.getValue());
List<CertificateClassifyEntity> hideList = certificateClassifyService.find(query);
model.put("showList", showList);
model.put("hideList", hideList);
model.put("printMax", paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
@PostMapping({"setting/save"})
public Rest<Object> deptList(@RequestBody PrintSettingPdu settingPdu) {
IUser user = this.getCurUser();
if(user==null){
throw new AppException("用户未登录");
}
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "保存打印设置" ;
int code=1;
try {
paramService.setValueByKey(ParamKey.ALLOW_PRINT_MAX_COUNT,DataUtil.conver2String(settingPdu.getPrintMax()));
certificateClassifyService.setShowFront(settingPdu.getHideList(), YesNoEnum.NO.getValue());
certificateClassifyService.setShowFront(settingPdu.getShowList(), YesNoEnum.YES.getValue());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
/**
* 打印文件
*/
@RequestMapping(value = {"log"},method = {RequestMethod.POST, RequestMethod.GET})
@UnAuth
public Rest<Object> print(@RequestBody PrintLogPdu printLogPdu) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "保存打印记录";
int code=1;
try {
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
/**
* 获取打印文件
*/
@PostMapping({"list"})
@UnAuth
public Rest<Object> listByIDCard(@RequestBody PrintListPdu pdu) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "查询待打印证件";
int code=1;
try {
PrintWaitQueueQuery query = new PrintWaitQueueQuery();
query.setPrintStatus(YesNoEnum.NO.getValue());
query.setPickerIDCardNo(pdu.getIdCard());
query.setSiteId(pdu.getSiteId());
CertificateCatalogEntity catalogEntity = new CertificateCatalogEntity();
catalogEntity.setClassifyId(pdu.getClassifyId());
catalogEntity.setSiteId(pdu.getSiteId());
List<CertificateCatalogEntity> clist = certificateCatalogService.find(catalogEntity);
List<Long> cIdList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(clist)){
for(CertificateCatalogEntity entity:clist){
cIdList.add(entity.getId());
}
}else {
cIdList.add(-1l);
}
query.setCatalogIdList(cIdList);
List<PrintWaitQueueEntity> list = printWaitQueueService.find(query);
model.put("data", list);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
@PostMapping({"home"})
@UnAuth
public Rest<Object> printHome(@RequestBody CertificateClassifyEntity certificateClassifyEntity) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "终端首页" ;
int code=1;
try {
CertificateClassifyQuery query = new CertificateClassifyQuery();
query.setShowFront(YesNoEnum.YES.getValue());
query.setSiteId(certificateClassifyEntity.getSiteId());
List<CertificateClassifyEntity> showList = certificateClassifyService.find(query);
model.put("showList", showList);
model.put("printMax", paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
}
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/model/DocTemplateVO.java
View file @ 03f46fe3
......@@ -22,4 +22,6 @@ public class DocTemplateVO {
this.templatePath = templatePath;
this.formContent = formContent;
}
private String qrCode;
}
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 03f46fe3
......@@ -67,7 +67,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private String filePath;
/** 应用公网地址 */
@Value("${serviceUrl:http://192.168.0.250:11011/onecert}")
@Value("${serviceUrl:http://192.168.0.250:11011/#?socialCode=}")
private String serviceUrl;
@Autowired
......@@ -188,12 +188,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
applyLogEntity.setCatalogCode(catalog.getCatalogCode());
applyLogEntity.setCatalogName(catalog.getCatalogName());
applyLogEntity.setCreateTime(new Date());
applyLogEntity.setRecordStatus(YesNoEnum.NO.getValue());
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
applyLogEntity.setGenerateStatus(GenerateStatus.NOT.getValue());
applyLogEntity.setFormTemplate(catalog.getFormContent());
DocTemplateVO docTemplate = new DocTemplateVO(catalog.getTemplateFileUrl(),applyLogEntity.getFormContent());
try {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String filePath = rootPath + "certificate/qrcode/";
......@@ -205,11 +201,35 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
String imagepath = filePath + qrcodeName;
String qrCode = serviceUrl+applyLogEntity.getSocialCode();
QrCodeUtil.generateQrCodeFile(qrCode,imagepath);
applyLogEntity.setQRCode(imagepath);
applyLogEntity.setQRCode("/certificate/qrcode/"+qrcodeName);
//entry.setValue(pictureRenderData);
} catch (Exception e) {
log.error("error", e);
}
docTemplate.setQrCode(applyLogEntity.getQRCode());
boolean hasPDF = false;
if(catalog.getIsPdf()!=null && catalog.getIsPdf()==1){
hasPDF = true;
}
String paths = preview(docTemplate, context,hasPDF);
String[] vals = paths.split(";");
if(vals.length==3) {
//有pdf时
applyLogEntity.setCertificateUrl(vals[2]);
applyLogEntity.setPreviewUrl(vals[1]);
}
if(vals.length==2) {
//无pdf时
applyLogEntity.setCertificateUrl(vals[0]);
applyLogEntity.setPreviewUrl(vals[1]);
}
applyLogEntity.setCreateTime(new Date());
applyLogEntity.setRecordStatus(YesNoEnum.NO.getValue());
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
applyLogEntity.setGenerateStatus(GenerateStatus.ORIGINAL.getValue());
if(applyLogEntity.getId()!=null && applyLogEntity.getRecordId()!=null){
applyLogEntity.setOperType(OperTypeEnum.UPDATE.getValue());
oldId = applyLogEntity.getId();
......@@ -238,10 +258,15 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
updata.setRecordStatus(YesNoEnum.YES.getValue());
updata.setUpdateTime(new Date());
dao.update(updata);
PrintWaitQueueEntity condition = new PrintWaitQueueEntity();
condition.setApplyId(oldId);
printWaitQueueService.remove(condition,context);
}
//插入子证联报
childLicenseService.createChildLicense(applyLogEntity,context);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
applyLogEntity.setFormContent(null);
applyLogEntity.setFormTemplate(null);
return applyLogEntity;
}
......@@ -286,6 +311,23 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(context!=null && context.getUser()!=null) {
applyLogEntity.setCreateUserId(context.getUser().getId());
}
try {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String filePath = rootPath + "certificate/qrcode/";
String qrcodeName = applyLogEntity.getCertificateCode() + ".png";
File pathDir = new File(filePath);
if (!pathDir.exists()) {
pathDir.mkdirs();
}
String imagepath = filePath + qrcodeName;
String qrCode = serviceUrl+applyLogEntity.getSocialCode();
QrCodeUtil.generateQrCodeFile(qrCode,imagepath);
applyLogEntity.setQRCode("/certificate/qrcode/"+qrcodeName);
//entry.setValue(pictureRenderData);
} catch (Exception e) {
log.error("error", e);
}
applyLogEntity.setGenerateStatus(GenerateStatus.ORIGINAL.getValue());
if(applyLogEntity.getId()!=null && applyLogEntity.getRecordId()!=null){
applyLogEntity.setOperType(OperTypeEnum.UPDATE.getValue());
......@@ -319,6 +361,8 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
condition.setApplyId(oldId);
printWaitQueueService.remove(condition,context);
}
//插入子证联报
childLicenseService.createChildLicense(applyLogEntity,context);
printWaitQueueService.creatWaitQueueByApply(applyLogEntity, GenerateStatus.ORIGINAL.getValue(),context);
}
......@@ -379,16 +423,17 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
//二维码输入框处理
if (entry.getKey().indexOf("@qrcode") != -1) {
try {
String filePath = rootPath+"file/qrcode/";
String qrcodeName = new Date().getTime() + ".png";
File pathDir = new File(filePath);
if (!pathDir.exists()) {
pathDir.mkdirs();
}
String imagepath = filePath+qrcodeName;
QrCodeUtil.generateQrCodeFile(entry.getValue().toString(),imagepath);
// String filePath = rootPath+"file/qrcode/";
// String qrcodeName = new Date().getTime() + ".png";
// File pathDir = new File(filePath);
// if (!pathDir.exists()) {
// pathDir.mkdirs();
// }
// String imagepath = filePath+qrcodeName;
// QrCodeUtil.generateQrCodeFile(entry.getValue().toString(),imagepath);
String imagepath = rootPath + docTemplate.getQrCode();
PictureRenderData pictureRenderData = Pictures.ofStream(new FileInputStream(imagepath), PictureType.PNG)
.size(100, 100).create();
.size(150, 150).create();
addMap.put(StrUtil.removePrefixIgnoreCase(entry.getKey(),"@"),pictureRenderData);
//entry.setValue(pictureRenderData);
} catch (FileNotFoundException e) {
......
one-certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 03f46fe3
......@@ -9,6 +9,7 @@ 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.common.utils.BeanUtil;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
......@@ -18,6 +19,7 @@ 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.PrintWaitQueueService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -84,23 +86,12 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private PrintWaitQueueEntity creatWaitQueue(ApplyLogEntity applyLogEntity,int generateType){
PrintWaitQueueEntity waitQueueEntity = new PrintWaitQueueEntity();
BeanUtils.copyProperties(applyLogEntity, waitQueueEntity, BeanUtil.getNullPropertyNames(applyLogEntity));
waitQueueEntity.setId(null);
waitQueueEntity.setUpdateUserId(null);
waitQueueEntity.setUpdateTime(null);
waitQueueEntity.setApplyId(applyLogEntity.getId());
waitQueueEntity.setSiteId(applyLogEntity.getSiteId());
waitQueueEntity.setRecordId(applyLogEntity.getRecordId());
waitQueueEntity.setCatalogId(applyLogEntity.getCatalogId());
waitQueueEntity.setCatalogCode(applyLogEntity.getCatalogCode());
waitQueueEntity.setCatalogName(applyLogEntity.getCatalogName());
waitQueueEntity.setCertificateName(applyLogEntity.getCertificateName());
waitQueueEntity.setCertificateCode(applyLogEntity.getCertificateCode());
waitQueueEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
waitQueueEntity.setHolderName(applyLogEntity.getHolderName());
waitQueueEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
waitQueueEntity.setPickerName(applyLogEntity.getPickerName());
waitQueueEntity.setPickerIDCardNo(applyLogEntity.getPickerIDCardNo());
waitQueueEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
waitQueueEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
waitQueueEntity.setPrintStatus(YesNoEnum.NO.getValue());
waitQueueEntity.setMobile(applyLogEntity.getMobile());
waitQueueEntity.setTotal(paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId());
waitQueueEntity.setCreateTime(new Date());
......@@ -135,18 +126,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){
Date now = new Date();
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setSiteId(waitQueueEntity.getSiteId());
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
printLogEntity.setHolderName(waitQueueEntity.getHolderName());
printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
printLogEntity.setPickerName(waitQueueEntity.getPickerName());
printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo());
BeanUtils.copyProperties(waitQueueEntity, printLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
printLogEntity.setId(null);
printLogEntity.setUpdateUserId(null);
printLogEntity.setUpdateTime(null);
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
......@@ -159,37 +142,26 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
RetainLogEntity retainLogEntity = new RetainLogEntity();
Date now = new Date();
retainLogEntity.setSiteId(waitQueueEntity.getSiteId());
retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
retainLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
retainLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
retainLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
retainLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
retainLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
retainLogEntity.setHolderName(waitQueueEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
BeanUtils.copyProperties(waitQueueEntity, retainLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
retainLogEntity.setId(null);
retainLogEntity.setUpdateUserId(null);
retainLogEntity.setUpdateTime(null);
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setMobile(waitQueueEntity.getMobile());
retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
retainLogEntity.setCreateTime(now);
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setSiteId(waitQueueEntity.getSiteId());
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
printLogEntity.setHolderName(waitQueueEntity.getHolderName());
printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
printLogEntity.setPickerName(waitQueueEntity.getPickerName());
printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo());
printLogEntity.setMobile(waitQueueEntity.getMobile());
BeanUtils.copyProperties(waitQueueEntity, printLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
printLogEntity.setId(null);
printLogEntity.setUpdateUserId(null);
printLogEntity.setUpdateTime(null);
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
printLogEntity.setStatusRemark(PrintStatus.SUCCESS.getDesc());
retainLogDao.insert(retainLogEntity);
printLogDao.insert(printLogEntity);
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(waitQueueEntity.getCatalogId());
......
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