Skip to content

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

终端接口增加参数

parent 104ee694
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3394 additions and 2924 deletions
certificate-manager/doc/api.md
View file @ 3a1b91a3
......@@ -690,6 +690,9 @@ data|object|数据对象
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
dict|object|字典对象
**响应消息样例:**
......@@ -749,6 +752,9 @@ data|object|数据对象
 createTime|Date|创建时间
 updateUserId|Long|更新用户
 updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
dict|object|字典对象
**响应消息样例:**
......@@ -776,7 +782,10 @@ dict|object|字典对象
"createUserId":31,
"createTime":"2022-10-14",
"updateUserId":8897,
"updateTime":"2022-10-14"
"updateTime":"2022-10-14",
"printerName":"aa0y0y",
"printerIp":"cqvvc9",
"paperSource":"55io9h"
}
}
```
......@@ -808,6 +817,9 @@ createUserId|Long|否|创建用户
createTime|Date|否|创建时间
updateUserId|Long|否|更新用户
updateTime|Date|否|更新时间
printerName|String|否|打印机名称
printerIp|String|否|打印机网络地址
paperSource|String|否|打印机纸盒
**请求样例:**
```
......@@ -828,6 +840,9 @@ updateTime|Date|否|更新时间
"dupFormContent":"ye4wm8",
"exampleUrl":"mgv8im",
"status":1567,
"printerName":"q2bm5t",
"printerIp":"x8xb4l",
"paperSource":"4nccil"
}
```
......@@ -861,6 +876,9 @@ data|object|数据对象
  createTime|Date|创建时间
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  printerName|String|打印机名称
  printerIp|String|打印机网络地址
  paperSource|String|打印机纸盒
**响应消息样例:**
```
......@@ -2654,5 +2672,49 @@ dict|object|字典对象
"dict": null
}
```
### 终端提交打印结果
**请求URL:** print/log
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 保存打印结果
**请求参数:**
参数名称|类型|必填|描述
:---|:---|:---|:-------
waitQueueId|Long|是|打印列表id
printStatus|Integer|是|打印结果1成功-1失败
statusRemark|String|否|结果描述
**请求样例:**
```
{
"waitQueueId": 1,
"printStatus": -1,
"statusRemark":"错误测试"
}
```
**响应参数:**
参数名称|参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
dict|object|字典对象
**响应消息样例:**
```
{
"data": {},
"code": 1,
"msg": "保存打印记录成功",
"dict": null
}
```
## 字典附录
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ 3a1b91a3
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
/**
* 证照目录实体对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照目录实体对象
*
* @author zxfei
* @date 2022-10-26
*/
public class CertificateCatalogEntity extends CertificateCatalogVo {
private static final long serialVersionUID = 1L;
......@@ -80,6 +80,18 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 证照状态，0：禁用1：启用
*/
private Integer status;
/**
* 打印机名称
*/
private String printerName;
/**
* 打印机网络地址
*/
private String printerIp;
/**
* 打印机纸盒
*/
private String paperSource;
......@@ -308,6 +320,48 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
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;
}
......@@ -346,6 +400,9 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
sb.append(",dupFormContent:").append(getDupFormContent());
sb.append(",exampleUrl:").append(getExampleUrl());
sb.append(",status:").append(getStatus());
sb.append(",printerName:").append(getPrinterName());
sb.append(",printerIp:").append(getPrinterIp());
sb.append(",paperSource:").append(getPaperSource());
return sb.toString();
}
......@@ -382,5 +439,11 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.exampleUrl = "";
this.status = 1;
this.printerName = "";
this.printerIp = "";
this.paperSource = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ 3a1b91a3
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
/**
* 证照目录查询对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照目录查询对象
*
* @author zxfei
* @date 2022-10-26
*/
public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -168,6 +168,15 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 打印机名称 */
private List<String> printerNameList;
/** 打印机网络地址 */
private List<String> printerIpList;
/** 打印机纸盒 */
private List<String> paperSourceList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CertificateCatalogQuery> orConditionList;
......@@ -1015,6 +1024,51 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 打印机名称
* @return printerNameList
*/
public List<String> getPrinterNameList(){
return this.printerNameList;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
}
/**
* 获取 打印机网络地址
* @return printerIpList
*/
public List<String> getPrinterIpList(){
return this.printerIpList;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
}
/**
* 获取 打印机纸盒
* @return paperSourceList
*/
public List<String> getPaperSourceList(){
return this.paperSourceList;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1638,6 +1692,63 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
}
/**
* 设置 打印机名称
* @param printerName
*/
public CertificateCatalogQuery printerName(String printerName){
setPrinterName(printerName);
return this;
}
/**
* 设置 打印机名称
* @param printerNameList
*/
public CertificateCatalogQuery printerNameList(List<String> printerNameList){
this.printerNameList = printerNameList;
return this;
}
/**
* 设置 打印机网络地址
* @param printerIp
*/
public CertificateCatalogQuery printerIp(String printerIp){
setPrinterIp(printerIp);
return this;
}
/**
* 设置 打印机网络地址
* @param printerIpList
*/
public CertificateCatalogQuery printerIpList(List<String> printerIpList){
this.printerIpList = printerIpList;
return this;
}
/**
* 设置 打印机纸盒
* @param paperSource
*/
public CertificateCatalogQuery paperSource(String paperSource){
setPaperSource(paperSource);
return this;
}
/**
* 设置 打印机纸盒
* @param paperSourceList
*/
public CertificateCatalogQuery paperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是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/pdu/PrintLogPdu.java 0 → 100644
View file @ 3a1b91a3
package com.mortals.xhx.module.certificate.pdu;
import lombok.Data;
@Data
public class PrintLogPdu {
/** 打印队列id */
private Long waitQueueId;
/** 打印结果 */
private Integer printStatus;
/** 结果描述 */
private String statusRemark;
}
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java
View file @ 3a1b91a3
......@@ -16,6 +16,7 @@ import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.pdu.PrintListPdu;
import com.mortals.xhx.module.certificate.pdu.PrintLogPdu;
import com.mortals.xhx.module.certificate.pdu.PrintSettingPdu;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
......@@ -112,22 +113,15 @@ public class CertificatePrintController extends BaseJsonBodyController {
/**
* 打印文件
*/
@RequestMapping(value = {"do"},method = {RequestMethod.POST, RequestMethod.GET})
@RequestMapping(value = {"log"},method = {RequestMethod.POST, RequestMethod.GET})
@UnAuth
public Rest<Object> print(Long id) {
public Rest<Object> print(@RequestBody PrintLogPdu printLogPdu) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "打印证件";
String busiDesc = "保存打印记录";
int code=1;
try {
String rsp = printWaitQueueService.doPrint(id);
JSONObject jsonObject = JSONObject.parseObject(rsp);
if(jsonObject.getString("status").equals("1")){
model.put("message_info", busiDesc + "成功");
}else {
code = -1;
model.put("message_info", jsonObject.getString("message"));
}
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 3a1b91a3
......@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-10-26
*/
public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L;
......@@ -73,6 +73,10 @@ public class PrintLogEntity extends PrintLogVo {
* 证照目录ID
*/
private Long catalogId;
/**
* 打印结果描述
*/
private String statusRemark;
......@@ -273,6 +277,20 @@ public class PrintLogEntity extends PrintLogVo {
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 打印结果描述
* @return String
*/
public String getStatusRemark(){
return statusRemark;
}
/**
* 设置 打印结果描述
* @param statusRemark
*/
public void setStatusRemark(String statusRemark){
this.statusRemark = statusRemark;
}
......@@ -309,6 +327,7 @@ public class PrintLogEntity extends PrintLogVo {
sb.append(",printDate:").append(getPrintDate());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",catalogId:").append(getCatalogId());
sb.append(",statusRemark:").append(getStatusRemark());
return sb.toString();
}
......@@ -341,5 +360,7 @@ public class PrintLogEntity extends PrintLogVo {
this.deviceId = null;
this.catalogId = null;
this.statusRemark = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 3a1b91a3
......@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.record.model.PrintLogEntity;
/**
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-10-22
*/
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-10-26
*/
public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -148,6 +148,9 @@ public class PrintLogQuery extends PrintLogEntity {
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 打印结果描述 */
private List<String> statusRemarkList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintLogQuery> orConditionList;
......@@ -884,6 +887,21 @@ public class PrintLogQuery extends PrintLogEntity {
this.catalogIdList = catalogIdList;
}
/**
* 获取 打印结果描述
* @return statusRemarkList
*/
public List<String> getStatusRemarkList(){
return this.statusRemarkList;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public void setStatusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1399,6 +1417,25 @@ public class PrintLogQuery extends PrintLogEntity {
return this;
}
/**
* 设置 打印结果描述
* @param statusRemark
*/
public PrintLogQuery statusRemark(String statusRemark){
setStatusRemark(statusRemark);
return this;
}
/**
* 设置 打印结果描述
* @param statusRemarkList
*/
public PrintLogQuery statusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java
View file @ 3a1b91a3
package com.mortals.xhx.module.record.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -9,6 +11,18 @@ import java.util.List;
* @author zxfei
* @date 2022-10-22
*/
@Data
public class PrintWaitQueueVo extends BaseEntityLong {
/**
* 打印机名称
*/
private String printerName;
/**
* 打印机网络地址
*/
private String printerIp;
/**
* 打印机纸盒
*/
private String paperSource;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java
View file @ 3a1b91a3
......@@ -27,5 +27,5 @@ public interface PrintWaitQueueService extends ICRUDService<PrintWaitQueueEntity
* 打印文件
* @param id
*/
String doPrint(Long id);
void doPrint(Long id,int printStatus,String statusRemark);
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 3a1b91a3
......@@ -4,6 +4,7 @@ import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
import com.mortals.xhx.module.certificate.service.CertificateCatalogService;
import com.mortals.xhx.module.record.dao.PrintLogDao;
import com.mortals.xhx.module.record.dao.RetainLogDao;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
......@@ -22,6 +23,7 @@ import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -48,7 +50,18 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private PrintLogDao printLogDao;
@Autowired
private RetainLogDao retainLogDao;
@Autowired
private CertificateCatalogService certificateCatalogService;
@Override
protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
for(PrintWaitQueueEntity printWaitQueueEntity:list){
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(printWaitQueueEntity.getCatalogId());
printWaitQueueEntity.setPaperSource(catalogEntity.getPaperSource());
printWaitQueueEntity.setPrinterIp(catalogEntity.getPrinterIp());
printWaitQueueEntity.setPrinterName(catalogEntity.getPrinterName());
}
}
@Override
public void creatWaitQueueByApply(ApplyLogEntity applyLogEntity, int generateType, Context context) throws AppException {
......@@ -92,44 +105,55 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
}
@Override
public String doPrint(Long id) {
public void doPrint(Long id,int printStatus,String statusRemark) {
PrintWaitQueueEntity waitQueueEntity = this.dao.get(id);
if(waitQueueEntity==null){
throw new AppException("数据不存在或已修改");
}
String rootPath = this.ip.endsWith("/") ? this.ip : this.ip + "/";
String filePath = rootPath+waitQueueEntity.getCertificateUrl();
Map<String,String> printParameter = new HashMap<>();
printParameter.put("printername","测试打印机");//打印机名称
printParameter.put("printerip",printIp);//打印机网络地址
printParameter.put("printerpapersource","1");//打印机纸盒
printParameter.put("printerfile",filePath);//打印文件网络地址格式为doc文件或pdf文件
try {
//String rsp = HttpUtil.doPost(printApi, printParameter);
String rsp = "{\n" +
" \"status\": \"1\",\n" +
" \"message\": \"打印成功\",\n" +
" }";
JSONObject jsonObject = JSONObject.parseObject(rsp);
if(jsonObject.getString("status").equals("1")){
doPrintAfter(waitQueueEntity,1);
}else {
doPrintAfter(waitQueueEntity,-1);
//throw new AppException(jsonObject.getString("message"));
}
PrintWaitQueueEntity data = new PrintWaitQueueEntity();
data.setId(id);
data.setPrintStatus(YesNoEnum.YES.getValue());
if(printStatus==PrintStatus.SUCCESS.getValue()){
doPrintSuccess(waitQueueEntity);
data.setPrintStatus(YesNoEnum.YES.getValue());
}else {
doPrintFail(waitQueueEntity,statusRemark);
data.setPrintStatus(-1);
}
data.setUpdateTime(new Date());
dao.update(data);
return rsp;
}catch (Throwable e){
log.error("调用远程打印api接口出错",e);
throw new AppException("调用远程打印api接口出错");
}
private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){
Date now = new Date();
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
if(waitQueueEntity.getCertificateType()==CertificateType.ORIGINAL.getValue()){
printLogEntity.setOriginalCount(1);
printLogEntity.setDuplicateCount(0);
}else {
printLogEntity.setOriginalCount(0);
printLogEntity.setDuplicateCount(1);
}
printLogEntity.setCertificateName(waitQueueEntity.getCertificateName());
printLogEntity.setCertificateCode(waitQueueEntity.getCertificateCode());
printLogEntity.setEnterpriseName(waitQueueEntity.getEnterpriseName());
printLogEntity.setHolderName(waitQueueEntity.getHolderName());
printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
printLogEntity.setPickerName(waitQueueEntity.getPickerName());
printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo());
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue());
printLogEntity.setStatusRemark(statusRemark);
printLogDao.insert(printLogEntity);
}
private void doPrintAfter(PrintWaitQueueEntity waitQueueEntity,int printResult){
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
RetainLogEntity retainLogEntity = new RetainLogEntity();
Date now = new Date();
retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
......@@ -172,13 +196,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
if(printResult==1){
//打印成功
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
retainLogDao.insert(retainLogEntity);
}else {
printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue());
}
printLogDao.insert(printLogEntity);
}
}
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 3a1b91a3
<?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">
<!-- 字段和属性映射 -->
......@@ -24,6 +24,7 @@
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
<result property="statusRemark" column="statusRemark" />
</resultMap>
......@@ -88,23 +89,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('statusRemark') or colPickMode == 1 and data.containsKey('statusRemark')))">
a.statusRemark,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark)
VALUES
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId},#{statusRemark})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
(catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId,statusRemark)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId},#{item.statusRemark})
</foreach>
</insert>
......@@ -189,6 +193,9 @@
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('statusRemark')) or (colPickMode==1 and !data.containsKey('statusRemark'))">
a.statusRemark=#{data.statusRemark},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -362,6 +369,13 @@
</choose>
</foreach>
</trim>
<trim prefix="statusRemark=(case" suffix="ELSE statusRemark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('statusRemark')) or (colPickMode==1 and !item.containsKey('statusRemark'))">
when a.id=#{item.id} then #{item.statusRemark}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -796,6 +810,21 @@
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('statusRemark')">
<if test="conditionParamRef.statusRemark != null and conditionParamRef.statusRemark != ''">
${_conditionType_} a.statusRemark like #{${_conditionParam_}.statusRemark}
</if>
<if test="conditionParamRef.statusRemark == null">
${_conditionType_} a.statusRemark is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusRemarkList')">
${_conditionType_} a.statusRemark in
<foreach collection="conditionParamRef.statusRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -904,6 +933,11 @@
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('statusRemark')">
a.statusRemark
<if test='orderCol.statusRemark != null and "DESC".equalsIgnoreCase(orderCol.statusRemark)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
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