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 | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 5 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 9fd5b0a..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,19 +3,27 @@
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;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
/**
- * 【请填写功能名称】对象 non_coal_pay_student
+ * 非煤缴费管理学员对象 non_coal_pay_student
*
* @author hh
* @date 2025-01-16
*/
@TableName("non_coal_pay_student")
+@ApiModel(value = "非煤缴费管理学员对象", description = "非煤缴费管理学员对象")
public class NonCoalPayStudent extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -25,48 +33,82 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
/**
* 缴费id
*/
- @Excel(name = "缴费id")
+ @NotNull(message = "参数不能为空")
+ @ApiModelProperty("缴费管理id")
private Long nonCoalPayId;
/**
* 姓名
*/
@Excel(name = "姓名")
+ @NotBlank(message = "姓名不能为空")
+ @ApiModelProperty("姓名")
private String name;
/**
* 身份证号
*/
@Excel(name = "身份证号")
+ @NotBlank(message = "身份证号不能为空")
+ @ApiModelProperty("身份证号")
private String idCard;
/**
* 电话
*/
@Excel(name = "电话")
+ @NotBlank(message = "电话不能为空")
+ @ApiModelProperty("电话")
private String phone;
/**
* 0男 1女 2未知
*/
- @Excel(name = "0男 1女 2未知")
+ @Excel(name = "性别")
+ @ApiModelProperty("性别 0男1女2未知")
private Long sex;
/**
* 财政缴款码
*/
- @Excel(name = "财政缴款码")
+ @ApiModelProperty("财政缴款码")
private String payCode;
/**
* 是否缴款0否1是
*/
- @Excel(name = "是否缴款0否1是")
+ @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代表删除）
*/
@@ -162,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