Skip to content

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

增加工行支付功能

parent d097da15
Hide whitespace changes
Inline Side-by-side
Showing with 6036 additions and 415 deletions
certificate-manager/db/update.sql
View file @ 454eb4ff
ALTER TABLE `mortals_xhx_business_license` ADD COLUMN `PermitPrintDate` varchar(32) DEFAULT '' COMMENT '签发日期';
\ No newline at end of file
ALTER TABLE `mortals_xhx_business_license` ADD COLUMN `PermitPrintDate` varchar(32) DEFAULT '' COMMENT '签发日期';
ALTER TABLE `mortals_xhx_apply_log` ADD COLUMN `charge` tinyint(2) NOT NULL DEFAULT '0' COMMENT '是否需要收费',
ADD COLUMN `amount` int(8) NOT NULL DEFAULT '0' COMMENT '收费金额(单位:分)';
ALTER TABLE `mortals_xhx_print_wait_queue` ADD COLUMN `charge` tinyint(2) NOT NULL DEFAULT '0' COMMENT '是否需要收费0否1是',
ADD COLUMN `amount` int(8) NOT NULL DEFAULT '0' COMMENT '收费金额(单位:分)',
ADD COLUMN `paystatus` tinyint(2) NOT NULL DEFAULT '0' COMMENT '支付状态0未支付1已支付';
ALTER TABLE `mortals_xhx_print_log` ADD COLUMN `faceUrl` varchar(255) COMMENT '取件人人脸信息',
ADD COLUMN `signUrl` varchar(255) COMMENT '取件人签名信息',
ADD COLUMN `printQueueId` bigint(20) COMMENT '打印队列ID';
-- ----------------------------
-- 支付请求表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_pay_requst`;
CREATE TABLE mortals_xhx_pay_requst(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`applyId` bigint(20) COMMENT '申请ID',
`printQueueId` bigint(20) COMMENT '打印队列ID',
`orderNum` varchar(64) NOT NULL COMMENT '支付订单编号',
`amount` int(8) NOT NULL DEFAULT '0' COMMENT '订单金额(单位:分)',
`orderDate` datetime NOT NULL COMMENT '订单日期',
`qrcodeUrl` varchar(255) COMMENT '支付二维码',
`payExpire` int(8) COMMENT '二维码有效时间单位秒',
`payStatus` tinyint(2) COMMENT '支付状态',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
,KEY `orderNum` (`orderNum`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='支付请求';
ALTER TABLE `mortals_xhx_print_wait_queue` ADD COLUMN `orderNum` varchar(128) COMMENT '订单号';
\ No newline at end of file
certificate-manager/pom.xml
View file @ 454eb4ff
......@@ -36,6 +36,7 @@
<profiles.redis.password></profiles.redis.password>
<profiles.redis.database>6</profiles.redis.database>
<profiles.filepath>d:/mortals/app/data/cpm</profiles.filepath>
<profiles.uploadUrl>http://192.168.0.98:17216/cpm/file/commonupload?prePath=/file/uploadfile</profiles.uploadUrl>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
......@@ -76,7 +77,18 @@
<id>product</id>
<properties>
<profiles.active>product</profiles.active>
<profiles.server.port>19211</profiles.server.port>
<profiles.server.port>17216</profiles.server.port>
<profiles.datasource.uri>
<![CDATA[jdbc:mysql://localhost:3306/certificate?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>xjzwroot@2022</profiles.datasource.password>
<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username>
<profiles.redis.password></profiles.redis.password>
<profiles.redis.database>1</profiles.redis.database>
<profiles.filepath>C:/mortals/app/data</profiles.filepath>
<profiles.uploadUrl>ttp://221.237.182.106:8075/cpm/file/commonupload?prePath=/file/uploadfile</profiles.uploadUrl>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.100:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.100</profiles.rabbitmq.host>
......@@ -184,6 +196,35 @@
<artifactId>javase</artifactId>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>icbc</groupId>
<artifactId>cop-io</artifactId>
<version>1.0.0</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/icbc_lib/icbc-api-sdk-cop-io.jar</systemPath>-->
</dependency>
<dependency>
<groupId>icbc</groupId>
<artifactId>cop</artifactId>
<version>1.0.0</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/icbc_lib/icbc-api-sdk-cop.jar</systemPath>-->
</dependency>
<dependency>
<groupId>icbc</groupId>
<artifactId>ca</artifactId>
<version>1.0.0</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/icbc_lib/icbc-ca.jar</systemPath>-->
</dependency>
<dependency>
<groupId>icbc</groupId>
<artifactId>hsm</artifactId>
<version>1.0.0</version>
<!--<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/icbc_lib/hsm-software-share-1.0.5.jar</systemPath>-->
</dependency>
</dependencies>
<build>
......
certificate-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
View file @ 454eb4ff
......@@ -330,4 +330,38 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
dao.update(sysUser);
return true;
}
public static void main(String[] args) throws Exception {
String pss = "WCX@18011533818";
String pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "CL@18108005449";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "YP@13881954990";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "HXZ@18113088186";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "WQ@13086665623";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "YLP@15883305603";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "YR@13609450909";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "ZZY@15802871365";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "CKL@18834108727";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
pss = "WQ@19936078114";
pwd = SecurityUtil.md5DoubleEncoding(pss);
System.out.println(pss+"__"+pwd);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/busiz/icbc/QrcodeGenerateTest.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.busiz.icbc;
import com.alibaba.fastjson.JSON;
import com.icbc.api.DefaultIcbcClient;
import com.icbc.api.IcbcApiException;
import com.icbc.api.IcbcConstants;
import com.icbc.api.request.CardbusinessQrcodeQrgenerateRequestV1;
import com.icbc.api.request.QrcodeGenerateRequestV2;
import com.icbc.api.response.CardbusinessQrcodeQrgenerateResponseV1;
import com.icbc.api.response.QrcodeGenerateResponseV2;
public class QrcodeGenerateTest {
//1、网关公钥
protected static final String APIGW_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB";
//2、appid
protected static final String APP_ID = "10000000000003219401";
//3、密钥对认证方式，公钥在API平台登记，此处为私钥
protected static final String MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrlSRQ9qe9rXduyQka0UE0mqLNtMqNWJlq3aD11tAh96KoM+yReJVC8vd1/25ANnM3oIEht7daB1LBZRx41DlJ95bdsxLtuIQ3ENGcUQSUv3dP/YtKoXxjWmo7E1UGNWZP3/PK48SKxFdP0lM69MtA4/flLpOAX8cqHYWRYsquG8GdskL5qrw0msPo2ooBa70Zdgp/IoSty/+1bqU5j5MjXDB8fb9dlqItmSkuGo/EqE1I+GycmVFX7hhQlXRQSOU0hsBEqrcjsBkg7ZQAJLd06eRnz2tr6zMskLMXL3juxOnxZfIbDQlvY0P3IGjpusYiSoO0erdiuhscRoKL0f3FAgMBAAECggEACurD3e+RBQAG/oJbCnJFpaewc8nXg2kfkHhGgq3Rc1UoFm9V/ibVHxE0zooF2p8Rnfif5A8mODEJbRWrsJfBh2PHR8GE6EwvrriVZaPqrd4wJLjwm7ss82iwI/nFv03hfck1ip4LBiXvmjwQdfVXrgAd6IlEnaE6cQMM2bnBRJTpH4gQGfFIdG71Tn5Q7qukwyTPBFlu1ocaRy+nqVAnjnwXlR7cqBcBZplvNmzWaNBrKnuoIp2U9GGifvbeN5MevNeSVfbIbe1siU33UpO0w1/TwmfztYFtxVp5TjbOw5SNW7RidNSh4vLFLep3kUm1trkD5VIrXpGSsxhyeDj5BwKBgQDDf0oVCVH3UTKmDKcF8DHEAgmwYmmVD6voh9rY/56iPR4EzH95vjBye0F9aiYAk22y2ebNimnBgWzgGTs+lrFldUc0lXR2H+NMmhVc8OWnoa4E4fF5xFHMbWE/m9o204BsiS3tnxE16d5ozfWTSPvfDhr5bZ+JOhwYXFVgaML4wwKBgQDgryk4/+LpEP8hKGx7tVi+1QBkZWeroIC8TvLf7OIkmsAoHRUX4JljkU1wpvwcU4cUgqTLXr19HX2NwwKXJkSb6y/Wp1tFPPIbm5hrakp4Z1w4HqGeMWs3ckZxgXHo6KuVUxMJ4kpN53ueaTEL5OqNn2bJcKvYNr3BTepN8N+G1wKBgQC8TV349zo5Ir/LSwKR6LK2nlPgzlnuVuL5nenA/C47DO1eJ+9dP0EA9BG3kEe8ZETUcagrMHf/B//rtsHm3lVOaXFFh/NeWAai4QNUu0Apf8TTNSJXbC5x3qU+FItSJdRcNqHDcGSubm5ouoEg9bqNNdPrjpiNICixmjYuH5o06wKBgBqJ9geKigXXgRssiCvQjsvzotk49RbbnXkgpiV2+Hs0YDAcx0oLuHJ/TjNZNfwujY0JpWd0KFOn8RWWjC7IUWBNVlg3altySHKkXUuKwYMZSlZCn/psgeqJr/JmRMsq+GFp75zCQt6S0hIzAJ0UC/RweJagnVurk5xKlLtiETT/AoGAfTh49Y2caLLv1IyjezLJdJ3fi/vhG1iKAsReRVhXuB+jcSlNEbadwRkIqemssExq3B2MR0+eOsqR/wJkx6WNH6UGIRC6MEXQCZTghSVhWAiNefvVRN7961e7NgwlABaftUn+07e3sb56RXluzWlUO/8fnQgJleh8u+5TmW5pqpY=";
public static void main(String[] args) throws Exception {
//签名类型为RSA2时，需传入appid，私钥和网关公钥，签名类型使用定值IcbcConstants.SIGN_TYPE_RSA2，其他参数使用缺省值
// DefaultIcbcClient client = new DefaultIcbcClient(APP_ID, IcbcConstants.SIGN_TYPE_RSA2, MY_PRIVATE_KEY, APIGW_PUBLIC_KEY);
//
// QrcodeGenerateRequestV2 request = new QrcodeGenerateRequestV2();
//
// //4、根据测试环境和生产环境替换相应ip和端口
// request.setServiceUrl("https://gw.open.icbc.com.cn/api/cardbusiness/qrcode/qrgenerate/V1");
//
// //5、请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
// QrcodeGenerateRequestV2.QrcodeGenerateRequestV2Biz bizContent = new QrcodeGenerateRequestV2.QrcodeGenerateRequestV2Biz();
// bizContent.setMerId("440286510152"); //商户编号
// bizContent.setStoreCode("440286510152"); //e生活档案编号
// bizContent.setOutTradeNo("ZHL777O15002039"); //商户系统订单号
// bizContent.setOrderAmt("1"); //订单总金额(单位：分)
// bizContent.setTradeDate("20241205"); //商户订单生成日期，格式是yyyyMMdd
// bizContent.setTradeTime("150026"); //商户订单生成时间，格式是HHmmss
// bizContent.setAttach("abcdefg"); //商户附加数据，最多21个汉字字符 该字段非必输项
// bizContent.setPayExpire("1200"); //二维码有效期(单位：秒)，必须小于24小时
// bizContent.setNotifyUrl("127.0.0.1"); //商户接收支付成功通知消息URL，当notify_flag为1时必输
// bizContent.setTporderCreateIp("127.0.0.1"); //商户订单生成的机器IP
// bizContent.setSpFlag("0"); //扫码后是否需要跳转分行(0：否，1：是，默认值0),该字段非必输项
// bizContent.setNotifyFlag("0"); //商户是否开启通知接口(0：否，1：是，默认值0)
// request.setBizContent(bizContent);
//
// QrcodeGenerateResponseV2 response = new QrcodeGenerateResponseV2();
// try {
// response = client.execute(request, "msgId");//msgId消息通讯唯一编号，要求每次调用独立生成，APP级唯一
// if (response.isSuccess()) {
// //6、业务成功处理，请根据接口文档用response.getxxx()获取同步返回的业务数据
// System.out.println("ReturnCode:"+response.getReturnCode());
// System.out.println("response:" + response);
// } else {
// //失败
// System.out.println("ReturnCode:" + response.getReturnCode());
// System.out.println("ReturnMsg:" + response.getReturnMsg());
// }
// } catch (IcbcApiException e) {
// e.printStackTrace();
// }
DefaultIcbcClient client = new DefaultIcbcClient(APP_ID, IcbcConstants.SIGN_TYPE_RSA2, MY_PRIVATE_KEY, APIGW_PUBLIC_KEY);
CardbusinessQrcodeQrgenerateRequestV1 request = new CardbusinessQrcodeQrgenerateRequestV1();
request.setServiceUrl("https://gw.open.icbc.com.cn/api/cardbusiness/qrcode/qrgenerate/V1");
CardbusinessQrcodeQrgenerateRequestV1.CardbusinessQrcodeQrgenerateRequestV1Biz bizContent = new CardbusinessQrcodeQrgenerateRequestV1.CardbusinessQrcodeQrgenerateRequestV1Biz();
request.setBizContent(bizContent);
bizContent.setMerId("440286510152");
//bizContent.setStoreCode("440286510152");
bizContent.setOutTradeNo("ZHL177O15002040");
bizContent.setOrderAmt("1");
bizContent.setTradeDate("20241205");
bizContent.setTradeTime("155526");
bizContent.setTporderCreateIp("127.0.0.1");
bizContent.setNotifyFlag("0");
bizContent.setPayExpire("1200");
CardbusinessQrcodeQrgenerateResponseV1 response;
try {
response = client.execute(request, System.currentTimeMillis() + "");//msgId消息通讯唯一编号，要求每次调用独立生成，APP级唯一
if (response.getReturnCode() == 0) {
// 6、业务成功处理，请根据接口文档用response.getxxx()获取同步返回的业务数据
System.out.println("ReturnCode:" + response.getReturnCode());
System.out.println("response:" + JSON.toJSONString(response));
} else {
// 失败
System.out.println("response:" + JSON.toJSONString(response));
System.out.println("ReturnCode:" + response.getReturnCode());
System.out.println("ReturnMsg:" + response.getReturnMsg());
}
} catch (IcbcApiException e) {
e.printStackTrace();
}
}
}
certificate-manager/src/main/java/com/mortals/xhx/busiz/icbc/QrcodePaystatusTest.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.busiz.icbc;
import com.alibaba.fastjson.JSON;
import com.icbc.api.DefaultIcbcClient;
import com.icbc.api.IcbcApiException;
import com.icbc.api.IcbcConstants;
import com.icbc.api.request.MybankPayQrcodeScannedPaystatusRequestV2;
import com.icbc.api.response.MybankPayQrcodeScannedPaystatusResponseV2;
public class QrcodePaystatusTest {
//1、网关公钥
protected static final String APIGW_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB";
//2、appid
protected static final String APP_ID = "10000000000003219401";
//3、密钥对认证方式，公钥在API平台登记，此处为私钥
protected static final String MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrlSRQ9qe9rXduyQka0UE0mqLNtMqNWJlq3aD11tAh96KoM+yReJVC8vd1/25ANnM3oIEht7daB1LBZRx41DlJ95bdsxLtuIQ3ENGcUQSUv3dP/YtKoXxjWmo7E1UGNWZP3/PK48SKxFdP0lM69MtA4/flLpOAX8cqHYWRYsquG8GdskL5qrw0msPo2ooBa70Zdgp/IoSty/+1bqU5j5MjXDB8fb9dlqItmSkuGo/EqE1I+GycmVFX7hhQlXRQSOU0hsBEqrcjsBkg7ZQAJLd06eRnz2tr6zMskLMXL3juxOnxZfIbDQlvY0P3IGjpusYiSoO0erdiuhscRoKL0f3FAgMBAAECggEACurD3e+RBQAG/oJbCnJFpaewc8nXg2kfkHhGgq3Rc1UoFm9V/ibVHxE0zooF2p8Rnfif5A8mODEJbRWrsJfBh2PHR8GE6EwvrriVZaPqrd4wJLjwm7ss82iwI/nFv03hfck1ip4LBiXvmjwQdfVXrgAd6IlEnaE6cQMM2bnBRJTpH4gQGfFIdG71Tn5Q7qukwyTPBFlu1ocaRy+nqVAnjnwXlR7cqBcBZplvNmzWaNBrKnuoIp2U9GGifvbeN5MevNeSVfbIbe1siU33UpO0w1/TwmfztYFtxVp5TjbOw5SNW7RidNSh4vLFLep3kUm1trkD5VIrXpGSsxhyeDj5BwKBgQDDf0oVCVH3UTKmDKcF8DHEAgmwYmmVD6voh9rY/56iPR4EzH95vjBye0F9aiYAk22y2ebNimnBgWzgGTs+lrFldUc0lXR2H+NMmhVc8OWnoa4E4fF5xFHMbWE/m9o204BsiS3tnxE16d5ozfWTSPvfDhr5bZ+JOhwYXFVgaML4wwKBgQDgryk4/+LpEP8hKGx7tVi+1QBkZWeroIC8TvLf7OIkmsAoHRUX4JljkU1wpvwcU4cUgqTLXr19HX2NwwKXJkSb6y/Wp1tFPPIbm5hrakp4Z1w4HqGeMWs3ckZxgXHo6KuVUxMJ4kpN53ueaTEL5OqNn2bJcKvYNr3BTepN8N+G1wKBgQC8TV349zo5Ir/LSwKR6LK2nlPgzlnuVuL5nenA/C47DO1eJ+9dP0EA9BG3kEe8ZETUcagrMHf/B//rtsHm3lVOaXFFh/NeWAai4QNUu0Apf8TTNSJXbC5x3qU+FItSJdRcNqHDcGSubm5ouoEg9bqNNdPrjpiNICixmjYuH5o06wKBgBqJ9geKigXXgRssiCvQjsvzotk49RbbnXkgpiV2+Hs0YDAcx0oLuHJ/TjNZNfwujY0JpWd0KFOn8RWWjC7IUWBNVlg3altySHKkXUuKwYMZSlZCn/psgeqJr/JmRMsq+GFp75zCQt6S0hIzAJ0UC/RweJagnVurk5xKlLtiETT/AoGAfTh49Y2caLLv1IyjezLJdJ3fi/vhG1iKAsReRVhXuB+jcSlNEbadwRkIqemssExq3B2MR0+eOsqR/wJkx6WNH6UGIRC6MEXQCZTghSVhWAiNefvVRN7961e7NgwlABaftUn+07e3sb56RXluzWlUO/8fnQgJleh8u+5TmW5pqpY=";
public static void main(String[] args) {
DefaultIcbcClient client = new DefaultIcbcClient(APP_ID, IcbcConstants.SIGN_TYPE_RSA2, MY_PRIVATE_KEY, APIGW_PUBLIC_KEY);
MybankPayQrcodeScannedPaystatusRequestV2 request = new MybankPayQrcodeScannedPaystatusRequestV2();
//4、根据测试环境和生产环境替换相应ip和端口
request.setServiceUrl("https://gw.open.icbc.com.cn/api/mybank/pay/qrcode/scanned/paystatus/V2");
//5、请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
MybankPayQrcodeScannedPaystatusRequestV2.MybankPayQrcodeScannedPaystatusRequestV2Biz bizContent = new MybankPayQrcodeScannedPaystatusRequestV2.MybankPayQrcodeScannedPaystatusRequestV2Biz();
bizContent.setMerId("440286510152"); //商户编号
bizContent.setOutTradeNo("ZHL177O15002040"); //外部订单号
bizContent.setTradeDate("20241205"); //交易日期 格式:YYYYMMDD
bizContent.setOrderId("");
request.setBizContent(bizContent);
MybankPayQrcodeScannedPaystatusResponseV2 response;
try {
response = client.execute(request, System.currentTimeMillis() + "");//msgId消息通讯唯一编号，要求每次调用独立生成，APP级唯一
if (response.getReturnCode() == 0) {
// 6、业务成功处理，请根据接口文档用response.getxxx()获取同步返回的业务数据
System.out.println("response:" + JSON.toJSONString(response));
System.out.println("ReturnCode:"+response.getReturnCode());
} else {
// 失败
System.out.println("response:" + JSON.toJSONString(response));
System.out.println("ReturnCode:"+response.getReturnCode());
System.out.println("ReturnMsg:"+response.getReturnMsg());
}
} catch (IcbcApiException e) {
e.printStackTrace();
}
}
}
certificate-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignCheckboxComponent.java
View file @ 454eb4ff
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
......@@ -30,8 +31,13 @@ public class DesignCheckboxComponent extends DesignComponent {
@Override
public ListItem buildDefaultComponent(ComponentCons cons) {
CheckboxListItem columnsItem = new CheckboxListItem();
List<String> keys = StrSplitter.split(cons.getVal(), "_", true, true);
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
if(keys.size()>3) {
columnsItem.setId(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
columnsItem.set_id(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
}
columnsItem.setCompType("checkbox");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("checkbox");
......@@ -53,7 +59,8 @@ public class DesignCheckboxComponent extends DesignComponent {
columnsItem.setSpan(24);
columnsItem.setOptionType("default");
columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
//columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setAction("");
columnsItem.setClearable(false);
columnsItem.setValue(Lists.newArrayList());
columnsItem.setRules(Lists.newArrayList());
......
certificate-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignInputComponent.java
View file @ 454eb4ff
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.text.StrSplitter;
import com.google.common.collect.Lists;
import cn.hutool.core.util.IdUtil;
......@@ -10,6 +11,7 @@ import com.mortals.xhx.common.pdu.gen.*;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import java.util.ArrayList;
import java.util.List;
/**
* 输入框组件
......@@ -29,6 +31,11 @@ public class DesignInputComponent extends DesignComponent {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
List<String> keys = StrSplitter.split(cons.getVal(), "_", true, true);
if(keys.size()>3) {
columnsItem.setId(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
columnsItem.set_id(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
}
columnsItem.setCompType("input");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("input");
......@@ -54,6 +61,7 @@ public class DesignInputComponent extends DesignComponent {
columnsItem.setAppend("");
columnsItem.setPrepend("");
columnsItem.setLayout("colItem");
columnsItem.setValue(cons.getDefaultValue());
return columnsItem;
}
......
certificate-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignSelectComponent.java
View file @ 454eb4ff
package com.mortals.xhx.common.formdesign.component;
import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.google.common.collect.Lists;
......@@ -34,6 +35,11 @@ public class DesignSelectComponent extends DesignComponent {
ListItem columnsItem = new ListItem();
columnsItem.setId(cons.getVal());
columnsItem.set_id(cons.getVal());
List<String> keys = StrSplitter.split(cons.getVal(), "_", true, true);
if(keys.size()>3) {
columnsItem.setId(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
columnsItem.set_id(keys.get(0) + "_" + keys.get(1) + "_" + keys.get(2));
}
columnsItem.setCompType("select");
columnsItem.setCompName(cons.getLabel());
columnsItem.setCompIcon("select");
......@@ -52,7 +58,8 @@ public class DesignSelectComponent extends DesignComponent {
columnsItem.setGutter(15);
columnsItem.setSpan(24);
columnsItem.setDataType("static");
columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
//columnsItem.setAction("https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options");
columnsItem.setAction("");
columnsItem.setClearable(false);
columnsItem.setRules(Lists.newArrayList());
columnsItem.setLayout("colItem");
......
certificate-manager/src/main/java/com/mortals/xhx/common/pdu/gen/component/ComponentCons.java
View file @ 454eb4ff
......@@ -32,4 +32,6 @@ public class ComponentCons {
private String uploadFileUrl;
private String defaultValue;
}
certificate-manager/src/main/java/com/mortals/xhx/common/utils/QrCodeUtil.java
View file @ 454eb4ff
......@@ -412,7 +412,7 @@ public class QrCodeUtil {
// BufferedImage barCode = QrCodeUtil.getBarCode("123456789123456789");
// BufferedImage bufferedImage = QrCodeUtil.insertWords(barCode, "891234567891234567");
// ImageIO.write(bufferedImage,"png",new File("D:\\mortals\\app\\data\\test\\123.png"));
QrCodeUtil.generateQrCodeFile("https://pics7.baidu.com/feed/cc11728b4710b9127b860294afb21408934522f4.jpeg@f_auto?token=6ef8230f0103fcd054294bff35ff9292","D:\\mortals\\app\\data\\test\\789.png");
QrCodeUtil.generateQrCodeFile("https://qr.95516.com/01020001/wcqr?f=ICBCqr&X=5&T=3&P=13&I=37148139e896f1bea1b6e07dfeb131dc&N=ae6bcfa465ba4e0860d95cb6908823f3&L=4f288ba1f8d36ce284ea719473e21d1a55fd7c16cb5927d02fa321944eeb4a928e08cb9d9aae06ad346842fcccf4248e","D:\\mortals\\app\\data\\1789.png");
}
......
certificate-manager/src/main/java/com/mortals/xhx/common/utils/RSAUtils.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.common.utils;
import org.apache.commons.codec.binary.Base64;
import java.security.Key;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.Signature;
import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
import java.util.ArrayList;
import javax.crypto.Cipher;
public final class RSAUtils {
private static final String KEY_ALGORITHM = "RSA";
private static final int KEY_SIZE = 2048;//设置长度
public static final String SIGNATURE_ALGORITHM = "SHA256withRSA";
public static final String RSA_TYPE = "RSA/ECB/PKCS1Padding";
private final static String PUBLIC_KEY_NAME = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvJWHTWgcfPjzWTt1OAUAvOnd8N/ITzP+Xe1PY2fMhFNzmRV9a78fAZ5C6ynFzsQGJNffvlw4HoB6HsUWmGymkR9950hqXXiMpbNoQ4MqEtxPKx1Blusp3E8tJ9ABzrSat4/PfkQ+Iw9t5sHQhSFt2kJCD7KUw9gW8hVMnQTngMlgvt1U9ozj7tBdQMRduk/KkA1G/ZxvYWb5ZcFb0PeHoUDuEr6HXOycxm6cRZBjly97IrfUCEemKKKPmjacntaP+pgS0cc9jWIYAeMhhjmRa7hY2pn6Q3mSiq+V9ruUnKQOlyLcQ1Y1wrfOydo0e/3jAzoLeJR8uWUnZQcxmnuzUwIDAQAB";
private final static String PRIVATE_KEY_NAME = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8lYdNaBx8+PNZO3U4BQC86d3w38hPM/5d7U9jZ8yEU3OZFX1rvx8BnkLrKcXOxAYk19++XDgegHoexRaYbKaRH33nSGpdeIyls2hDgyoS3E8rHUGW6yncTy0n0AHOtJq3j89+RD4jD23mwdCFIW3aQkIPspTD2BbyFUydBOeAyWC+3VT2jOPu0F1AxF26T8qQDUb9nG9hZvllwVvQ94ehQO4Svodc7JzGbpxFkGOXL3sit9QIR6Yooo+aNpye1o/6mBLRxz2NYhgB4yGGOZFruFjamfpDeZKKr5X2u5ScpA6XItxDVjXCt87J2jR7/eMDOgt4lHy5ZSdlBzGae7NTAgMBAAECggEAHX4/Ml5xciQXHuH7I584rdLfiH/fGm/1vKfUDiZaKGnKvurK+jJiPYUMTy3xxzQGB/YRAnr2teJ+9tf5AC6h4DluHeFH7UVgrbuAt2pIhrmY0hPZwaoWmmNxmvPfjH3XYpTlrQgsNZyAoiG2pFOFlChfn4fc10Iw2Hx3RmlRcWUId9dx742nDxTKjRgvTkk+epjFw2Ey02B222N6oyY3uEEgXHp/1cs53I25iaj5eni8L8BXmGogNF9uPpp8eEHTwp+YCn1sPHe4nZDnPm+ExMU92LcbTCkaeesFpD+ifbyAT8eGvZfOXsa+R3zGDEakFPgpY9flbz9QgydSYTnkaQKBgQDb+zfvZfOUajXSeqDhMDWtWlPsrtgu7Eryueh87gLSoVZGFH851vYCMkAj62PNo++F1ZPJJ+XOsHvaiW6hrXXgrmKU7F/QL6DLjMxhS6KzQ67KMbYVe56ilLfcW8sFdmGXK78+f5Q0zD8/bRFpvsjPU3VqLIYZbRq6YXZAB0FzmQKBgQDbdkHunNw7tJzmKsOtiECiXYSxT4eD98sh/LOEZG1JM0w84J2h6aTwLg/FdWYKnkkrs4HyWvaDZbo3rld7l6p9qFCM0VLUAuDBQRyTQxmRAhwZgcpHlRRuOwqH9P/NMfLwZnXS6ZJS7BPm6bb7iuY3U2XPHfEbrGICjQ4m0xLxywKBgQDA4+XGO4V8bC1JpFGRY+6NVRkl/qJ9cqC9eZqMgT9kZif6R1rP4tfQUTPAy1S2KruKhR6TUjLGLCZOGBg0GJ+2JfM3VpUlPb4m/gzwe5vsyLppfXGGIOGW+gTGao74+TbVkXyeVswkB7yl5wNP0ATRFwNr2CK2BN9c8rz3o+UWcQKBgQCgEQjVuKMJCRrG5boC/7XktsDpclAs+La3+1AT6AutsDSS0mEmjvs2EuJ96rqaVAiaTzsgQSg7fh7sLcSw6FX5gKH/k00ORWsYiR0Ga5JiKV/FWtzmiN116Kotr4xDZYMDxDd7tdB7mqSJbz1/CjgPckx3XCdXP8vcgHUp7BmNMQKBgFRZbnts4P+z+hgA8sjxYB7F2TXS6mcJJrBvXE0fi2XWn61M7NR3KBBH7rJ1tZG5AyIDuZf0/3boAtilrc+2dkpivqmuhHupjwxCZRIT0AqhndoAFuUTaLxkRHRrrzufvf04MjMKljQxbCnStCKf686G5Sii1DZ9dOuoc95vcjtN";
private final static String SERVICE_PUBLIC_KEY_NAME = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXrOQ8d9wUvSDLqeS+QbrL6FMg5qKeB9PDnUkvXG71xUUSxTW4uIDggzm3v9OXTYRt3yZEvr2WNJuvLy6xtBn/sMbP9vVnp1Q6KcXCH8pWnHjziS/Wv2cwjYWMVEOj0vICtiwei7G9oulgzBRnO8k8kIeqxrDLwHC9w2/Zh6R39f49xqIo2iHIiVSGObNEqS9NkGbKVPR1WlVzB2VKGc4tsciWYagi98OZwMuvz29Ums0yiG06HlUSAhAWEb+qKeoT4e3/DtXRbu8fXEF4EzjR0X4O6sS3PdwKpKkIlih99IdbnJ0jL8ALqhgV6NXEe/az4+I5WHM7lzviLVWfxIIQIDAQAB";
/**
* 生成公、私钥
* 根据需要返回String或byte[]类型
* @return
*/
public static ArrayList<String> createRSAKeys(){
ArrayList<String> array = new ArrayList<>();
try {
KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
keyPairGenerator.initialize(KEY_SIZE, new SecureRandom());
KeyPair keyPair = keyPairGenerator.generateKeyPair();
PublicKey publicKey = keyPair.getPublic();
PrivateKey privateKey = keyPair.getPrivate();
//获取公、私钥值
String publicKeyValue = Base64.encodeBase64String(publicKey.getEncoded());
String privateKeyValue = Base64.encodeBase64String(privateKey.getEncoded());
//存入
array.add(publicKeyValue);
array.add(privateKeyValue);
//Log.e(" >>> ",publicKeyValue);
//Log.e(" >>> ",privateKeyValue);
} catch (Exception e) {
e.printStackTrace();
}
return array;
}
//获取本地RSA公钥
public static PublicKey getPublicKey() {
try {
return getPublicKey(PUBLIC_KEY_NAME);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//获取本地RSA公钥
public static String getPublicKeyString() {
try {
return PUBLIC_KEY_NAME;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//获取服务器RSA公钥
public static PublicKey getServicePublicKey() {
try {
return getPublicKey(SERVICE_PUBLIC_KEY_NAME);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//获取RSA公钥 根据钥匙字段
public static PublicKey getPublicKey(String key) {
try {
byte[] byteKey = Base64.decodeBase64(key);
X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(byteKey);
KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
return keyFactory.generatePublic(x509EncodedKeySpec);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//获取RSA私钥 根据钥匙字段
private static PrivateKey getPrivateKey(String key) {
try {
byte[] byteKey = Base64.decodeBase64(key);
PKCS8EncodedKeySpec pkcs8EncodedKeySpec = new PKCS8EncodedKeySpec(byteKey);
KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
return keyFactory.generatePrivate(pkcs8EncodedKeySpec);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//本地RSA私钥 签名
public static String sign(String requestData){
String signature = null;
byte[] signed = null;
try {
// Log.e("=0== 签名前 >>>",requestData);
PrivateKey privateKey = getPrivateKey(PRIVATE_KEY_NAME);
Signature Sign = Signature.getInstance(SIGNATURE_ALGORITHM);
Sign.initSign(privateKey);
Sign.update(requestData.getBytes());
signed = Sign.sign();
signature = Base64.encodeBase64String(signed);
} catch (Exception e) {
e.printStackTrace();
}
return signature;
}
//公钥验证签名 base64签名 signature 签名内容requestData
public static boolean verifySign(String requestData, String signature){
boolean verifySignSuccess = false;
try {
PublicKey publicKey = getServicePublicKey();
Signature verifySign = Signature.getInstance(SIGNATURE_ALGORITHM);
verifySign.initVerify(publicKey);
verifySign.update(requestData.getBytes());
verifySignSuccess = verifySign.verify(Base64.decodeBase64(signature));
System.out.println(" >>> "+verifySignSuccess);
} catch (Exception e) {
e.printStackTrace();
}
return verifySignSuccess;
}
public static String encrypt(String clearText) {
String encryptedBase64 = "";
try {
Key key = getServicePublicKey();
final Cipher cipher = Cipher.getInstance(RSA_TYPE);
cipher.init(Cipher.ENCRYPT_MODE, key);
//
byte[] encryptedBytes = cipher.doFinal(clearText.getBytes("UTF-8"));
encryptedBase64 = Base64.encodeBase64String(encryptedBytes);
} catch (Exception e) {
e.printStackTrace();
}
return encryptedBase64;
}
public static String decrypt(String encryptedBase64) {
String decryptedString = "";
try {
Key key = getPrivateKey(PRIVATE_KEY_NAME);
final Cipher cipher = Cipher.getInstance(RSA_TYPE);
cipher.init(Cipher.DECRYPT_MODE, key);
byte[] encryptedBytes = Base64.decodeBase64(encryptedBase64);
byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
decryptedString = new String(decryptedBytes);
} catch (Exception e) {
e.printStackTrace();
}
return decryptedString;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java
View file @ 454eb4ff
......@@ -276,7 +276,7 @@ public class CertificateApi extends BaseJsonBodyController {
String busiDesc = "API接口保存打印记录";
int code=1;
try {
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark());
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark(),printLogPdu.getFaceUrl(),printLogPdu.getSignUrl());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintListPdu.java
View file @ 454eb4ff
......@@ -14,5 +14,7 @@ public class PrintListPdu {
private String pickerName;
private Long siteId;
/** 打印对立ID */
private Long printQueueId;
}
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintLogPdu.java
View file @ 454eb4ff
......@@ -10,4 +10,12 @@ public class PrintLogPdu {
private Integer printStatus;
/** 结果描述 */
private String statusRemark;
/**
* 取件人人脸信息
*/
private String faceUrl;
/**
* 取件人签名信息
*/
private String signUrl;
}
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogTemplateServiceImpl.java
View file @ 454eb4ff
......@@ -110,6 +110,10 @@ public class CertificateCatalogTemplateServiceImpl extends AbstractCRUDServiceIm
cons.setVal(val);
cons.setEl(item.variable());
cons.setUploadFileUrl(uploadUrl);
if(keys.size()>3){
String value = keys.get(3);
cons.setDefaultValue(value);
}
if (type.equalsIgnoreCase(ComponentEnum.DYNAMIC_TABLE.getValue())) {
HashSet<String> dhs = new HashSet<>(); //去除重复标签
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java
View file @ 454eb4ff
......@@ -24,6 +24,8 @@ 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.certificate.service.DeviceClassifyService;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
import com.mortals.xhx.module.pay.service.PayRequstService;
import com.mortals.xhx.module.record.model.ApplyLogEntity;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import com.mortals.xhx.module.record.model.PrintWaitQueueQuery;
......@@ -33,6 +35,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -52,6 +56,8 @@ public class CertificatePrintController extends BaseJsonBodyController {
private PrintWaitQueueService printWaitQueueService;
@Autowired
private DeviceClassifyService deviceClassifyService;
@Autowired
private PayRequstService payRequstService;
@PostMapping({"setting/info"})
public Rest<Object> list(@RequestBody PrintSettingPdu settingPdu) {
......@@ -128,7 +134,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
String busiDesc = "保存打印记录";
int code=1;
try {
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark());
printWaitQueueService.doPrint(printLogPdu.getWaitQueueId(),printLogPdu.getPrintStatus(),printLogPdu.getStatusRemark(),printLogPdu.getFaceUrl(),printLogPdu.getSignUrl());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
......@@ -222,4 +228,84 @@ public class CertificatePrintController extends BaseJsonBodyController {
return ret;
}
/**
* 生成支付二维码
*/
@PostMapping({"qrcode/generate"})
@UnAuth
public Rest<Object> QrcodeGenerate(@RequestBody PrintListPdu pdu) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "生成支付二维码";
int code=1;
try {
PrintWaitQueueEntity printWaitQueueEntity = printWaitQueueService.get(pdu.getPrintQueueId());
if(printWaitQueueEntity.getCharge()==1){
PayRequstEntity payRequstEntity = payRequstService.generatePayQrcode(printWaitQueueEntity,this.getRequestIP(this.request));
if(payRequstEntity!=null) {
Map<String,Object> data = new HashMap<>();
data.put("qrcode",payRequstEntity.getQrcodeUrl());
data.put("orderNo",payRequstEntity.getOrderNum());
BigDecimal aB = new BigDecimal(payRequstEntity.getAmount());
data.put("amountDouble",aB.divide(new BigDecimal(100),2, RoundingMode.HALF_UP).doubleValue());
model.put("data", data);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
}else {
code=-1;
model.put("message_info", "支付二维码生成失败");
}
}else {
code=-1;
model.put("message_info", "无需支付");
}
} 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({"qrcode/payStatus"})
@UnAuth
public Rest<Object> paystatus(@RequestBody PrintListPdu pdu) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "查询支付状态";
int code=1;
try {
PrintWaitQueueEntity printWaitQueueEntity = printWaitQueueService.get(pdu.getPrintQueueId());
if(printWaitQueueEntity.getCharge()==1){
String payStatus = payRequstService.qrcodePaystatus(printWaitQueueEntity);
if(StringUtils.isNotEmpty(payStatus)) {
model.put("data", payStatus);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
}else {
code=-1;
model.put("message_info", "支付状态查询失败");
}
}else {
code=-1;
model.put("message_info", "无需支付");
}
} 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;
}
}
certificate-manager/src/main/java/com/mortals/xhx/module/pay/dao/PayRequstDao.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
import java.util.List;
/**
* 支付请求Dao
* 支付请求 DAO接口
*
* @author zxfei
* @date 2024-12-12
*/
public interface PayRequstDao extends ICRUDDao<PayRequstEntity,Long>{
}
certificate-manager/src/main/java/com/mortals/xhx/module/pay/dao/ibatis/PayRequstDaoImpl.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.pay.dao.PayRequstDao;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 支付请求DaoImpl DAO接口
*
* @author zxfei
* @date 2024-12-12
*/
@Repository("payRequstDao")
public class PayRequstDaoImpl extends BaseCRUDDaoMybatis<PayRequstEntity,Long> implements PayRequstDao {
}
certificate-manager/src/main/java/com/mortals/xhx/module/pay/model/PayRequstEntity.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.pay.model.vo.PayRequstVo;
import lombok.Data;
/**
* 支付请求实体对象
*
* @author zxfei
* @date 2024-12-12
*/
@Data
public class PayRequstEntity extends PayRequstVo {
private static final long serialVersionUID = 1L;
/**
* 申请ID
*/
private Long applyId;
/**
* 打印队列ID
*/
private Long printQueueId;
/**
* 支付订单编号
*/
private String orderNum;
/**
* 订单金额(单位:分)
*/
private Integer amount;
/**
* 订单日期
*/
private Date orderDate;
/**
* 支付二维码
*/
private String qrcodeUrl;
/**
* 二维码有效时间单位秒
*/
private Integer payExpire;
/**
* 支付状态
*/
private Integer payStatus;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof PayRequstEntity) {
PayRequstEntity tmp = (PayRequstEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.applyId = null;
this.printQueueId = null;
this.orderNum = "";
this.amount = 0;
this.orderDate = null;
this.qrcodeUrl = "";
this.payExpire = 0;
this.payStatus = 0;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/pay/model/PayRequstQuery.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
/**
* 支付请求查询对象
*
* @author zxfei
* @date 2024-12-12
*/
public class PayRequstQuery extends PayRequstEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 申请ID */
private Long applyIdStart;
/** 结束 申请ID */
private Long applyIdEnd;
/** 增加 申请ID */
private Long applyIdIncrement;
/** 申请ID列表 */
private List <Long> applyIdList;
/** 申请ID排除列表 */
private List <Long> applyIdNotList;
/** 开始 打印队列ID */
private Long printQueueIdStart;
/** 结束 打印队列ID */
private Long printQueueIdEnd;
/** 增加 打印队列ID */
private Long printQueueIdIncrement;
/** 打印队列ID列表 */
private List <Long> printQueueIdList;
/** 打印队列ID排除列表 */
private List <Long> printQueueIdNotList;
/** 支付订单编号 */
private List<String> orderNumList;
/** 支付订单编号排除列表 */
private List <String> orderNumNotList;
/** 开始 订单金额(单位:分) */
private Integer amountStart;
/** 结束 订单金额(单位:分) */
private Integer amountEnd;
/** 增加 订单金额(单位:分) */
private Integer amountIncrement;
/** 订单金额(单位:分)列表 */
private List <Integer> amountList;
/** 订单金额(单位:分)排除列表 */
private List <Integer> amountNotList;
/** 开始 订单日期 */
private String orderDateStart;
/** 结束 订单日期 */
private String orderDateEnd;
/** 支付二维码 */
private List<String> qrcodeUrlList;
/** 支付二维码排除列表 */
private List <String> qrcodeUrlNotList;
/** 开始 二维码有效时间单位秒 */
private Integer payExpireStart;
/** 结束 二维码有效时间单位秒 */
private Integer payExpireEnd;
/** 增加 二维码有效时间单位秒 */
private Integer payExpireIncrement;
/** 二维码有效时间单位秒列表 */
private List <Integer> payExpireList;
/** 二维码有效时间单位秒排除列表 */
private List <Integer> payExpireNotList;
/** 开始 支付状态 */
private Integer payStatusStart;
/** 结束 支付状态 */
private Integer payStatusEnd;
/** 增加 支付状态 */
private Integer payStatusIncrement;
/** 支付状态列表 */
private List <Integer> payStatusList;
/** 支付状态排除列表 */
private List <Integer> payStatusNotList;
/** 开始 创建用户 */
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<PayRequstQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<PayRequstQuery> andConditionList;
public PayRequstQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @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 applyIdStart
*/
public Long getApplyIdStart(){
return this.applyIdStart;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public void setApplyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
}
/**
* 获取 结束 申请ID
* @return $applyIdEnd
*/
public Long getApplyIdEnd(){
return this.applyIdEnd;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public void setApplyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
}
/**
* 获取 增加 申请ID
* @return applyIdIncrement
*/
public Long getApplyIdIncrement(){
return this.applyIdIncrement;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public void setApplyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
}
/**
* 获取 申请ID
* @return applyIdList
*/
public List<Long> getApplyIdList(){
return this.applyIdList;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public void setApplyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
}
/**
* 获取 申请ID
* @return applyIdNotList
*/
public List<Long> getApplyIdNotList(){
return this.applyIdNotList;
}
/**
* 设置 申请ID
* @param applyIdNotList
*/
public void setApplyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
}
/**
* 获取 开始 打印队列ID
* @return printQueueIdStart
*/
public Long getPrintQueueIdStart(){
return this.printQueueIdStart;
}
/**
* 设置 开始 打印队列ID
* @param printQueueIdStart
*/
public void setPrintQueueIdStart(Long printQueueIdStart){
this.printQueueIdStart = printQueueIdStart;
}
/**
* 获取 结束 打印队列ID
* @return $printQueueIdEnd
*/
public Long getPrintQueueIdEnd(){
return this.printQueueIdEnd;
}
/**
* 设置 结束 打印队列ID
* @param printQueueIdEnd
*/
public void setPrintQueueIdEnd(Long printQueueIdEnd){
this.printQueueIdEnd = printQueueIdEnd;
}
/**
* 获取 增加 打印队列ID
* @return printQueueIdIncrement
*/
public Long getPrintQueueIdIncrement(){
return this.printQueueIdIncrement;
}
/**
* 设置 增加 打印队列ID
* @param printQueueIdIncrement
*/
public void setPrintQueueIdIncrement(Long printQueueIdIncrement){
this.printQueueIdIncrement = printQueueIdIncrement;
}
/**
* 获取 打印队列ID
* @return printQueueIdList
*/
public List<Long> getPrintQueueIdList(){
return this.printQueueIdList;
}
/**
* 设置 打印队列ID
* @param printQueueIdList
*/
public void setPrintQueueIdList(List<Long> printQueueIdList){
this.printQueueIdList = printQueueIdList;
}
/**
* 获取 打印队列ID
* @return printQueueIdNotList
*/
public List<Long> getPrintQueueIdNotList(){
return this.printQueueIdNotList;
}
/**
* 设置 打印队列ID
* @param printQueueIdNotList
*/
public void setPrintQueueIdNotList(List<Long> printQueueIdNotList){
this.printQueueIdNotList = printQueueIdNotList;
}
/**
* 获取 支付订单编号
* @return orderNumList
*/
public List<String> getOrderNumList(){
return this.orderNumList;
}
/**
* 设置 支付订单编号
* @param orderNumList
*/
public void setOrderNumList(List<String> orderNumList){
this.orderNumList = orderNumList;
}
/**
* 获取 支付订单编号
* @return orderNumNotList
*/
public List<String> getOrderNumNotList(){
return this.orderNumNotList;
}
/**
* 设置 支付订单编号
* @param orderNumNotList
*/
public void setOrderNumNotList(List<String> orderNumNotList){
this.orderNumNotList = orderNumNotList;
}
/**
* 获取 开始 订单金额(单位:分)
* @return amountStart
*/
public Integer getAmountStart(){
return this.amountStart;
}
/**
* 设置 开始 订单金额(单位:分)
* @param amountStart
*/
public void setAmountStart(Integer amountStart){
this.amountStart = amountStart;
}
/**
* 获取 结束 订单金额(单位:分)
* @return $amountEnd
*/
public Integer getAmountEnd(){
return this.amountEnd;
}
/**
* 设置 结束 订单金额(单位:分)
* @param amountEnd
*/
public void setAmountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
}
/**
* 获取 增加 订单金额(单位:分)
* @return amountIncrement
*/
public Integer getAmountIncrement(){
return this.amountIncrement;
}
/**
* 设置 增加 订单金额(单位:分)
* @param amountIncrement
*/
public void setAmountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
}
/**
* 获取 订单金额(单位:分)
* @return amountList
*/
public List<Integer> getAmountList(){
return this.amountList;
}
/**
* 设置 订单金额(单位:分)
* @param amountList
*/
public void setAmountList(List<Integer> amountList){
this.amountList = amountList;
}
/**
* 获取 订单金额(单位:分)
* @return amountNotList
*/
public List<Integer> getAmountNotList(){
return this.amountNotList;
}
/**
* 设置 订单金额(单位:分)
* @param amountNotList
*/
public void setAmountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
}
/**
* 获取 开始 订单日期
* @return orderDateStart
*/
public String getOrderDateStart(){
return this.orderDateStart;
}
/**
* 设置 开始 订单日期
* @param orderDateStart
*/
public void setOrderDateStart(String orderDateStart){
this.orderDateStart = orderDateStart;
}
/**
* 获取 结束 订单日期
* @return orderDateEnd
*/
public String getOrderDateEnd(){
return this.orderDateEnd;
}
/**
* 设置 结束 订单日期
* @param orderDateEnd
*/
public void setOrderDateEnd(String orderDateEnd){
this.orderDateEnd = orderDateEnd;
}
/**
* 获取 支付二维码
* @return qrcodeUrlList
*/
public List<String> getQrcodeUrlList(){
return this.qrcodeUrlList;
}
/**
* 设置 支付二维码
* @param qrcodeUrlList
*/
public void setQrcodeUrlList(List<String> qrcodeUrlList){
this.qrcodeUrlList = qrcodeUrlList;
}
/**
* 获取 支付二维码
* @return qrcodeUrlNotList
*/
public List<String> getQrcodeUrlNotList(){
return this.qrcodeUrlNotList;
}
/**
* 设置 支付二维码
* @param qrcodeUrlNotList
*/
public void setQrcodeUrlNotList(List<String> qrcodeUrlNotList){
this.qrcodeUrlNotList = qrcodeUrlNotList;
}
/**
* 获取 开始 二维码有效时间单位秒
* @return payExpireStart
*/
public Integer getPayExpireStart(){
return this.payExpireStart;
}
/**
* 设置 开始 二维码有效时间单位秒
* @param payExpireStart
*/
public void setPayExpireStart(Integer payExpireStart){
this.payExpireStart = payExpireStart;
}
/**
* 获取 结束 二维码有效时间单位秒
* @return $payExpireEnd
*/
public Integer getPayExpireEnd(){
return this.payExpireEnd;
}
/**
* 设置 结束 二维码有效时间单位秒
* @param payExpireEnd
*/
public void setPayExpireEnd(Integer payExpireEnd){
this.payExpireEnd = payExpireEnd;
}
/**
* 获取 增加 二维码有效时间单位秒
* @return payExpireIncrement
*/
public Integer getPayExpireIncrement(){
return this.payExpireIncrement;
}
/**
* 设置 增加 二维码有效时间单位秒
* @param payExpireIncrement
*/
public void setPayExpireIncrement(Integer payExpireIncrement){
this.payExpireIncrement = payExpireIncrement;
}
/**
* 获取 二维码有效时间单位秒
* @return payExpireList
*/
public List<Integer> getPayExpireList(){
return this.payExpireList;
}
/**
* 设置 二维码有效时间单位秒
* @param payExpireList
*/
public void setPayExpireList(List<Integer> payExpireList){
this.payExpireList = payExpireList;
}
/**
* 获取 二维码有效时间单位秒
* @return payExpireNotList
*/
public List<Integer> getPayExpireNotList(){
return this.payExpireNotList;
}
/**
* 设置 二维码有效时间单位秒
* @param payExpireNotList
*/
public void setPayExpireNotList(List<Integer> payExpireNotList){
this.payExpireNotList = payExpireNotList;
}
/**
* 获取 开始 支付状态
* @return payStatusStart
*/
public Integer getPayStatusStart(){
return this.payStatusStart;
}
/**
* 设置 开始 支付状态
* @param payStatusStart
*/
public void setPayStatusStart(Integer payStatusStart){
this.payStatusStart = payStatusStart;
}
/**
* 获取 结束 支付状态
* @return $payStatusEnd
*/
public Integer getPayStatusEnd(){
return this.payStatusEnd;
}
/**
* 设置 结束 支付状态
* @param payStatusEnd
*/
public void setPayStatusEnd(Integer payStatusEnd){
this.payStatusEnd = payStatusEnd;
}
/**
* 获取 增加 支付状态
* @return payStatusIncrement
*/
public Integer getPayStatusIncrement(){
return this.payStatusIncrement;
}
/**
* 设置 增加 支付状态
* @param payStatusIncrement
*/
public void setPayStatusIncrement(Integer payStatusIncrement){
this.payStatusIncrement = payStatusIncrement;
}
/**
* 获取 支付状态
* @return payStatusList
*/
public List<Integer> getPayStatusList(){
return this.payStatusList;
}
/**
* 设置 支付状态
* @param payStatusList
*/
public void setPayStatusList(List<Integer> payStatusList){
this.payStatusList = payStatusList;
}
/**
* 获取 支付状态
* @return payStatusNotList
*/
public List<Integer> getPayStatusNotList(){
return this.payStatusNotList;
}
/**
* 设置 支付状态
* @param payStatusNotList
*/
public void setPayStatusNotList(List<Integer> payStatusNotList){
this.payStatusNotList = payStatusNotList;
}
/**
* 获取 开始 创建用户
* @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 PayRequstQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public PayRequstQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public PayRequstQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public PayRequstQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public PayRequstQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PayRequstQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 申请ID
* @param applyId
*/
public PayRequstQuery applyId(Long applyId){
setApplyId(applyId);
return this;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public PayRequstQuery applyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
return this;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public PayRequstQuery applyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
return this;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public PayRequstQuery applyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
return this;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public PayRequstQuery applyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
return this;
}
/**
* 设置 申请ID
* @param applyIdNotList
*/
public PayRequstQuery applyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueId
*/
public PayRequstQuery printQueueId(Long printQueueId){
setPrintQueueId(printQueueId);
return this;
}
/**
* 设置 开始 打印队列ID
* @param printQueueIdStart
*/
public PayRequstQuery printQueueIdStart(Long printQueueIdStart){
this.printQueueIdStart = printQueueIdStart;
return this;
}
/**
* 设置 结束 打印队列ID
* @param printQueueIdEnd
*/
public PayRequstQuery printQueueIdEnd(Long printQueueIdEnd){
this.printQueueIdEnd = printQueueIdEnd;
return this;
}
/**
* 设置 增加 打印队列ID
* @param printQueueIdIncrement
*/
public PayRequstQuery printQueueIdIncrement(Long printQueueIdIncrement){
this.printQueueIdIncrement = printQueueIdIncrement;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueIdList
*/
public PayRequstQuery printQueueIdList(List<Long> printQueueIdList){
this.printQueueIdList = printQueueIdList;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueIdNotList
*/
public PayRequstQuery printQueueIdNotList(List<Long> printQueueIdNotList){
this.printQueueIdNotList = printQueueIdNotList;
return this;
}
/**
* 设置 支付订单编号
* @param orderNum
*/
public PayRequstQuery orderNum(String orderNum){
setOrderNum(orderNum);
return this;
}
/**
* 设置 支付订单编号
* @param orderNumList
*/
public PayRequstQuery orderNumList(List<String> orderNumList){
this.orderNumList = orderNumList;
return this;
}
/**
* 设置 订单金额(单位:分)
* @param amount
*/
public PayRequstQuery amount(Integer amount){
setAmount(amount);
return this;
}
/**
* 设置 开始 订单金额(单位:分)
* @param amountStart
*/
public PayRequstQuery amountStart(Integer amountStart){
this.amountStart = amountStart;
return this;
}
/**
* 设置 结束 订单金额(单位:分)
* @param amountEnd
*/
public PayRequstQuery amountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
return this;
}
/**
* 设置 增加 订单金额(单位:分)
* @param amountIncrement
*/
public PayRequstQuery amountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
return this;
}
/**
* 设置 订单金额(单位:分)
* @param amountList
*/
public PayRequstQuery amountList(List<Integer> amountList){
this.amountList = amountList;
return this;
}
/**
* 设置 订单金额(单位:分)
* @param amountNotList
*/
public PayRequstQuery amountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
return this;
}
/**
* 设置 支付二维码
* @param qrcodeUrl
*/
public PayRequstQuery qrcodeUrl(String qrcodeUrl){
setQrcodeUrl(qrcodeUrl);
return this;
}
/**
* 设置 支付二维码
* @param qrcodeUrlList
*/
public PayRequstQuery qrcodeUrlList(List<String> qrcodeUrlList){
this.qrcodeUrlList = qrcodeUrlList;
return this;
}
/**
* 设置 二维码有效时间单位秒
* @param payExpire
*/
public PayRequstQuery payExpire(Integer payExpire){
setPayExpire(payExpire);
return this;
}
/**
* 设置 开始 二维码有效时间单位秒
* @param payExpireStart
*/
public PayRequstQuery payExpireStart(Integer payExpireStart){
this.payExpireStart = payExpireStart;
return this;
}
/**
* 设置 结束 二维码有效时间单位秒
* @param payExpireEnd
*/
public PayRequstQuery payExpireEnd(Integer payExpireEnd){
this.payExpireEnd = payExpireEnd;
return this;
}
/**
* 设置 增加 二维码有效时间单位秒
* @param payExpireIncrement
*/
public PayRequstQuery payExpireIncrement(Integer payExpireIncrement){
this.payExpireIncrement = payExpireIncrement;
return this;
}
/**
* 设置 二维码有效时间单位秒
* @param payExpireList
*/
public PayRequstQuery payExpireList(List<Integer> payExpireList){
this.payExpireList = payExpireList;
return this;
}
/**
* 设置 二维码有效时间单位秒
* @param payExpireNotList
*/
public PayRequstQuery payExpireNotList(List<Integer> payExpireNotList){
this.payExpireNotList = payExpireNotList;
return this;
}
/**
* 设置 支付状态
* @param payStatus
*/
public PayRequstQuery payStatus(Integer payStatus){
setPayStatus(payStatus);
return this;
}
/**
* 设置 开始 支付状态
* @param payStatusStart
*/
public PayRequstQuery payStatusStart(Integer payStatusStart){
this.payStatusStart = payStatusStart;
return this;
}
/**
* 设置 结束 支付状态
* @param payStatusEnd
*/
public PayRequstQuery payStatusEnd(Integer payStatusEnd){
this.payStatusEnd = payStatusEnd;
return this;
}
/**
* 设置 增加 支付状态
* @param payStatusIncrement
*/
public PayRequstQuery payStatusIncrement(Integer payStatusIncrement){
this.payStatusIncrement = payStatusIncrement;
return this;
}
/**
* 设置 支付状态
* @param payStatusList
*/
public PayRequstQuery payStatusList(List<Integer> payStatusList){
this.payStatusList = payStatusList;
return this;
}
/**
* 设置 支付状态
* @param payStatusNotList
*/
public PayRequstQuery payStatusNotList(List<Integer> payStatusNotList){
this.payStatusNotList = payStatusNotList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public PayRequstQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public PayRequstQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public PayRequstQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public PayRequstQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public PayRequstQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public PayRequstQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public PayRequstQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public PayRequstQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public PayRequstQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public PayRequstQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public PayRequstQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public PayRequstQuery 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<PayRequstQuery> 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<PayRequstQuery> 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<PayRequstQuery> 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<PayRequstQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/pay/model/vo/PayRequstVo.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
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 2024-12-12
*/
@Data
public class PayRequstVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */
private List <Long> idList;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/pay/service/PayRequstService.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
import com.mortals.xhx.module.pay.dao.PayRequstDao;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/**
* PayRequstService
*
* 支付请求 service接口
*
* @author zxfei
* @date 2024-12-12
*/
public interface PayRequstService extends ICRUDService<PayRequstEntity,Long>{
PayRequstDao getDao();
/**
* 生成支付二维码
* @param printWaitQueueEntity
* @return
*/
PayRequstEntity generatePayQrcode(PrintWaitQueueEntity printWaitQueueEntity,String ip);
/**
* 支付状态查询
* @param printWaitQueueEntity
* @return
*/
String qrcodePaystatus(PrintWaitQueueEntity printWaitQueueEntity);
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/pay/service/impl/PayRequstServiceImpl.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.service.impl;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.SecureUtil;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.common.utils.QrCodeUtil;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.pay.model.PayRequstQuery;
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 com.mortals.xhx.pay.ICBCPayUtil;
import org.springframework.beans.BeanUtils;
import java.io.File;
import java.util.Date;
import java.util.function.Function;
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.pay.dao.PayRequstDao;
import com.mortals.xhx.module.pay.model.PayRequstEntity;
import com.mortals.xhx.module.pay.service.PayRequstService;
import lombok.extern.slf4j.Slf4j;
/**
* PayRequstService
* 支付请求 service实现
*
* @author zxfei
* @date 2024-12-12
*/
@Service("payRequstService")
@Slf4j
public class PayRequstServiceImpl extends AbstractCRUDServiceImpl<PayRequstDao, PayRequstEntity, Long> implements PayRequstService {
@Autowired
private PrintWaitQueueService printWaitQueueService;
@Value("${upload.path}")
private String filePath;
@Override
public PayRequstEntity generatePayQrcode(PrintWaitQueueEntity printWaitQueueEntity,String ip) {
PayRequstEntity temp = this.selectOne(new PayRequstQuery().printQueueId(printWaitQueueEntity.getId()).orderNum(printWaitQueueEntity.getOrderNum()));
if(temp!=null){
Long payExpire = System.currentTimeMillis() - temp.getOrderDate().getTime();
if(payExpire < temp.getPayExpire()*1000L && temp.getPayStatus()==0){
return temp;
}
}
Date orderDate = new Date();
String orderNo = DateUtils.getDateTime(new Date(), "yyyyMMddHHmmss") + RandomUtil.randomString("0123456789", 4);
String qrcode = ICBCPayUtil.QrcodeGenerate(orderNo, printWaitQueueEntity.getAmount(), orderDate, ip);
if (qrcode != null) {
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String filePath = rootPath + "file/qrcode/pay/";
String qrcodeName = orderNo + ".png";
File pathDir = new File(filePath);
if (!pathDir.exists()) {
pathDir.mkdirs();
}
String imagepath = filePath + qrcodeName;
QrCodeUtil.generateQrCodeFile(qrcode, imagepath);
PayRequstEntity payRequstEntity = new PayRequstEntity();
payRequstEntity.initAttrValue();
payRequstEntity.setAmount(printWaitQueueEntity.getAmount());
payRequstEntity.setApplyId(printWaitQueueEntity.getApplyId());
payRequstEntity.setOrderDate(orderDate);
payRequstEntity.setPayExpire(120);
payRequstEntity.setPrintQueueId(printWaitQueueEntity.getId());
payRequstEntity.setOrderNum(orderNo);
payRequstEntity.setQrcodeUrl("/file/qrcode/pay/" + qrcodeName);
payRequstEntity.setCreateTime(orderDate);
payRequstEntity.setCreateUserId(1L);
this.dao.insert(payRequstEntity);
PrintWaitQueueEntity updateP = new PrintWaitQueueEntity();
updateP.setId(printWaitQueueEntity.getId());
updateP.setOrderNum(orderNo);
printWaitQueueService.update(updateP);
return payRequstEntity;
}
return null;
}
@Override
public String qrcodePaystatus(PrintWaitQueueEntity printWaitQueueEntity) {
PayRequstEntity payRequstEntity = this.selectOne(new PayRequstQuery().printQueueId(printWaitQueueEntity.getId()).orderNum(printWaitQueueEntity.getOrderNum()));
if(payRequstEntity!=null){
String payStatus = ICBCPayUtil.qrcodePaystatus(payRequstEntity.getOrderNum(),payRequstEntity.getOrderDate());
//交易结果标志：0：支付中请稍后查询，1：支付成功，2：支付失败，3：已撤销，4：撤销中请稍后查询，5：已全额退款，6：已部分退款，7：退款中请稍后查询
if(StringUtils.isNotEmpty(payStatus)){
payRequstEntity.setPayStatus(Integer.valueOf(payStatus));
payRequstEntity.setUpdateTime(new Date());
this.dao.update(payRequstEntity);
printWaitQueueEntity.setPaystatus(Integer.valueOf(payStatus));
printWaitQueueService.update(printWaitQueueEntity);
}
return payStatus;
}
return null;
}
public static void main(String[] args) {
String orderNo = DateUtils.getDateTime(new Date(),"yyyyMMddHHmmss") + "_"+RandomUtil.randomString("0123456789",4);
System.out.println(orderNo);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/pay/web/PayRequstController.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.module.pay.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.pay.model.PayRequstEntity;
import com.mortals.xhx.module.pay.service.PayRequstService;
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.*;
import com.mortals.xhx.common.code.*;
/**
*
* 支付请求
*
* @author zxfei
* @date 2024-12-12
*/
@RestController
@RequestMapping("pay/requst")
public class PayRequstController extends BaseCRUDJsonBodyMappingController<PayRequstService,PayRequstEntity,Long> {
@Autowired
private ParamService paramService;
public PayRequstController(){
super.setModuleDesc( "支付请求");
}
@Override
protected void init(Map<String, Object> model, Context context) {
//this.addDict(model, "payStatus", PayStatusEnum.getEnumMap());
super.init(model, context);
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 454eb4ff
package com.mortals.xhx.module.record.model;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -11,7 +15,7 @@ import lombok.Data;
* 证照申请实体对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-12
*/
@Data
public class ApplyLogEntity extends ApplyLogVo {
......@@ -129,6 +133,25 @@ public class ApplyLogEntity extends ApplyLogVo {
* 手机号码
*/
private String mobile;
/**
* 是否需要收费
*/
private Integer charge;
/**
* 收费金额(单位:分)
*/
private Integer amount;
// public Integer getAmount() {
// return amount;
// }
//
// public void setAmount(Integer amount) {
// this.amount = amount;
// BigDecimal aB = new BigDecimal(amount);
// this.setAmountDouble(aB.divide(new BigDecimal(100),2, RoundingMode.HALF_UP).doubleValue());
// }
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -146,61 +169,36 @@ public class ApplyLogEntity extends ApplyLogVo {
}
public void initAttrValue(){
this.recordId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.certificateCode = "";
this.certificateName = "";
this.issueTime = null;
this.pickerName = "";
this.pickerIDCardNo = "";
this.holderType = 1;
this.holderIdType = 1;
this.holderName = "";
this.holderIDCardNo = "";
this.enterpriseName = "";
this.validityStart = null;
this.validityEnd = null;
this.privateID = "";
this.certificateUrl = "";
this.previewUrl = "";
this.formContent = "";
this.formTemplate = "";
this.generateStatus = 1;
this.operType = 1;
this.recordStatus = 0;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
this.charge = 0;
this.amount = 0;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 454eb4ff
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.ApplyLogEntity;
* 证照申请查询对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-12
*/
public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */
......@@ -300,6 +300,36 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 开始 是否需要收费 */
private Integer chargeStart;
/** 结束 是否需要收费 */
private Integer chargeEnd;
/** 增加 是否需要收费 */
private Integer chargeIncrement;
/** 是否需要收费列表 */
private List <Integer> chargeList;
/** 是否需要收费排除列表 */
private List <Integer> chargeNotList;
/** 开始 收费金额(单位:分) */
private Integer amountStart;
/** 结束 收费金额(单位:分) */
private Integer amountEnd;
/** 增加 收费金额(单位:分) */
private Integer amountIncrement;
/** 收费金额(单位:分)列表 */
private List <Integer> amountList;
/** 收费金额(单位:分)排除列表 */
private List <Integer> amountNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ApplyLogQuery> orConditionList;
......@@ -1952,6 +1982,168 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.mobileNotList = mobileNotList;
}
/**
* 获取 开始 是否需要收费
* @return chargeStart
*/
public Integer getChargeStart(){
return this.chargeStart;
}
/**
* 设置 开始 是否需要收费
* @param chargeStart
*/
public void setChargeStart(Integer chargeStart){
this.chargeStart = chargeStart;
}
/**
* 获取 结束 是否需要收费
* @return $chargeEnd
*/
public Integer getChargeEnd(){
return this.chargeEnd;
}
/**
* 设置 结束 是否需要收费
* @param chargeEnd
*/
public void setChargeEnd(Integer chargeEnd){
this.chargeEnd = chargeEnd;
}
/**
* 获取 增加 是否需要收费
* @return chargeIncrement
*/
public Integer getChargeIncrement(){
return this.chargeIncrement;
}
/**
* 设置 增加 是否需要收费
* @param chargeIncrement
*/
public void setChargeIncrement(Integer chargeIncrement){
this.chargeIncrement = chargeIncrement;
}
/**
* 获取 是否需要收费
* @return chargeList
*/
public List<Integer> getChargeList(){
return this.chargeList;
}
/**
* 设置 是否需要收费
* @param chargeList
*/
public void setChargeList(List<Integer> chargeList){
this.chargeList = chargeList;
}
/**
* 获取 是否需要收费
* @return chargeNotList
*/
public List<Integer> getChargeNotList(){
return this.chargeNotList;
}
/**
* 设置 是否需要收费
* @param chargeNotList
*/
public void setChargeNotList(List<Integer> chargeNotList){
this.chargeNotList = chargeNotList;
}
/**
* 获取 开始 收费金额(单位:分)
* @return amountStart
*/
public Integer getAmountStart(){
return this.amountStart;
}
/**
* 设置 开始 收费金额(单位:分)
* @param amountStart
*/
public void setAmountStart(Integer amountStart){
this.amountStart = amountStart;
}
/**
* 获取 结束 收费金额(单位:分)
* @return $amountEnd
*/
public Integer getAmountEnd(){
return this.amountEnd;
}
/**
* 设置 结束 收费金额(单位:分)
* @param amountEnd
*/
public void setAmountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
}
/**
* 获取 增加 收费金额(单位:分)
* @return amountIncrement
*/
public Integer getAmountIncrement(){
return this.amountIncrement;
}
/**
* 设置 增加 收费金额(单位:分)
* @param amountIncrement
*/
public void setAmountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
}
/**
* 获取 收费金额(单位:分)
* @return amountList
*/
public List<Integer> getAmountList(){
return this.amountList;
}
/**
* 设置 收费金额(单位:分)
* @param amountList
*/
public void setAmountList(List<Integer> amountList){
this.amountList = amountList;
}
/**
* 获取 收费金额(单位:分)
* @return amountNotList
*/
public List<Integer> getAmountNotList(){
return this.amountNotList;
}
/**
* 设置 收费金额(单位:分)
* @param amountNotList
*/
public void setAmountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2909,6 +3101,114 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this;
}
/**
* 设置 是否需要收费
* @param charge
*/
public ApplyLogQuery charge(Integer charge){
setCharge(charge);
return this;
}
/**
* 设置 开始 是否需要收费
* @param chargeStart
*/
public ApplyLogQuery chargeStart(Integer chargeStart){
this.chargeStart = chargeStart;
return this;
}
/**
* 设置 结束 是否需要收费
* @param chargeEnd
*/
public ApplyLogQuery chargeEnd(Integer chargeEnd){
this.chargeEnd = chargeEnd;
return this;
}
/**
* 设置 增加 是否需要收费
* @param chargeIncrement
*/
public ApplyLogQuery chargeIncrement(Integer chargeIncrement){
this.chargeIncrement = chargeIncrement;
return this;
}
/**
* 设置 是否需要收费
* @param chargeList
*/
public ApplyLogQuery chargeList(List<Integer> chargeList){
this.chargeList = chargeList;
return this;
}
/**
* 设置 是否需要收费
* @param chargeNotList
*/
public ApplyLogQuery chargeNotList(List<Integer> chargeNotList){
this.chargeNotList = chargeNotList;
return this;
}
/**
* 设置 收费金额(单位:分)
* @param amount
*/
public ApplyLogQuery amount(Integer amount){
setAmount(amount);
return this;
}
/**
* 设置 开始 收费金额(单位:分)
* @param amountStart
*/
public ApplyLogQuery amountStart(Integer amountStart){
this.amountStart = amountStart;
return this;
}
/**
* 设置 结束 收费金额(单位:分)
* @param amountEnd
*/
public ApplyLogQuery amountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
return this;
}
/**
* 设置 增加 收费金额(单位:分)
* @param amountIncrement
*/
public ApplyLogQuery amountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
return this;
}
/**
* 设置 收费金额(单位:分)
* @param amountList
*/
public ApplyLogQuery amountList(List<Integer> amountList){
this.amountList = amountList;
return this;
}
/**
* 设置 收费金额(单位:分)
* @param amountNotList
*/
public ApplyLogQuery amountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
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 @ 454eb4ff
......@@ -2,6 +2,9 @@ package com.mortals.xhx.module.record.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -11,7 +14,7 @@ import lombok.Data;
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-12
*/
@Data
public class PrintLogEntity extends PrintLogVo {
......@@ -89,6 +92,18 @@ public class PrintLogEntity extends PrintLogVo {
* 手机号码
*/
private String mobile;
/**
* 取件人人脸信息
*/
private String faceUrl;
/**
* 取件人签名信息
*/
private String signUrl;
/**
* 打印队列ID
*/
private Long printQueueId;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -106,41 +121,26 @@ public class PrintLogEntity extends PrintLogVo {
}
public void initAttrValue(){
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.certificateName = "";
this.certificateCode = "";
this.enterpriseName = "";
this.holderName = "";
this.holderIDCardNo = "";
this.pickerName = "";
this.pickerIDCardNo = "";
this.printStatus = 1;
this.printDate = null;
this.statusRemark = "";
this.deviceId = -1L;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
this.faceUrl = "";
this.signUrl = "";
this.printQueueId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 454eb4ff
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.PrintLogEntity;
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-12
*/
public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */
......@@ -208,6 +208,31 @@ public class PrintLogQuery extends PrintLogEntity {
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 取件人人脸信息 */
private List<String> faceUrlList;
/** 取件人人脸信息排除列表 */
private List <String> faceUrlNotList;
/** 取件人签名信息 */
private List<String> signUrlList;
/** 取件人签名信息排除列表 */
private List <String> signUrlNotList;
/** 开始 打印队列ID */
private Long printQueueIdStart;
/** 结束 打印队列ID */
private Long printQueueIdEnd;
/** 增加 打印队列ID */
private Long printQueueIdIncrement;
/** 打印队列ID列表 */
private List <Long> printQueueIdList;
/** 打印队列ID排除列表 */
private List <Long> printQueueIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintLogQuery> orConditionList;
......@@ -1344,6 +1369,151 @@ public class PrintLogQuery extends PrintLogEntity {
this.mobileNotList = mobileNotList;
}
/**
* 获取 取件人人脸信息
* @return faceUrlList
*/
public List<String> getFaceUrlList(){
return this.faceUrlList;
}
/**
* 设置 取件人人脸信息
* @param faceUrlList
*/
public void setFaceUrlList(List<String> faceUrlList){
this.faceUrlList = faceUrlList;
}
/**
* 获取 取件人人脸信息
* @return faceUrlNotList
*/
public List<String> getFaceUrlNotList(){
return this.faceUrlNotList;
}
/**
* 设置 取件人人脸信息
* @param faceUrlNotList
*/
public void setFaceUrlNotList(List<String> faceUrlNotList){
this.faceUrlNotList = faceUrlNotList;
}
/**
* 获取 取件人签名信息
* @return signUrlList
*/
public List<String> getSignUrlList(){
return this.signUrlList;
}
/**
* 设置 取件人签名信息
* @param signUrlList
*/
public void setSignUrlList(List<String> signUrlList){
this.signUrlList = signUrlList;
}
/**
* 获取 取件人签名信息
* @return signUrlNotList
*/
public List<String> getSignUrlNotList(){
return this.signUrlNotList;
}
/**
* 设置 取件人签名信息
* @param signUrlNotList
*/
public void setSignUrlNotList(List<String> signUrlNotList){
this.signUrlNotList = signUrlNotList;
}
/**
* 获取 开始 打印队列ID
* @return printQueueIdStart
*/
public Long getPrintQueueIdStart(){
return this.printQueueIdStart;
}
/**
* 设置 开始 打印队列ID
* @param printQueueIdStart
*/
public void setPrintQueueIdStart(Long printQueueIdStart){
this.printQueueIdStart = printQueueIdStart;
}
/**
* 获取 结束 打印队列ID
* @return $printQueueIdEnd
*/
public Long getPrintQueueIdEnd(){
return this.printQueueIdEnd;
}
/**
* 设置 结束 打印队列ID
* @param printQueueIdEnd
*/
public void setPrintQueueIdEnd(Long printQueueIdEnd){
this.printQueueIdEnd = printQueueIdEnd;
}
/**
* 获取 增加 打印队列ID
* @return printQueueIdIncrement
*/
public Long getPrintQueueIdIncrement(){
return this.printQueueIdIncrement;
}
/**
* 设置 增加 打印队列ID
* @param printQueueIdIncrement
*/
public void setPrintQueueIdIncrement(Long printQueueIdIncrement){
this.printQueueIdIncrement = printQueueIdIncrement;
}
/**
* 获取 打印队列ID
* @return printQueueIdList
*/
public List<Long> getPrintQueueIdList(){
return this.printQueueIdList;
}
/**
* 设置 打印队列ID
* @param printQueueIdList
*/
public void setPrintQueueIdList(List<Long> printQueueIdList){
this.printQueueIdList = printQueueIdList;
}
/**
* 获取 打印队列ID
* @return printQueueIdNotList
*/
public List<Long> getPrintQueueIdNotList(){
return this.printQueueIdNotList;
}
/**
* 设置 打印队列ID
* @param printQueueIdNotList
*/
public void setPrintQueueIdNotList(List<Long> printQueueIdNotList){
this.printQueueIdNotList = printQueueIdNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -2007,6 +2177,98 @@ public class PrintLogQuery extends PrintLogEntity {
return this;
}
/**
* 设置 取件人人脸信息
* @param faceUrl
*/
public PrintLogQuery faceUrl(String faceUrl){
setFaceUrl(faceUrl);
return this;
}
/**
* 设置 取件人人脸信息
* @param faceUrlList
*/
public PrintLogQuery faceUrlList(List<String> faceUrlList){
this.faceUrlList = faceUrlList;
return this;
}
/**
* 设置 取件人签名信息
* @param signUrl
*/
public PrintLogQuery signUrl(String signUrl){
setSignUrl(signUrl);
return this;
}
/**
* 设置 取件人签名信息
* @param signUrlList
*/
public PrintLogQuery signUrlList(List<String> signUrlList){
this.signUrlList = signUrlList;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueId
*/
public PrintLogQuery printQueueId(Long printQueueId){
setPrintQueueId(printQueueId);
return this;
}
/**
* 设置 开始 打印队列ID
* @param printQueueIdStart
*/
public PrintLogQuery printQueueIdStart(Long printQueueIdStart){
this.printQueueIdStart = printQueueIdStart;
return this;
}
/**
* 设置 结束 打印队列ID
* @param printQueueIdEnd
*/
public PrintLogQuery printQueueIdEnd(Long printQueueIdEnd){
this.printQueueIdEnd = printQueueIdEnd;
return this;
}
/**
* 设置 增加 打印队列ID
* @param printQueueIdIncrement
*/
public PrintLogQuery printQueueIdIncrement(Long printQueueIdIncrement){
this.printQueueIdIncrement = printQueueIdIncrement;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueIdList
*/
public PrintLogQuery printQueueIdList(List<Long> printQueueIdList){
this.printQueueIdList = printQueueIdList;
return this;
}
/**
* 设置 打印队列ID
* @param printQueueIdNotList
*/
public PrintLogQuery printQueueIdNotList(List<Long> printQueueIdNotList){
this.printQueueIdNotList = printQueueIdNotList;
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 @ 454eb4ff
package com.mortals.xhx.module.record.model;
import java.util.List;
import java.util.ArrayList;
import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
......@@ -10,12 +13,16 @@ import lombok.Data;
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-17
*/
@Data
public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
......@@ -36,6 +43,14 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
* 目录名称
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
......@@ -81,21 +96,25 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/
private Integer total;
/**
* 站点id
* 手机号码
*/
private Long siteId;
private String mobile;
/**
* 证照目录模板ID
* 是否需要收费0否1是
*/
private Long templateId;
private Integer charge;
/**
* 证照模板名称
* 收费金额(单位:分)
*/
private String templateName;
private Integer amount;
/**
* 手机号码
* 支付状态0未支付1已支付
*/
private String mobile;
private Integer paystatus;
/**
* 订单号
*/
private String orderNum;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -113,45 +132,29 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
}
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.applyId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = "";
this.certificateCode = "";
this.enterpriseName = "";
this.holderName = "";
this.holderIDCardNo = "";
this.pickerName = "";
this.pickerIDCardNo = "";
this.previewUrl = "";
this.certificateUrl = "";
this.printStatus = 0;
this.total = 1;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
this.charge = 0;
this.amount = 0;
this.paystatus = 0;
this.orderNum = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java
View file @ 454eb4ff
......@@ -6,9 +6,39 @@ import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
* 证照打印记录查询对象
*
* @author zxfei
* @date 2023-07-05
* @date 2024-12-17
*/
public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */
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 recordIdStart;
......@@ -64,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;
......@@ -181,61 +231,61 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 手机号码 */
private List<String> mobileList;
/** 结束 站点id */
private Long siteIdEnd;
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 开始 是否需要收费0否1是 */
private Integer chargeStart;
/** 增加 站点id */
private Long siteIdIncrement;
/** 结束 是否需要收费0否1是 */
private Integer chargeEnd;
/** 站点id列表 */
private List <Long> siteIdList;
/** 增加 是否需要收费0否1是 */
private Integer chargeIncrement;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 是否需要收费0否1是列表 */
private List <Integer> chargeList;
/** 开始 序号，主键，自增长 */
private Long IdStart;
/** 是否需要收费0否1是排除列表 */
private List <Integer> chargeNotList;
/** 结束 序号，主键，自增长 */
private Long IdEnd;
/** 开始 收费金额(单位:分) */
private Integer amountStart;
/** 增加 序号，主键，自增长 */
private Long IdIncrement;
/** 结束 收费金额(单位:分) */
private Integer amountEnd;
/** 序号，主键，自增长列表 */
private List <Long> IdList;
/** 增加 收费金额(单位:分) */
private Integer amountIncrement;
/** 序号，主键，自增长排除列表 */
private List <Long> IdNotList;
/** 收费金额(单位:分)列表 */
private List <Integer> amountList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 收费金额(单位:分)排除列表 */
private List <Integer> amountNotList;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 开始 支付状态0未支付1已支付 */
private Integer paystatusStart;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 结束 支付状态0未支付1已支付 */
private Integer paystatusEnd;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 增加 支付状态0未支付1已支付 */
private Integer paystatusIncrement;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 支付状态0未支付1已支付列表 */
private List <Integer> paystatusList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 支付状态0未支付1已支付排除列表 */
private List <Integer> paystatusNotList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 手机号码 */
private List<String> mobileList;
/** 订单号 */
private List<String> orderNumList;
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 订单号排除列表 */
private List <String> orderNumNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintWaitQueueQuery> orConditionList;
......@@ -244,6 +294,168 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public PrintWaitQueueQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @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 recordIdStart
......@@ -551,6 +763,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
......@@ -1228,310 +1553,418 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 获取 开始 站点id
* @return siteIdStart
* 获取 手机号码
* @return mobileList
*/
public Long getSiteIdStart(){
return this.siteIdStart;
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 开始 站点id
* @param siteIdStart
* 设置 手机号码
* @param mobileList
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
* 获取 手机号码
* @return mobileNotList
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
public List<String> getMobileNotList(){
return this.mobileNotList;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 手机号码
* @param mobileNotList
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
* 获取 开始 是否需要收费0否1是
* @return chargeStart
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
public Integer getChargeStart(){
return this.chargeStart;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 开始 是否需要收费0否1是
* @param chargeStart
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public void setChargeStart(Integer chargeStart){
this.chargeStart = chargeStart;
}
/**
* 获取 站点id
* @return siteIdList
* 获取 结束 是否需要收费0否1是
* @return $chargeEnd
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public Integer getChargeEnd(){
return this.chargeEnd;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 结束 是否需要收费0否1是
* @param chargeEnd
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public void setChargeEnd(Integer chargeEnd){
this.chargeEnd = chargeEnd;
}
/**
* 获取 站点id
* @return siteIdNotList
* 获取 增加 是否需要收费0否1是
* @return chargeIncrement
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
public Integer getChargeIncrement(){
return this.chargeIncrement;
}
/**
* 设置 站点id
* @param siteIdNotList
* 设置 增加 是否需要收费0否1是
* @param chargeIncrement
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
public void setChargeIncrement(Integer chargeIncrement){
this.chargeIncrement = chargeIncrement;
}
/**
* 获取 是否需要收费0否1是
* @return chargeList
*/
public List<Integer> getChargeList(){
return this.chargeList;
}
/**
* 获取 开始 序号，主键，自增长
* @return IdStart
* 设置 是否需要收费0否1是
* @param chargeList
*/
public Long getIdStart(){
return this.IdStart;
public void setChargeList(List<Integer> chargeList){
this.chargeList = chargeList;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* 获取 是否需要收费0否1是
* @return chargeNotList
*/
public void setIdStart(Long IdStart){
this.IdStart = IdStart;
public List<Integer> getChargeNotList(){
return this.chargeNotList;
}
/**
* 获取 结束 序号，主键，自增长
* @return $IdEnd
* 设置 是否需要收费0否1是
* @param chargeNotList
*/
public Long getIdEnd(){
return this.IdEnd;
public void setChargeNotList(List<Integer> chargeNotList){
this.chargeNotList = chargeNotList;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* 获取 开始 收费金额(单位:分)
* @return amountStart
*/
public void setIdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public Integer getAmountStart(){
return this.amountStart;
}
/**
* 获取 增加 序号，主键，自增长
* @return IdIncrement
* 设置 开始 收费金额(单位:分)
* @param amountStart
*/
public Long getIdIncrement(){
return this.IdIncrement;
public void setAmountStart(Integer amountStart){
this.amountStart = amountStart;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* 获取 结束 收费金额(单位:分)
* @return $amountEnd
*/
public void setIdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public Integer getAmountEnd(){
return this.amountEnd;
}
/**
* 获取 序号，主键，自增长
* @return IdList
* 设置 结束 收费金额(单位:分)
* @param amountEnd
*/
public List<Long> getIdList(){
return this.IdList;
public void setAmountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* 获取 增加 收费金额(单位:分)
* @return amountIncrement
*/
public void setIdList(List<Long> IdList){
this.IdList = IdList;
public Integer getAmountIncrement(){
return this.amountIncrement;
}
/**
* 获取 序号，主键，自增长
* @return IdNotList
* 设置 增加 收费金额(单位:分)
* @param amountIncrement
*/
public List<Long> getIdNotList(){
return this.IdNotList;
public void setAmountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* 获取 收费金额(单位:分)
* @return amountList
*/
public void setIdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public List<Integer> getAmountList(){
return this.amountList;
}
/**
* 设置 收费金额(单位:分)
* @param amountList
*/
public void setAmountList(List<Integer> amountList){
this.amountList = amountList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
* 获取 收费金额(单位:分)
* @return amountNotList
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
public List<Integer> getAmountNotList(){
return this.amountNotList;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
* 设置 收费金额(单位:分)
* @param amountNotList
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
public void setAmountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
* 获取 开始 支付状态0未支付1已支付
* @return paystatusStart
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
public Integer getPaystatusStart(){
return this.paystatusStart;
}
/**
* 设置 开始 支付状态0未支付1已支付
* @param paystatusStart
*/
public void setPaystatusStart(Integer paystatusStart){
this.paystatusStart = paystatusStart;
}
/**
* 获取 结束 支付状态0未支付1已支付
* @return $paystatusEnd
*/
public Integer getPaystatusEnd(){
return this.paystatusEnd;
}
/**
* 设置 结束 支付状态0未支付1已支付
* @param paystatusEnd
*/
public void setPaystatusEnd(Integer paystatusEnd){
this.paystatusEnd = paystatusEnd;
}
/**
* 获取 增加 支付状态0未支付1已支付
* @return paystatusIncrement
*/
public Integer getPaystatusIncrement(){
return this.paystatusIncrement;
}
/**
* 设置 增加 支付状态0未支付1已支付
* @param paystatusIncrement
*/
public void setPaystatusIncrement(Integer paystatusIncrement){
this.paystatusIncrement = paystatusIncrement;
}
/**
* 获取 支付状态0未支付1已支付
* @return paystatusList
*/
public List<Integer> getPaystatusList(){
return this.paystatusList;
}
/**
* 设置 支付状态0未支付1已支付
* @param paystatusList
*/
public void setPaystatusList(List<Integer> paystatusList){
this.paystatusList = paystatusList;
}
/**
* 获取 支付状态0未支付1已支付
* @return paystatusNotList
*/
public List<Integer> getPaystatusNotList(){
return this.paystatusNotList;
}
/**
* 设置 支付状态0未支付1已支付
* @param paystatusNotList
*/
public void setPaystatusNotList(List<Integer> paystatusNotList){
this.paystatusNotList = paystatusNotList;
}
/**
* 获取 订单号
* @return orderNumList
*/
public List<String> getOrderNumList(){
return this.orderNumList;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
* 设置 订单号
* @param orderNumList
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
public void setOrderNumList(List<String> orderNumList){
this.orderNumList = orderNumList;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
* 获取 订单号
* @return orderNumNotList
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
public List<String> getOrderNumNotList(){
return this.orderNumNotList;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
* 设置 订单号
* @param orderNumNotList
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
public void setOrderNumNotList(List<String> orderNumNotList){
this.orderNumNotList = orderNumNotList;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
* 设置 序号，主键，自增长
* @param id
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
public PrintWaitQueueQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
public PrintWaitQueueQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
public PrintWaitQueueQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
public PrintWaitQueueQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 获取 证照模板名称
* @return templateNameList
* 设置 序号，主键，自增长
* @param idList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
public PrintWaitQueueQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
public PrintWaitQueueQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
* 设置 站点id
* @param siteId
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
public PrintWaitQueueQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
* 设置 开始 站点id
* @param siteIdStart
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 获取 手机号码
* @return mobileList
* 设置 结束 站点id
* @param siteIdEnd
*/
public List<String> getMobileList(){
return this.mobileList;
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 手机号码
* @param mobileList
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 获取 手机号码
* @return mobileNotList
* 设置 站点id
* @param siteIdList
*/
public List<String> getMobileNotList(){
return this.mobileNotList;
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 手机号码
* @param mobileNotList
* 设置 站点id
* @param siteIdNotList
*/
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
......@@ -1734,6 +2167,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;
}
/**
* 设置 证照名称
......@@ -2123,203 +2629,203 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
}
/**
* 设置 站点id
* @param siteId
* 设置 手机号码
* @param mobile
*/
public PrintWaitQueueQuery siteId(Long siteId){
setSiteId(siteId);
public PrintWaitQueueQuery mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
* 设置 手机号码
* @param mobileList
*/
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
public PrintWaitQueueQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
* 设置 是否需要收费0否1是
* @param charge
*/
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
public PrintWaitQueueQuery charge(Integer charge){
setCharge(charge);
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
* 设置 开始 是否需要收费0否1是
* @param chargeStart
*/
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public PrintWaitQueueQuery chargeStart(Integer chargeStart){
this.chargeStart = chargeStart;
return this;
}
/**
* 设置 站点id
* @param siteIdList
* 设置 结束 是否需要收费0否1是
* @param chargeEnd
*/
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public PrintWaitQueueQuery chargeEnd(Integer chargeEnd){
this.chargeEnd = chargeEnd;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
* 设置 增加 是否需要收费0否1是
* @param chargeIncrement
*/
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
public PrintWaitQueueQuery chargeIncrement(Integer chargeIncrement){
this.chargeIncrement = chargeIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param Id
* 设置 是否需要收费0否1是
* @param chargeList
*/
public PrintWaitQueueQuery Id(Long Id){
setId(Id);
public PrintWaitQueueQuery chargeList(List<Integer> chargeList){
this.chargeList = chargeList;
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param IdStart
* 设置 是否需要收费0否1是
* @param chargeNotList
*/
public PrintWaitQueueQuery IdStart(Long IdStart){
this.IdStart = IdStart;
public PrintWaitQueueQuery chargeNotList(List<Integer> chargeNotList){
this.chargeNotList = chargeNotList;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param IdEnd
* 设置 收费金额(单位:分)
* @param amount
*/
public PrintWaitQueueQuery IdEnd(Long IdEnd){
this.IdEnd = IdEnd;
public PrintWaitQueueQuery amount(Integer amount){
setAmount(amount);
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param IdIncrement
* 设置 开始 收费金额(单位:分)
* @param amountStart
*/
public PrintWaitQueueQuery IdIncrement(Long IdIncrement){
this.IdIncrement = IdIncrement;
public PrintWaitQueueQuery amountStart(Integer amountStart){
this.amountStart = amountStart;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdList
* 设置 结束 收费金额(单位:分)
* @param amountEnd
*/
public PrintWaitQueueQuery IdList(List<Long> IdList){
this.IdList = IdList;
public PrintWaitQueueQuery amountEnd(Integer amountEnd){
this.amountEnd = amountEnd;
return this;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
* 设置 增加 收费金额(单位:分)
* @param amountIncrement
*/
public PrintWaitQueueQuery IdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
public PrintWaitQueueQuery amountIncrement(Integer amountIncrement){
this.amountIncrement = amountIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
* 设置 收费金额(单位:分)
* @param amountList
*/
public PrintWaitQueueQuery templateId(Long templateId){
setTemplateId(templateId);
public PrintWaitQueueQuery amountList(List<Integer> amountList){
this.amountList = amountList;
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
* 设置 收费金额(单位:分)
* @param amountNotList
*/
public PrintWaitQueueQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
public PrintWaitQueueQuery amountNotList(List<Integer> amountNotList){
this.amountNotList = amountNotList;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
* 设置 支付状态0未支付1已支付
* @param paystatus
*/
public PrintWaitQueueQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
public PrintWaitQueueQuery paystatus(Integer paystatus){
setPaystatus(paystatus);
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
* 设置 开始 支付状态0未支付1已支付
* @param paystatusStart
*/
public PrintWaitQueueQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
public PrintWaitQueueQuery paystatusStart(Integer paystatusStart){
this.paystatusStart = paystatusStart;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
* 设置 结束 支付状态0未支付1已支付
* @param paystatusEnd
*/
public PrintWaitQueueQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
public PrintWaitQueueQuery paystatusEnd(Integer paystatusEnd){
this.paystatusEnd = paystatusEnd;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
* 设置 增加 支付状态0未支付1已支付
* @param paystatusIncrement
*/
public PrintWaitQueueQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
public PrintWaitQueueQuery paystatusIncrement(Integer paystatusIncrement){
this.paystatusIncrement = paystatusIncrement;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
* 设置 支付状态0未支付1已支付
* @param paystatusList
*/
public PrintWaitQueueQuery templateName(String templateName){
setTemplateName(templateName);
public PrintWaitQueueQuery paystatusList(List<Integer> paystatusList){
this.paystatusList = paystatusList;
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
* 设置 支付状态0未支付1已支付
* @param paystatusNotList
*/
public PrintWaitQueueQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
public PrintWaitQueueQuery paystatusNotList(List<Integer> paystatusNotList){
this.paystatusNotList = paystatusNotList;
return this;
}
/**
* 设置 手机号码
* @param mobile
* 设置 订单号
* @param orderNum
*/
public PrintWaitQueueQuery mobile(String mobile){
setMobile(mobile);
public PrintWaitQueueQuery orderNum(String orderNum){
setOrderNum(orderNum);
return this;
}
/**
* 设置 手机号码
* @param mobileList
* 设置 订单号
* @param orderNumList
*/
public PrintWaitQueueQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
public PrintWaitQueueQuery orderNumList(List<String> orderNumList){
this.orderNumList = orderNumList;
return this;
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/ApplyLogVo.java
View file @ 454eb4ff
......@@ -15,10 +15,13 @@ import java.util.List;
*/
@Data
public class ApplyLogVo extends BaseEntityLong {
/** 查询条件 */
private String query;
/** 操作类型名称 */
private String operTypeName;
/** 收费金额 */
private Double amountDouble;
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java
View file @ 454eb4ff
......@@ -27,5 +27,5 @@ public interface PrintWaitQueueService extends ICRUDService<PrintWaitQueueEntity
* 打印文件
* @param id
*/
void doPrint(Long id,int printStatus,String statusRemark);
void doPrint(Long id,int printStatus,String statusRemark,String faceUrl,String signUrl);
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 454eb4ff
......@@ -16,7 +16,9 @@ import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy;
import com.deepoove.poi.util.RegexUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.icbc.api.request.MsySaleDetailQueryRequestV1;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.util.DataUtil;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService;
......@@ -48,6 +50,8 @@ import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Decoder;
import java.io.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -113,6 +117,16 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
return query;
}
@Override
protected void findAfter(ApplyLogEntity params, PageInfo pageInfo, Context context, List<ApplyLogEntity> list) throws AppException {
if(CollectionUtils.isNotEmpty(list)){
list.forEach(item->{
BigDecimal aB = new BigDecimal(item.getAmount());
item.setAmountDouble(aB.divide(new BigDecimal(100),2, RoundingMode.HALF_UP).doubleValue());
});
}
}
@Override
protected void validData(ApplyLogEntity entity, Context context) throws AppException {
if(StringUtils.isEmpty(entity.getCertificateCode())){
......@@ -127,21 +141,21 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(entity.getHolderType()==null){
throw new AppException("持有者类型不能为空");
}
if(entity.getHolderIdType()==null){
throw new AppException("持有者证件类型不能为空");
}
if(StringUtils.isEmpty(entity.getHolderIDCardNo())){
throw new AppException("持有者证件号码不能为空");
}
if(StringUtils.isEmpty(entity.getPrivateID())){
throw new AppException("专网ID不能为空");
}
if(StringUtils.isEmpty(entity.getEnterpriseName())){
throw new AppException("企业名称不能为空");
}
if(StringUtils.isEmpty(entity.getHolderName())){
throw new AppException("持有者姓名不能为空");
}
// if(entity.getHolderIdType()==null){
// throw new AppException("持有者证件类型不能为空");
// }
// if(StringUtils.isEmpty(entity.getHolderIDCardNo())){
// throw new AppException("持有者证件号码不能为空");
// }
// if(StringUtils.isEmpty(entity.getPrivateID())){
// throw new AppException("专网ID不能为空");
// }
// if(StringUtils.isEmpty(entity.getEnterpriseName())){
// throw new AppException("企业名称不能为空");
// }
// if(StringUtils.isEmpty(entity.getHolderName())){
// throw new AppException("持有者姓名不能为空");
// }
// if(StringUtils.isEmpty(entity.getOriFormContent())){
// throw new AppException("正本表单不能为空");
// }
......@@ -151,6 +165,19 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(entity.getTemplateId()==null){
throw new AppException("目录模板ID不能为空");
}
if(entity.getAmountDouble()!=null){
Double amountD = entity.getAmountDouble()*100;
Integer amount = new BigDecimal(amountD).intValue();;
entity.setAmount(amount);
if(amount>0) {
entity.setCharge(1);
}else {
entity.setCharge(0);
}
}else {
entity.setCharge(0);
entity.setAmount(0);
}
super.validData(entity, context);
}
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 454eb4ff
......@@ -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.StringUtils;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
import com.mortals.xhx.module.certificate.model.CertificateCatalogTemplateEntity;
import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
......@@ -26,6 +27,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 com.mortals.xhx.sms.SMSUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -113,10 +115,24 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
dao.insert(original);
PrintWaitQueueEntity duplicate = creatWaitQueue(applyLogEntity,GenerateStatus.DUPLICATE.getValue());
dao.insert(duplicate);
//通知打印短信
if(StringUtils.isNotEmpty(applyLogEntity.getMobile())){
String[] content = new String[2];
content[0] = original.getCertificateName();
content[1] = duplicate.getCertificateName();
SMSUtil.sendMsg(applyLogEntity.getMobile(),1,content);
}
}else {
PrintWaitQueueEntity printWaitQueueEntity = creatWaitQueue(applyLogEntity,generateType);
dao.insert(printWaitQueueEntity);
//通知打印短信
if(StringUtils.isNotEmpty(applyLogEntity.getMobile())){
String[] content = new String[1];
content[0] = printWaitQueueEntity.getCertificateName();
SMSUtil.sendMsg(applyLogEntity.getMobile(),1,content);
}
}
}
private PrintWaitQueueEntity creatWaitQueue(ApplyLogEntity applyLogEntity,int generateType){
......@@ -143,11 +159,18 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
waitQueueEntity.setTotal(paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId());
waitQueueEntity.setCreateTime(new Date());
waitQueueEntity.setCharge(applyLogEntity.getCharge());
waitQueueEntity.setAmount(applyLogEntity.getAmount());
if(applyLogEntity.getCharge()==1) {
waitQueueEntity.setPaystatus(0);
}else {
waitQueueEntity.setPaystatus(-1);
}
return waitQueueEntity;
}
@Override
public void doPrint(Long id,int printStatus,String statusRemark) {
public void doPrint(Long id,int printStatus,String statusRemark,String faceUrl,String signUrl) {
PrintWaitQueueEntity waitQueueEntity = this.dao.get(id);
if(waitQueueEntity==null){
throw new AppException("数据不存在或已修改");
......@@ -157,13 +180,13 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
if(printStatus==PrintStatus.SUCCESS.getValue()){
int total = waitQueueEntity.getTotal();
total--;
doPrintSuccess(waitQueueEntity);
doPrintSuccess(waitQueueEntity,faceUrl,signUrl);
if(total==0){
data.setPrintStatus(YesNoEnum.YES.getValue());
}
data.setTotalIncrement(-1);
}else {
doPrintFail(waitQueueEntity,statusRemark);
doPrintFail(waitQueueEntity,statusRemark,faceUrl,signUrl);
//data.setPrintStatus(-1);
}
data.setUpdateTime(new Date());
......@@ -171,7 +194,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
}
private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){
private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark,String faceUrl,String signUrl){
Date now = new Date();
PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setSiteId(waitQueueEntity.getSiteId());
......@@ -194,10 +217,12 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue());
printLogEntity.setStatusRemark(statusRemark);
printLogEntity.setMobile(waitQueueEntity.getMobile());
printLogEntity.setFaceUrl(faceUrl);
printLogEntity.setSignUrl(signUrl);
printLogDao.insert(printLogEntity);
}
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity,String faceUrl,String signUrl){
RetainLogEntity retainLogEntity = new RetainLogEntity();
Date now = new Date();
retainLogEntity.setSiteId(waitQueueEntity.getSiteId());
......@@ -235,6 +260,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
printLogEntity.setFaceUrl(faceUrl);
printLogEntity.setSignUrl(signUrl);
retainLogDao.insert(retainLogEntity);
printLogDao.insert(printLogEntity);
CertificateCatalogEntity catalogEntity = certificateCatalogService.get(waitQueueEntity.getCatalogId());
......@@ -244,6 +271,11 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
query.setUpdateTime(now);
certificateClassifyService.update(query);
//打印结束短信
if(StringUtils.isNotEmpty(waitQueueEntity.getMobile())){
String[] content = new String[2];
content[0] = waitQueueEntity.getCertificateName();
SMSUtil.sendMsg(waitQueueEntity.getMobile(),2,content);
}
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/pay/ICBCPayUtil.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.pay;
import com.alibaba.fastjson.JSON;
import com.icbc.api.DefaultIcbcClient;
import com.icbc.api.IcbcApiException;
import com.icbc.api.IcbcConstants;
import com.icbc.api.request.CardbusinessQrcodeQrgenerateRequestV1;
import com.icbc.api.request.MybankPayQrcodeScannedPaystatusRequestV2;
import com.icbc.api.response.CardbusinessQrcodeQrgenerateResponseV1;
import com.icbc.api.response.MybankPayQrcodeScannedPaystatusResponseV2;
import com.mortals.framework.util.DateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.Date;
public class ICBCPayUtil {
protected static Log log = LogFactory.getLog(ICBCPayUtil.class);
//1、网关公钥
protected static final String APIGW_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB";
//2、appid
protected static final String APP_ID = "10000000000003219401";
//3、密钥对认证方式，公钥在API平台登记，此处为私钥
protected static final String MY_PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrlSRQ9qe9rXduyQka0UE0mqLNtMqNWJlq3aD11tAh96KoM+yReJVC8vd1/25ANnM3oIEht7daB1LBZRx41DlJ95bdsxLtuIQ3ENGcUQSUv3dP/YtKoXxjWmo7E1UGNWZP3/PK48SKxFdP0lM69MtA4/flLpOAX8cqHYWRYsquG8GdskL5qrw0msPo2ooBa70Zdgp/IoSty/+1bqU5j5MjXDB8fb9dlqItmSkuGo/EqE1I+GycmVFX7hhQlXRQSOU0hsBEqrcjsBkg7ZQAJLd06eRnz2tr6zMskLMXL3juxOnxZfIbDQlvY0P3IGjpusYiSoO0erdiuhscRoKL0f3FAgMBAAECggEACurD3e+RBQAG/oJbCnJFpaewc8nXg2kfkHhGgq3Rc1UoFm9V/ibVHxE0zooF2p8Rnfif5A8mODEJbRWrsJfBh2PHR8GE6EwvrriVZaPqrd4wJLjwm7ss82iwI/nFv03hfck1ip4LBiXvmjwQdfVXrgAd6IlEnaE6cQMM2bnBRJTpH4gQGfFIdG71Tn5Q7qukwyTPBFlu1ocaRy+nqVAnjnwXlR7cqBcBZplvNmzWaNBrKnuoIp2U9GGifvbeN5MevNeSVfbIbe1siU33UpO0w1/TwmfztYFtxVp5TjbOw5SNW7RidNSh4vLFLep3kUm1trkD5VIrXpGSsxhyeDj5BwKBgQDDf0oVCVH3UTKmDKcF8DHEAgmwYmmVD6voh9rY/56iPR4EzH95vjBye0F9aiYAk22y2ebNimnBgWzgGTs+lrFldUc0lXR2H+NMmhVc8OWnoa4E4fF5xFHMbWE/m9o204BsiS3tnxE16d5ozfWTSPvfDhr5bZ+JOhwYXFVgaML4wwKBgQDgryk4/+LpEP8hKGx7tVi+1QBkZWeroIC8TvLf7OIkmsAoHRUX4JljkU1wpvwcU4cUgqTLXr19HX2NwwKXJkSb6y/Wp1tFPPIbm5hrakp4Z1w4HqGeMWs3ckZxgXHo6KuVUxMJ4kpN53ueaTEL5OqNn2bJcKvYNr3BTepN8N+G1wKBgQC8TV349zo5Ir/LSwKR6LK2nlPgzlnuVuL5nenA/C47DO1eJ+9dP0EA9BG3kEe8ZETUcagrMHf/B//rtsHm3lVOaXFFh/NeWAai4QNUu0Apf8TTNSJXbC5x3qU+FItSJdRcNqHDcGSubm5ouoEg9bqNNdPrjpiNICixmjYuH5o06wKBgBqJ9geKigXXgRssiCvQjsvzotk49RbbnXkgpiV2+Hs0YDAcx0oLuHJ/TjNZNfwujY0JpWd0KFOn8RWWjC7IUWBNVlg3altySHKkXUuKwYMZSlZCn/psgeqJr/JmRMsq+GFp75zCQt6S0hIzAJ0UC/RweJagnVurk5xKlLtiETT/AoGAfTh49Y2caLLv1IyjezLJdJ3fi/vhG1iKAsReRVhXuB+jcSlNEbadwRkIqemssExq3B2MR0+eOsqR/wJkx6WNH6UGIRC6MEXQCZTghSVhWAiNefvVRN7961e7NgwlABaftUn+07e3sb56RXluzWlUO/8fnQgJleh8u+5TmW5pqpY=";
//4、商户号
protected static final String MSG_ID = "440286510152";
/**
* 支付二维码生成
* @param orderNo 订单号
* @param amount 支付金额单位分
* @param orderDate 订单日期
* @param ip 支付设备ip
* @return
*/
public static String QrcodeGenerate(String orderNo, Integer amount, Date orderDate,String ip){
String tradeDate = DateUtils.getDateTimeStr(orderDate,"yyyyMMdd");
String tradeTime = DateUtils.getDateTimeStr(orderDate,"HHmmss");
DefaultIcbcClient client = new DefaultIcbcClient(APP_ID, IcbcConstants.SIGN_TYPE_RSA2, MY_PRIVATE_KEY, APIGW_PUBLIC_KEY);
CardbusinessQrcodeQrgenerateRequestV1 request = new CardbusinessQrcodeQrgenerateRequestV1();
request.setServiceUrl("https://gw.open.icbc.com.cn/api/cardbusiness/qrcode/qrgenerate/V1");
CardbusinessQrcodeQrgenerateRequestV1.CardbusinessQrcodeQrgenerateRequestV1Biz bizContent = new CardbusinessQrcodeQrgenerateRequestV1.CardbusinessQrcodeQrgenerateRequestV1Biz();
request.setBizContent(bizContent);
bizContent.setMerId(MSG_ID); //商户号
//bizContent.setStoreCode(MSG_ID);
bizContent.setOutTradeNo(orderNo); //商户系统订单号
bizContent.setOrderAmt(amount+""); //订单总金额(单位：分)
bizContent.setTradeDate(tradeDate); //商户订单生成日期，格式是yyyyMMdd
bizContent.setTradeTime(tradeTime); //商户订单生成时间，格式是HHmmss
bizContent.setTporderCreateIp(ip); //商户订单生成的机器IP
bizContent.setNotifyFlag("0"); //商户是否开启通知接口
bizContent.setPayExpire("1200"); //二维码有效期，单位：秒，必须小于24小时
CardbusinessQrcodeQrgenerateResponseV1 response;
String qrcode=null;
try {
response = client.execute(request, orderDate.getTime() + "");//msgId消息通讯唯一编号，要求每次调用独立生成，APP级唯一
log.info(JSON.toJSONString(response));
if (response.getReturnCode() == 0) {
// 6、业务成功处理，请根据接口文档用response.getxxx()获取同步返回的业务数据
// System.out.println("ReturnCode:" + response.getReturnCode());
// System.out.println("response:" + JSON.toJSONString(response));
qrcode = response.getQrcode();
} else {
// 失败
// System.out.println("response:" + JSON.toJSONString(response));
// System.out.println("ReturnCode:" + response.getReturnCode());
// System.out.println("ReturnMsg:" + response.getReturnMsg());
log.info(JSON.toJSONString(response));
}
} catch (IcbcApiException e) {
//e.printStackTrace();
log.error(e.getErrMsg());
}
return qrcode;
}
/**
* 支付状态
* @param orderNo
* @param orderDate
* @return 交易结果标志：0：支付中请稍后查询，1：支付成功，2：支付失败，3：已撤销，4：撤销中请稍后查询，5：已全额退款，6：已部分退款，7：退款中请稍后查询
*/
public static String qrcodePaystatus(String orderNo, Date orderDate){
String tradeDate = DateUtils.getDateTimeStr(orderDate,"yyyyMMdd");
DefaultIcbcClient client = new DefaultIcbcClient(APP_ID, IcbcConstants.SIGN_TYPE_RSA2, MY_PRIVATE_KEY, APIGW_PUBLIC_KEY);
MybankPayQrcodeScannedPaystatusRequestV2 request = new MybankPayQrcodeScannedPaystatusRequestV2();
//4、根据测试环境和生产环境替换相应ip和端口
request.setServiceUrl("https://gw.open.icbc.com.cn/api/mybank/pay/qrcode/scanned/paystatus/V2");
//5、请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
MybankPayQrcodeScannedPaystatusRequestV2.MybankPayQrcodeScannedPaystatusRequestV2Biz bizContent = new MybankPayQrcodeScannedPaystatusRequestV2.MybankPayQrcodeScannedPaystatusRequestV2Biz();
bizContent.setMerId(MSG_ID); //商户编号
bizContent.setOutTradeNo(orderNo); //外部订单号
bizContent.setTradeDate(tradeDate); //交易日期 格式:YYYYMMDD
//bizContent.setOrderId("");
request.setBizContent(bizContent);
MybankPayQrcodeScannedPaystatusResponseV2 response;
String paystatus = null;
try {
response = client.execute(request, System.currentTimeMillis() + "");//msgId消息通讯唯一编号，要求每次调用独立生成，APP级唯一
log.info(JSON.toJSONString(response));
if (response.getReturnCode() == 0) {
// 6、业务成功处理，请根据接口文档用response.getxxx()获取同步返回的业务数据
// System.out.println("response:" + JSON.toJSONString(response));
// System.out.println("ReturnCode:"+response.getReturnCode());
paystatus = response.getPayStatus();
} else {
// 失败
// System.out.println("response:" + JSON.toJSONString(response));
// System.out.println("ReturnCode:"+response.getReturnCode());
// System.out.println("ReturnMsg:"+response.getReturnMsg());
log.info(JSON.toJSONString(response));
}
} catch (IcbcApiException e) {
//e.printStackTrace();
log.error(e.getErrMsg());
}
return paystatus;
}
public static void main(String[] args) {
Date orderDate = new Date();
String tradeDate = DateUtils.getDateTimeStr(orderDate,"yyyyMMdd");
String tradeTime = DateUtils.getDateTimeStr(orderDate,"HHmmss");
System.out.println(tradeDate);
System.out.println(tradeTime);
}
}
certificate-manager/src/main/java/com/mortals/xhx/sms/SMSUtil.java 0 → 100644
View file @ 454eb4ff
package com.mortals.xhx.sms;
import cn.hutool.http.ContentType;
import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONObject;
import java.util.HashMap;
public class SMSUtil {
protected static final String APP_ID = "290f9490-f452-119b-0cbc-d42ab7ccf302";
protected static final String app_Secret = "EC78223CE3CC5AAFC549672F6E4EDE34";
protected static final String GET_AUTHKEY = "http://221.237.182.106:7876/api/open/getAuthKey";
protected static final String SEND_MSG = "http://221.237.182.106:7876/api/externalInter/send-msg";
public static void main(String[] args) {
JSONObject body = new JSONObject();
body.put("appid",APP_ID);
body.put("appSecret",app_Secret);
HashMap<String, String> headerMap = new HashMap<>();
headerMap.put(Header.CONTENT_TYPE.getValue(), ContentType.JSON.getValue());
HttpResponse response = HttpRequest.post(GET_AUTHKEY)
.body(body.toJSONString())
.addHeaders(headerMap).timeout(20000).execute();
String respBodyStr = response.body();
System.out.println(respBodyStr);
JSONObject respJson = JSONObject.parseObject(respBodyStr);
if(respJson.getString("code").equals("200")){
String accessToken = respJson.getJSONObject("data").getString("accessToken");
HashMap<String, String> headerMapSend = new HashMap<>();
headerMapSend.put(Header.CONTENT_TYPE.getValue(), ContentType.JSON.getValue());
headerMapSend.put("Access-Token",accessToken);
JSONObject bodySend = new JSONObject();
bodySend.put("phone","13880214439"); //手机号
bodySend.put("type","dzfw"); // dzfw 通知打证，dzjs 打证结束
String[] zs = {"测试证书"};
bodySend.put("param",zs); //["证书名称"]
HttpResponse sendResponse = HttpRequest.post(SEND_MSG)
.body(bodySend.toJSONString())
.addHeaders(headerMapSend).timeout(20000).execute();
System.out.println(sendResponse.body());
}
}
/**
* 短信发送
* @param mobile 手机号
* @param type 短信类型1通知打证，2打印结束
* @param content 证书名称
*/
public static void sendMsg(String mobile,Integer type,String[] content){
JSONObject body = new JSONObject();
body.put("appid",APP_ID);
body.put("appSecret",app_Secret);
HashMap<String, String> headerMap = new HashMap<>();
headerMap.put(Header.CONTENT_TYPE.getValue(), ContentType.JSON.getValue());
HttpResponse response = HttpRequest.post(GET_AUTHKEY)
.body(body.toJSONString())
.addHeaders(headerMap).timeout(20000).execute();
String respBodyStr = response.body();
System.out.println(respBodyStr);
JSONObject respJson = JSONObject.parseObject(respBodyStr);
if(respJson.getString("code").equals("200")){
String accessToken = respJson.getJSONObject("data").getString("accessToken");
HashMap<String, String> headerMapSend = new HashMap<>();
headerMapSend.put(Header.CONTENT_TYPE.getValue(), ContentType.JSON.getValue());
headerMapSend.put("Access-Token",accessToken);
JSONObject bodySend = new JSONObject();
bodySend.put("phone",mobile); //手机号
if(type==1) {
bodySend.put("type", "dzfw"); // dzfw 通知打证，dzjs 打证结束
}else {
bodySend.put("type", "dzjs");
}
String[] zs = {"测试证书"};
bodySend.put("param",content); //["证书名称"]
HttpResponse sendResponse = HttpRequest.post(SEND_MSG)
.body(bodySend.toJSONString())
.addHeaders(headerMapSend).timeout(20000).execute();
//System.out.println(sendResponse.body());
}
}
}
certificate-manager/src/main/resources/bootstrap.yml
View file @ 454eb4ff
......@@ -60,6 +60,6 @@ token:
head: mortal
upload:
path: @profiles.filepath@
url: http://192.168.0.98:17216/cpm/file/commonupload?prePath=/file/uploadfile
url: @profiles.uploadUrl@
qrcode:
url: http://rhpt.scjg.chengdu.gov.cn:8091/adap/spjy/process/generateQrCode.do?dto.applyId=
certificate-manager/src/main/resources/sqlmap/module/pay/PayRequstMapper.xml 0 → 100644
View file @ 454eb4ff
<?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.pay.dao.ibatis.PayRequstDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="PayRequstEntity" id="PayRequstEntity-Map">
<id property="id" column="id" />
<result property="applyId" column="applyId" />
<result property="printQueueId" column="printQueueId" />
<result property="orderNum" column="orderNum" />
<result property="amount" column="amount" />
<result property="orderDate" column="orderDate" />
<result property="qrcodeUrl" column="qrcodeUrl" />
<result property="payExpire" column="payExpire" />
<result property="payStatus" column="payStatus" />
<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('applyId') or colPickMode == 1 and data.containsKey('applyId')))">
a.applyId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printQueueId') or colPickMode == 1 and data.containsKey('printQueueId')))">
a.printQueueId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderNum') or colPickMode == 1 and data.containsKey('orderNum')))">
a.orderNum,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amount') or colPickMode == 1 and data.containsKey('amount')))">
a.amount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderDate') or colPickMode == 1 and data.containsKey('orderDate')))">
a.orderDate,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('qrcodeUrl') or colPickMode == 1 and data.containsKey('qrcodeUrl')))">
a.qrcodeUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('payExpire') or colPickMode == 1 and data.containsKey('payExpire')))">
a.payExpire,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('payStatus') or colPickMode == 1 and data.containsKey('payStatus')))">
a.payStatus,
</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="PayRequstEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_pay_requst
(applyId,printQueueId,orderNum,amount,orderDate,qrcodeUrl,payExpire,payStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
(#{applyId},#{printQueueId},#{orderNum},#{amount},#{orderDate},#{qrcodeUrl},#{payExpire},#{payStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_pay_requst
(applyId,printQueueId,orderNum,amount,orderDate,qrcodeUrl,payExpire,payStatus,createUserId,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.applyId},#{item.printQueueId},#{item.orderNum},#{item.amount},#{item.orderDate},#{item.qrcodeUrl},#{item.payExpire},#{item.payStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_pay_requst as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('applyId')) or (colPickMode==1 and !data.containsKey('applyId'))">
a.applyId=#{data.applyId},
</if>
<if test="(colPickMode==0 and data.containsKey('applyIdIncrement')) or (colPickMode==1 and !data.containsKey('applyIdIncrement'))">
a.applyId=ifnull(a.applyId,0) + #{data.applyIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('printQueueId')) or (colPickMode==1 and !data.containsKey('printQueueId'))">
a.printQueueId=#{data.printQueueId},
</if>
<if test="(colPickMode==0 and data.containsKey('printQueueIdIncrement')) or (colPickMode==1 and !data.containsKey('printQueueIdIncrement'))">
a.printQueueId=ifnull(a.printQueueId,0) + #{data.printQueueIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('orderNum')) or (colPickMode==1 and !data.containsKey('orderNum'))">
a.orderNum=#{data.orderNum},
</if>
<if test="(colPickMode==0 and data.containsKey('amount')) or (colPickMode==1 and !data.containsKey('amount'))">
a.amount=#{data.amount},
</if>
<if test="(colPickMode==0 and data.containsKey('amountIncrement')) or (colPickMode==1 and !data.containsKey('amountIncrement'))">
a.amount=ifnull(a.amount,0) + #{data.amountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('orderDate')) or (colPickMode==1 and !data.containsKey('orderDate'))">
a.orderDate=#{data.orderDate},
</if>
<if test="(colPickMode==0 and data.containsKey('qrcodeUrl')) or (colPickMode==1 and !data.containsKey('qrcodeUrl'))">
a.qrcodeUrl=#{data.qrcodeUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('payExpire')) or (colPickMode==1 and !data.containsKey('payExpire'))">
a.payExpire=#{data.payExpire},
</if>
<if test="(colPickMode==0 and data.containsKey('payExpireIncrement')) or (colPickMode==1 and !data.containsKey('payExpireIncrement'))">
a.payExpire=ifnull(a.payExpire,0) + #{data.payExpireIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('payStatus')) or (colPickMode==1 and !data.containsKey('payStatus'))">
a.payStatus=#{data.payStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('payStatusIncrement')) or (colPickMode==1 and !data.containsKey('payStatusIncrement'))">
a.payStatus=ifnull(a.payStatus,0) + #{data.payStatusIncrement},
</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_pay_requst as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="applyId=(case" suffix="ELSE applyId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('applyId')) or (colPickMode==1 and !item.containsKey('applyId'))">
when a.id=#{item.id} then #{item.applyId}
</when>
<when test="(colPickMode==0 and item.containsKey('applyIdIncrement')) or (colPickMode==1 and !item.containsKey('applyIdIncrement'))">
when a.id=#{item.id} then ifnull(a.applyId,0) + #{item.applyIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="printQueueId=(case" suffix="ELSE printQueueId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('printQueueId')) or (colPickMode==1 and !item.containsKey('printQueueId'))">
when a.id=#{item.id} then #{item.printQueueId}
</when>
<when test="(colPickMode==0 and item.containsKey('printQueueIdIncrement')) or (colPickMode==1 and !item.containsKey('printQueueIdIncrement'))">
when a.id=#{item.id} then ifnull(a.printQueueId,0) + #{item.printQueueIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="orderNum=(case" suffix="ELSE orderNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('orderNum')) or (colPickMode==1 and !item.containsKey('orderNum'))">
when a.id=#{item.id} then #{item.orderNum}
</if>
</foreach>
</trim>
<trim prefix="amount=(case" suffix="ELSE amount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('amount')) or (colPickMode==1 and !item.containsKey('amount'))">
when a.id=#{item.id} then #{item.amount}
</when>
<when test="(colPickMode==0 and item.containsKey('amountIncrement')) or (colPickMode==1 and !item.containsKey('amountIncrement'))">
when a.id=#{item.id} then ifnull(a.amount,0) + #{item.amountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="orderDate=(case" suffix="ELSE orderDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('orderDate')) or (colPickMode==1 and !item.containsKey('orderDate'))">
when a.id=#{item.id} then #{item.orderDate}
</if>
</foreach>
</trim>
<trim prefix="qrcodeUrl=(case" suffix="ELSE qrcodeUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('qrcodeUrl')) or (colPickMode==1 and !item.containsKey('qrcodeUrl'))">
when a.id=#{item.id} then #{item.qrcodeUrl}
</if>
</foreach>
</trim>
<trim prefix="payExpire=(case" suffix="ELSE payExpire end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('payExpire')) or (colPickMode==1 and !item.containsKey('payExpire'))">
when a.id=#{item.id} then #{item.payExpire}
</when>
<when test="(colPickMode==0 and item.containsKey('payExpireIncrement')) or (colPickMode==1 and !item.containsKey('payExpireIncrement'))">
when a.id=#{item.id} then ifnull(a.payExpire,0) + #{item.payExpireIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="payStatus=(case" suffix="ELSE payStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('payStatus')) or (colPickMode==1 and !item.containsKey('payStatus'))">
when a.id=#{item.id} then #{item.payStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('payStatusIncrement')) or (colPickMode==1 and !item.containsKey('payStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.payStatus,0) + #{item.payStatusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="PayRequstEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_pay_requst as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_pay_requst as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_pay_requst where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_pay_requst where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_pay_requst 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_pay_requst as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="PayRequstEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_pay_requst 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_pay_requst 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="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<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('applyId')">
<if test="conditionParamRef.applyId != null ">
${_conditionType_} a.applyId = #{${_conditionParam_}.applyId}
</if>
<if test="conditionParamRef.applyId == null">
${_conditionType_} a.applyId is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
${_conditionType_} a.applyId in
<foreach collection="conditionParamRef.applyIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdNotList') and conditionParamRef.applyIdNotList.size() > 0">
${_conditionType_} a.applyId not in
<foreach collection="conditionParamRef.applyIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdStart') and conditionParamRef.applyIdStart != null">
${_conditionType_} a.applyId <![CDATA[ >= ]]> #{${_conditionParam_}.applyIdStart}
</if>
<if test="conditionParamRef.containsKey('applyIdEnd') and conditionParamRef.applyIdEnd != null">
${_conditionType_} a.applyId <![CDATA[ <= ]]> #{${_conditionParam_}.applyIdEnd}
</if>
<if test="conditionParamRef.containsKey('printQueueId')">
<if test="conditionParamRef.printQueueId != null ">
${_conditionType_} a.printQueueId = #{${_conditionParam_}.printQueueId}
</if>
<if test="conditionParamRef.printQueueId == null">
${_conditionType_} a.printQueueId is null
</if>
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
${_conditionType_} a.printQueueId in
<foreach collection="conditionParamRef.printQueueIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printQueueIdNotList') and conditionParamRef.printQueueIdNotList.size() > 0">
${_conditionType_} a.printQueueId not in
<foreach collection="conditionParamRef.printQueueIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printQueueIdStart') and conditionParamRef.printQueueIdStart != null">
${_conditionType_} a.printQueueId <![CDATA[ >= ]]> #{${_conditionParam_}.printQueueIdStart}
</if>
<if test="conditionParamRef.containsKey('printQueueIdEnd') and conditionParamRef.printQueueIdEnd != null">
${_conditionType_} a.printQueueId <![CDATA[ <= ]]> #{${_conditionParam_}.printQueueIdEnd}
</if>
<if test="conditionParamRef.containsKey('orderNum')">
<if test="conditionParamRef.orderNum != null and conditionParamRef.orderNum != ''">
${_conditionType_} a.orderNum like #{${_conditionParam_}.orderNum}
</if>
<if test="conditionParamRef.orderNum == null">
${_conditionType_} a.orderNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('orderNumList') and conditionParamRef.orderNumList.size() > 0">
${_conditionType_} a.orderNum in
<foreach collection="conditionParamRef.orderNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderNumNotList') and conditionParamRef.orderNumNotList.size() > 0">
${_conditionType_} a.orderNum not in
<foreach collection="conditionParamRef.orderNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amount')">
<if test="conditionParamRef.amount != null ">
${_conditionType_} a.amount = #{${_conditionParam_}.amount}
</if>
<if test="conditionParamRef.amount == null">
${_conditionType_} a.amount is null
</if>
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
${_conditionType_} a.amount in
<foreach collection="conditionParamRef.amountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountNotList') and conditionParamRef.amountNotList.size() > 0">
${_conditionType_} a.amount not in
<foreach collection="conditionParamRef.amountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountStart') and conditionParamRef.amountStart != null">
${_conditionType_} a.amount <![CDATA[ >= ]]> #{${_conditionParam_}.amountStart}
</if>
<if test="conditionParamRef.containsKey('amountEnd') and conditionParamRef.amountEnd != null">
${_conditionType_} a.amount <![CDATA[ <= ]]> #{${_conditionParam_}.amountEnd}
</if>
<if test="conditionParamRef.containsKey('orderDate')">
<if test="conditionParamRef.orderDate != null ">
${_conditionType_} a.orderDate = #{${_conditionParam_}.orderDate}
</if>
<if test="conditionParamRef.orderDate == null">
${_conditionType_} a.orderDate is null
</if>
</if>
<if test="conditionParamRef.containsKey('orderDateStart') and conditionParamRef.orderDateStart != null and conditionParamRef.orderDateStart!=''">
${_conditionType_} a.orderDate <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.orderDateStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('orderDateEnd') and conditionParamRef.orderDateEnd != null and conditionParamRef.orderDateEnd!=''">
${_conditionType_} a.orderDate <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.orderDateEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('qrcodeUrl')">
<if test="conditionParamRef.qrcodeUrl != null and conditionParamRef.qrcodeUrl != ''">
${_conditionType_} a.qrcodeUrl like #{${_conditionParam_}.qrcodeUrl}
</if>
<if test="conditionParamRef.qrcodeUrl == null">
${_conditionType_} a.qrcodeUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('qrcodeUrlList') and conditionParamRef.qrcodeUrlList.size() > 0">
${_conditionType_} a.qrcodeUrl in
<foreach collection="conditionParamRef.qrcodeUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('qrcodeUrlNotList') and conditionParamRef.qrcodeUrlNotList.size() > 0">
${_conditionType_} a.qrcodeUrl not in
<foreach collection="conditionParamRef.qrcodeUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('payExpire')">
<if test="conditionParamRef.payExpire != null ">
${_conditionType_} a.payExpire = #{${_conditionParam_}.payExpire}
</if>
<if test="conditionParamRef.payExpire == null">
${_conditionType_} a.payExpire is null
</if>
</if>
<if test="conditionParamRef.containsKey('payExpireList') and conditionParamRef.payExpireList.size() > 0">
${_conditionType_} a.payExpire in
<foreach collection="conditionParamRef.payExpireList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('payExpireNotList') and conditionParamRef.payExpireNotList.size() > 0">
${_conditionType_} a.payExpire not in
<foreach collection="conditionParamRef.payExpireNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('payExpireStart') and conditionParamRef.payExpireStart != null">
${_conditionType_} a.payExpire <![CDATA[ >= ]]> #{${_conditionParam_}.payExpireStart}
</if>
<if test="conditionParamRef.containsKey('payExpireEnd') and conditionParamRef.payExpireEnd != null">
${_conditionType_} a.payExpire <![CDATA[ <= ]]> #{${_conditionParam_}.payExpireEnd}
</if>
<if test="conditionParamRef.containsKey('payStatus')">
<if test="conditionParamRef.payStatus != null ">
${_conditionType_} a.payStatus = #{${_conditionParam_}.payStatus}
</if>
<if test="conditionParamRef.payStatus == null">
${_conditionType_} a.payStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('payStatusList') and conditionParamRef.payStatusList.size() > 0">
${_conditionType_} a.payStatus in
<foreach collection="conditionParamRef.payStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('payStatusNotList') and conditionParamRef.payStatusNotList.size() > 0">
${_conditionType_} a.payStatus not in
<foreach collection="conditionParamRef.payStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('payStatusStart') and conditionParamRef.payStatusStart != null">
${_conditionType_} a.payStatus <![CDATA[ >= ]]> #{${_conditionParam_}.payStatusStart}
</if>
<if test="conditionParamRef.containsKey('payStatusEnd') and conditionParamRef.payStatusEnd != null">
${_conditionType_} a.payStatus <![CDATA[ <= ]]> #{${_conditionParam_}.payStatusEnd}
</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
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
field(a.printQueueId,
<foreach collection="conditionParamRef.printQueueIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('payExpireList') and conditionParamRef.payExpireList.size() > 0">
field(a.payExpire,
<foreach collection="conditionParamRef.payExpireList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('payStatusList') and conditionParamRef.payStatusList.size() > 0">
field(a.payStatus,
<foreach collection="conditionParamRef.payStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
field(a.printQueueId,
<foreach collection="conditionParamRef.printQueueIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('payExpireList') and conditionParamRef.payExpireList.size() > 0">
field(a.payExpire,
<foreach collection="conditionParamRef.payExpireList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('payStatusList') and conditionParamRef.payStatusList.size() > 0">
field(a.payStatus,
<foreach collection="conditionParamRef.payStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<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('applyId')">
a.applyId
<if test='orderCol.applyId != null and "DESC".equalsIgnoreCase(orderCol.applyId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printQueueId')">
a.printQueueId
<if test='orderCol.printQueueId != null and "DESC".equalsIgnoreCase(orderCol.printQueueId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('orderNum')">
a.orderNum
<if test='orderCol.orderNum != null and "DESC".equalsIgnoreCase(orderCol.orderNum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('amount')">
a.amount
<if test='orderCol.amount != null and "DESC".equalsIgnoreCase(orderCol.amount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('orderDate')">
a.orderDate
<if test='orderCol.orderDate != null and "DESC".equalsIgnoreCase(orderCol.orderDate)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('qrcodeUrl')">
a.qrcodeUrl
<if test='orderCol.qrcodeUrl != null and "DESC".equalsIgnoreCase(orderCol.qrcodeUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('payExpire')">
a.payExpire
<if test='orderCol.payExpire != null and "DESC".equalsIgnoreCase(orderCol.payExpire)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('payStatus')">
a.payStatus
<if test='orderCol.payStatus != null and "DESC".equalsIgnoreCase(orderCol.payStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 454eb4ff
......@@ -38,10 +38,10 @@
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
<result property="charge" column="charge" />
<result property="amount" column="amount" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
......@@ -144,23 +144,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('charge') or colPickMode == 1 and data.containsKey('charge')))">
a.charge,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amount') or colPickMode == 1 and data.containsKey('amount')))">
a.amount,
</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,templateId,templateName,mobile)
(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,templateId,templateName,mobile,charge,amount)
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},#{templateId},#{templateName},#{mobile})
(#{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},#{templateId},#{templateName},#{mobile},#{charge},#{amount})
</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,templateId,templateName,mobile)
(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,templateId,templateName,mobile,charge,amount)
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.templateId},#{item.templateName},#{item.mobile})
(#{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.templateId},#{item.templateName},#{item.mobile},#{item.charge},#{item.amount})
</foreach>
</insert>
......@@ -299,6 +305,18 @@
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
<if test="(colPickMode==0 and data.containsKey('charge')) or (colPickMode==1 and !data.containsKey('charge'))">
a.charge=#{data.charge},
</if>
<if test="(colPickMode==0 and data.containsKey('chargeIncrement')) or (colPickMode==1 and !data.containsKey('chargeIncrement'))">
a.charge=ifnull(a.charge,0) + #{data.chargeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('amount')) or (colPickMode==1 and !data.containsKey('amount'))">
a.amount=#{data.amount},
</if>
<if test="(colPickMode==0 and data.containsKey('amountIncrement')) or (colPickMode==1 and !data.containsKey('amountIncrement'))">
a.amount=ifnull(a.amount,0) + #{data.amountIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -590,6 +608,30 @@
</if>
</foreach>
</trim>
<trim prefix="charge=(case" suffix="ELSE charge end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('charge')) or (colPickMode==1 and !item.containsKey('charge'))">
when a.id=#{item.id} then #{item.charge}
</when>
<when test="(colPickMode==0 and item.containsKey('chargeIncrement')) or (colPickMode==1 and !item.containsKey('chargeIncrement'))">
when a.id=#{item.id} then ifnull(a.charge,0) + #{item.chargeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="amount=(case" suffix="ELSE amount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('amount')) or (colPickMode==1 and !item.containsKey('amount'))">
when a.id=#{item.id} then #{item.amount}
</when>
<when test="(colPickMode==0 and item.containsKey('amountIncrement')) or (colPickMode==1 and !item.containsKey('amountIncrement'))">
when a.id=#{item.id} then ifnull(a.amount,0) + #{item.amountIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -701,6 +743,10 @@
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
......@@ -1441,18 +1487,268 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('charge')">
<if test="conditionParamRef.charge != null ">
${_conditionType_} a.charge = #{${_conditionParam_}.charge}
</if>
<if test="conditionParamRef.charge == null">
${_conditionType_} a.charge is null
</if>
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
${_conditionType_} a.charge in
<foreach collection="conditionParamRef.chargeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('chargeNotList') and conditionParamRef.chargeNotList.size() > 0">
${_conditionType_} a.charge not in
<foreach collection="conditionParamRef.chargeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('chargeStart') and conditionParamRef.chargeStart != null">
${_conditionType_} a.charge <![CDATA[ >= ]]> #{${_conditionParam_}.chargeStart}
</if>
<if test="conditionParamRef.containsKey('chargeEnd') and conditionParamRef.chargeEnd != null">
${_conditionType_} a.charge <![CDATA[ <= ]]> #{${_conditionParam_}.chargeEnd}
</if>
<if test="conditionParamRef.containsKey('amount')">
<if test="conditionParamRef.amount != null ">
${_conditionType_} a.amount = #{${_conditionParam_}.amount}
</if>
<if test="conditionParamRef.amount == null">
${_conditionType_} a.amount is null
</if>
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
${_conditionType_} a.amount in
<foreach collection="conditionParamRef.amountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountNotList') and conditionParamRef.amountNotList.size() > 0">
${_conditionType_} a.amount not in
<foreach collection="conditionParamRef.amountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountStart') and conditionParamRef.amountStart != null">
${_conditionType_} a.amount <![CDATA[ >= ]]> #{${_conditionParam_}.amountStart}
</if>
<if test="conditionParamRef.containsKey('amountEnd') and conditionParamRef.amountEnd != null">
${_conditionType_} a.amount <![CDATA[ <= ]]> #{${_conditionParam_}.amountEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
field(a.recordId,
<foreach collection="conditionParamRef.recordIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
field(a.holderType,
<foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
field(a.holderIdType,
<foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('generateStatusList') and conditionParamRef.generateStatusList.size() > 0">
field(a.generateStatus,
<foreach collection="conditionParamRef.generateStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('operTypeList') and conditionParamRef.operTypeList.size() > 0">
field(a.operType,
<foreach collection="conditionParamRef.operTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordStatusList') and conditionParamRef.recordStatusList.size() > 0">
field(a.recordStatus,
<foreach collection="conditionParamRef.recordStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
field(a.charge,
<foreach collection="conditionParamRef.chargeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
field(a.recordId,
<foreach collection="conditionParamRef.recordIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
field(a.holderType,
<foreach collection="conditionParamRef.holderTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
field(a.holderIdType,
<foreach collection="conditionParamRef.holderIdTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('generateStatusList') and conditionParamRef.generateStatusList.size() > 0">
field(a.generateStatus,
<foreach collection="conditionParamRef.generateStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('operTypeList') and conditionParamRef.operTypeList.size() > 0">
field(a.operType,
<foreach collection="conditionParamRef.operTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordStatusList') and conditionParamRef.recordStatusList.size() > 0">
field(a.recordStatus,
<foreach collection="conditionParamRef.recordStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
field(a.charge,
<foreach collection="conditionParamRef.chargeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1619,8 +1915,20 @@
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('charge')">
a.charge
<if test='orderCol.charge != null and "DESC".equalsIgnoreCase(orderCol.charge)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('amount')">
a.amount
<if test='orderCol.amount != null and "DESC".equalsIgnoreCase(orderCol.amount)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 454eb4ff
......@@ -28,10 +28,11 @@
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
<result property="faceUrl" column="faceUrl" />
<result property="signUrl" column="signUrl" />
<result property="printQueueId" column="printQueueId" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
......@@ -104,23 +105,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('faceUrl') or colPickMode == 1 and data.containsKey('faceUrl')))">
a.faceUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('signUrl') or colPickMode == 1 and data.containsKey('signUrl')))">
a.signUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printQueueId') or colPickMode == 1 and data.containsKey('printQueueId')))">
a.printQueueId,
</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,templateId,templateName,mobile)
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile,faceUrl,signUrl,printQueueId)
VALUES
(#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{templateId},#{templateName},#{mobile})
(#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{templateId},#{templateName},#{mobile},#{faceUrl},#{signUrl},#{printQueueId})
</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,templateId,templateName,mobile)
(catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile,faceUrl,signUrl,printQueueId)
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.templateId},#{item.templateName},#{item.mobile})
(#{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.templateId},#{item.templateName},#{item.mobile},#{item.faceUrl},#{item.signUrl},#{item.printQueueId})
</foreach>
</insert>
......@@ -217,6 +227,18 @@
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
<if test="(colPickMode==0 and data.containsKey('faceUrl')) or (colPickMode==1 and !data.containsKey('faceUrl'))">
a.faceUrl=#{data.faceUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('signUrl')) or (colPickMode==1 and !data.containsKey('signUrl'))">
a.signUrl=#{data.signUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('printQueueId')) or (colPickMode==1 and !data.containsKey('printQueueId'))">
a.printQueueId=#{data.printQueueId},
</if>
<if test="(colPickMode==0 and data.containsKey('printQueueIdIncrement')) or (colPickMode==1 and !data.containsKey('printQueueIdIncrement'))">
a.printQueueId=ifnull(a.printQueueId,0) + #{data.printQueueIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -418,6 +440,32 @@
</if>
</foreach>
</trim>
<trim prefix="faceUrl=(case" suffix="ELSE faceUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('faceUrl')) or (colPickMode==1 and !item.containsKey('faceUrl'))">
when a.id=#{item.id} then #{item.faceUrl}
</if>
</foreach>
</trim>
<trim prefix="signUrl=(case" suffix="ELSE signUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('signUrl')) or (colPickMode==1 and !item.containsKey('signUrl'))">
when a.id=#{item.id} then #{item.signUrl}
</if>
</foreach>
</trim>
<trim prefix="printQueueId=(case" suffix="ELSE printQueueId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('printQueueId')) or (colPickMode==1 and !item.containsKey('printQueueId'))">
when a.id=#{item.id} then #{item.printQueueId}
</when>
<when test="(colPickMode==0 and item.containsKey('printQueueIdIncrement')) or (colPickMode==1 and !item.containsKey('printQueueIdIncrement'))">
when a.id=#{item.id} then ifnull(a.printQueueId,0) + #{item.printQueueIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -529,6 +577,10 @@
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
......@@ -1047,18 +1099,213 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('faceUrl')">
<if test="conditionParamRef.faceUrl != null and conditionParamRef.faceUrl != ''">
${_conditionType_} a.faceUrl like #{${_conditionParam_}.faceUrl}
</if>
<if test="conditionParamRef.faceUrl == null">
${_conditionType_} a.faceUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('faceUrlList') and conditionParamRef.faceUrlList.size() > 0">
${_conditionType_} a.faceUrl in
<foreach collection="conditionParamRef.faceUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('faceUrlNotList') and conditionParamRef.faceUrlNotList.size() > 0">
${_conditionType_} a.faceUrl not in
<foreach collection="conditionParamRef.faceUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('signUrl')">
<if test="conditionParamRef.signUrl != null and conditionParamRef.signUrl != ''">
${_conditionType_} a.signUrl like #{${_conditionParam_}.signUrl}
</if>
<if test="conditionParamRef.signUrl == null">
${_conditionType_} a.signUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('signUrlList') and conditionParamRef.signUrlList.size() > 0">
${_conditionType_} a.signUrl in
<foreach collection="conditionParamRef.signUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('signUrlNotList') and conditionParamRef.signUrlNotList.size() > 0">
${_conditionType_} a.signUrl not in
<foreach collection="conditionParamRef.signUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printQueueId')">
<if test="conditionParamRef.printQueueId != null ">
${_conditionType_} a.printQueueId = #{${_conditionParam_}.printQueueId}
</if>
<if test="conditionParamRef.printQueueId == null">
${_conditionType_} a.printQueueId is null
</if>
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
${_conditionType_} a.printQueueId in
<foreach collection="conditionParamRef.printQueueIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printQueueIdNotList') and conditionParamRef.printQueueIdNotList.size() > 0">
${_conditionType_} a.printQueueId not in
<foreach collection="conditionParamRef.printQueueIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printQueueIdStart') and conditionParamRef.printQueueIdStart != null">
${_conditionType_} a.printQueueId <![CDATA[ >= ]]> #{${_conditionParam_}.printQueueIdStart}
</if>
<if test="conditionParamRef.containsKey('printQueueIdEnd') and conditionParamRef.printQueueIdEnd != null">
${_conditionType_} a.printQueueId <![CDATA[ <= ]]> #{${_conditionParam_}.printQueueIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
field(a.printStatus,
<foreach collection="conditionParamRef.printStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
field(a.deviceId,
<foreach collection="conditionParamRef.deviceIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
field(a.printQueueId,
<foreach collection="conditionParamRef.printQueueIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
field(a.printStatus,
<foreach collection="conditionParamRef.printStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
field(a.deviceId,
<foreach collection="conditionParamRef.deviceIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printQueueIdList') and conditionParamRef.printQueueIdList.size() > 0">
field(a.printQueueId,
<foreach collection="conditionParamRef.printQueueIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1175,8 +1422,25 @@
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('faceUrl')">
a.faceUrl
<if test='orderCol.faceUrl != null and "DESC".equalsIgnoreCase(orderCol.faceUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('signUrl')">
a.signUrl
<if test='orderCol.signUrl != null and "DESC".equalsIgnoreCase(orderCol.signUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printQueueId')">
a.printQueueId
<if test='orderCol.printQueueId != null and "DESC".equalsIgnoreCase(orderCol.printQueueId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml
View file @ 454eb4ff
......@@ -30,10 +30,12 @@
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="mobile" column="mobile" />
<result property="charge" column="charge" />
<result property="amount" column="amount" />
<result property="paystatus" column="paystatus" />
<result property="orderNum" column="orderNum" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
......@@ -112,23 +114,35 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('charge') or colPickMode == 1 and data.containsKey('charge')))">
a.charge,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amount') or colPickMode == 1 and data.containsKey('amount')))">
a.amount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('paystatus') or colPickMode == 1 and data.containsKey('paystatus')))">
a.paystatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderNum') or colPickMode == 1 and data.containsKey('orderNum')))">
a.orderNum,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_wait_queue
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,mobile)
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,mobile,charge,amount,paystatus,orderNum)
VALUES
(#{siteId},#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{mobile})
(#{siteId},#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{mobile},#{charge},#{amount},#{paystatus},#{orderNum})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_wait_queue
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,mobile)
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,mobile,charge,amount,paystatus,orderNum)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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},#{item.mobile})
(#{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},#{item.mobile},#{item.charge},#{item.amount},#{item.paystatus},#{item.orderNum})
</foreach>
</insert>
......@@ -237,6 +251,27 @@
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
<if test="(colPickMode==0 and data.containsKey('charge')) or (colPickMode==1 and !data.containsKey('charge'))">
a.charge=#{data.charge},
</if>
<if test="(colPickMode==0 and data.containsKey('chargeIncrement')) or (colPickMode==1 and !data.containsKey('chargeIncrement'))">
a.charge=ifnull(a.charge,0) + #{data.chargeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('amount')) or (colPickMode==1 and !data.containsKey('amount'))">
a.amount=#{data.amount},
</if>
<if test="(colPickMode==0 and data.containsKey('amountIncrement')) or (colPickMode==1 and !data.containsKey('amountIncrement'))">
a.amount=ifnull(a.amount,0) + #{data.amountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('paystatus')) or (colPickMode==1 and !data.containsKey('paystatus'))">
a.paystatus=#{data.paystatus},
</if>
<if test="(colPickMode==0 and data.containsKey('paystatusIncrement')) or (colPickMode==1 and !data.containsKey('paystatusIncrement'))">
a.paystatus=ifnull(a.paystatus,0) + #{data.paystatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('orderNum')) or (colPickMode==1 and !data.containsKey('orderNum'))">
a.orderNum=#{data.orderNum},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -462,6 +497,49 @@
</if>
</foreach>
</trim>
<trim prefix="charge=(case" suffix="ELSE charge end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('charge')) or (colPickMode==1 and !item.containsKey('charge'))">
when a.id=#{item.id} then #{item.charge}
</when>
<when test="(colPickMode==0 and item.containsKey('chargeIncrement')) or (colPickMode==1 and !item.containsKey('chargeIncrement'))">
when a.id=#{item.id} then ifnull(a.charge,0) + #{item.chargeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="amount=(case" suffix="ELSE amount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('amount')) or (colPickMode==1 and !item.containsKey('amount'))">
when a.id=#{item.id} then #{item.amount}
</when>
<when test="(colPickMode==0 and item.containsKey('amountIncrement')) or (colPickMode==1 and !item.containsKey('amountIncrement'))">
when a.id=#{item.id} then ifnull(a.amount,0) + #{item.amountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="paystatus=(case" suffix="ELSE paystatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('paystatus')) or (colPickMode==1 and !item.containsKey('paystatus'))">
when a.id=#{item.id} then #{item.paystatus}
</when>
<when test="(colPickMode==0 and item.containsKey('paystatusIncrement')) or (colPickMode==1 and !item.containsKey('paystatusIncrement'))">
when a.id=#{item.id} then ifnull(a.paystatus,0) + #{item.paystatusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="orderNum=(case" suffix="ELSE orderNum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('orderNum')) or (colPickMode==1 and !item.containsKey('orderNum'))">
when a.id=#{item.id} then #{item.orderNum}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -573,6 +651,10 @@
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="permissionSql != null and permissionSql != ''">
${permissionSql}
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
......@@ -932,7 +1014,7 @@
<if test="conditionParamRef.containsKey('pickerIDCardNo')">
<if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''">
${_conditionType_} a.pickerIDCardNo like CONCAT(LEFT(#{${_conditionParam_}.pickerIDCardNo},4),'%') ${_conditionType_} a.pickerIDCardNo like CONCAT('%',right(#{${_conditionParam_}.pickerIDCardNo},4))
${_conditionType_} a.pickerIDCardNo like #{${_conditionParam_}.pickerIDCardNo}
</if>
<if test="conditionParamRef.pickerIDCardNo == null">
${_conditionType_} a.pickerIDCardNo is null
......@@ -1151,18 +1233,302 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('charge')">
<if test="conditionParamRef.charge != null ">
${_conditionType_} a.charge = #{${_conditionParam_}.charge}
</if>
<if test="conditionParamRef.charge == null">
${_conditionType_} a.charge is null
</if>
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
${_conditionType_} a.charge in
<foreach collection="conditionParamRef.chargeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('chargeNotList') and conditionParamRef.chargeNotList.size() > 0">
${_conditionType_} a.charge not in
<foreach collection="conditionParamRef.chargeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('chargeStart') and conditionParamRef.chargeStart != null">
${_conditionType_} a.charge <![CDATA[ >= ]]> #{${_conditionParam_}.chargeStart}
</if>
<if test="conditionParamRef.containsKey('chargeEnd') and conditionParamRef.chargeEnd != null">
${_conditionType_} a.charge <![CDATA[ <= ]]> #{${_conditionParam_}.chargeEnd}
</if>
<if test="conditionParamRef.containsKey('amount')">
<if test="conditionParamRef.amount != null ">
${_conditionType_} a.amount = #{${_conditionParam_}.amount}
</if>
<if test="conditionParamRef.amount == null">
${_conditionType_} a.amount is null
</if>
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
${_conditionType_} a.amount in
<foreach collection="conditionParamRef.amountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountNotList') and conditionParamRef.amountNotList.size() > 0">
${_conditionType_} a.amount not in
<foreach collection="conditionParamRef.amountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amountStart') and conditionParamRef.amountStart != null">
${_conditionType_} a.amount <![CDATA[ >= ]]> #{${_conditionParam_}.amountStart}
</if>
<if test="conditionParamRef.containsKey('amountEnd') and conditionParamRef.amountEnd != null">
${_conditionType_} a.amount <![CDATA[ <= ]]> #{${_conditionParam_}.amountEnd}
</if>
<if test="conditionParamRef.containsKey('paystatus')">
<if test="conditionParamRef.paystatus != null ">
${_conditionType_} a.paystatus = #{${_conditionParam_}.paystatus}
</if>
<if test="conditionParamRef.paystatus == null">
${_conditionType_} a.paystatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('paystatusList') and conditionParamRef.paystatusList.size() > 0">
${_conditionType_} a.paystatus in
<foreach collection="conditionParamRef.paystatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paystatusNotList') and conditionParamRef.paystatusNotList.size() > 0">
${_conditionType_} a.paystatus not in
<foreach collection="conditionParamRef.paystatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paystatusStart') and conditionParamRef.paystatusStart != null">
${_conditionType_} a.paystatus <![CDATA[ >= ]]> #{${_conditionParam_}.paystatusStart}
</if>
<if test="conditionParamRef.containsKey('paystatusEnd') and conditionParamRef.paystatusEnd != null">
${_conditionType_} a.paystatus <![CDATA[ <= ]]> #{${_conditionParam_}.paystatusEnd}
</if>
<if test="conditionParamRef.containsKey('orderNum')">
<if test="conditionParamRef.orderNum != null and conditionParamRef.orderNum != ''">
${_conditionType_} a.orderNum like #{${_conditionParam_}.orderNum}
</if>
<if test="conditionParamRef.orderNum == null">
${_conditionType_} a.orderNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('orderNumList') and conditionParamRef.orderNumList.size() > 0">
${_conditionType_} a.orderNum in
<foreach collection="conditionParamRef.orderNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderNumNotList') and conditionParamRef.orderNumNotList.size() > 0">
${_conditionType_} a.orderNum not in
<foreach collection="conditionParamRef.orderNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
field(a.recordId,
<foreach collection="conditionParamRef.recordIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
field(a.printStatus,
<foreach collection="conditionParamRef.printStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
field(a.charge,
<foreach collection="conditionParamRef.chargeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('paystatusList') and conditionParamRef.paystatusList.size() > 0">
field(a.paystatus,
<foreach collection="conditionParamRef.paystatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
field(a.recordId,
<foreach collection="conditionParamRef.recordIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
field(a.applyId,
<foreach collection="conditionParamRef.applyIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
field(a.catalogId,
<foreach collection="conditionParamRef.catalogIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
field(a.templateId,
<foreach collection="conditionParamRef.templateIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
field(a.printStatus,
<foreach collection="conditionParamRef.printStatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
field(a.total,
<foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('chargeList') and conditionParamRef.chargeList.size() > 0">
field(a.charge,
<foreach collection="conditionParamRef.chargeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('amountList') and conditionParamRef.amountList.size() > 0">
field(a.amount,
<foreach collection="conditionParamRef.amountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('paystatusList') and conditionParamRef.paystatusList.size() > 0">
field(a.paystatus,
<foreach collection="conditionParamRef.paystatusList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1289,8 +1655,30 @@
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('charge')">
a.charge
<if test='orderCol.charge != null and "DESC".equalsIgnoreCase(orderCol.charge)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('amount')">
a.amount
<if test='orderCol.amount != null and "DESC".equalsIgnoreCase(orderCol.amount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('paystatus')">
a.paystatus
<if test='orderCol.paystatus != null and "DESC".equalsIgnoreCase(orderCol.paystatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('orderNum')">
a.orderNum
<if test='orderCol.orderNum != null and "DESC".equalsIgnoreCase(orderCol.orderNum)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
pom.xml
View file @ 454eb4ff
......@@ -81,6 +81,15 @@
<useDefaultDelimiters>false</useDefaultDelimiters>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
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