From 70dcf4e610a0ec5fd6ca2c3daf9edf4957b30529 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 25 二月 2025 16:34:46 +0800
Subject: [PATCH] 考试制证修改
---
exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java | 93 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 87 insertions(+), 6 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java b/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
index 090264d..b69a4b7 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
@@ -31,10 +33,10 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
/**
* 缴费id
*/
- @Excel(name = "缴费id")
@NotNull(message = "参数不能为空")
@ApiModelProperty("缴费管理id")
private Long nonCoalPayId;
@@ -66,24 +68,47 @@
/**
* 0男 1女 2未知
*/
- @Excel(name = "0男 1女 2未知")
- @ApiModelProperty("性别")
+ @Excel(name = "性别")
+ @ApiModelProperty("性别 0男1女2未知")
private Long sex;
/**
* 财政缴款码
*/
- @Excel(name = "财政缴款码")
@ApiModelProperty("财政缴款码")
private String payCode;
/**
* 是否缴款0否1是
*/
- @Excel(name = "是否缴款0否1是")
- @ApiModelProperty("是否缴款")
+ @ApiModelProperty("是否缴款0否1是")
private Long payStatus;
+ @ApiModelProperty("缴费类型1个人 2团体")
+ private Long payType;
+
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty("财政订单编号")
+ private String orderId;
+
+ @ApiModelProperty("财政缴款凭证")
+ private String fileData;
+
+ @ApiModelProperty("缴费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 财政订单状态0未生成1生成中2未生成
+ */
+ @ApiModelProperty("财政订单状态0未生成1生成中2已生成")
+ private Integer govPayStatus;
+
+ @ApiModelProperty("培训机构")
+ private String train;
/**
* 删除标志（0代表存在2代表删除）
*/
@@ -179,4 +204,60 @@
.append("delFlag", getDelFlag())
.toString();
}
+
+ public Long getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Long payType) {
+ this.payType = payType;
+ }
+
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
+ public String getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
+
+ public Date getPayTime() {
+ return payTime;
+ }
+
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
+ }
+
+ public Integer getGovPayStatus() {
+ return govPayStatus;
+ }
+
+ public void setGovPayStatus(Integer govPayStatus) {
+ this.govPayStatus = govPayStatus;
+ }
+
+ public String getTrain() {
+ return train;
+ }
+
+ public void setTrain(String train) {
+ this.train = train;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2