From 02fa12e93281fea472323201e5eb6ab55466a63d Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 23 一月 2025 08:35:48 +0800
Subject: [PATCH] 特种作业非煤缴费版本导入优化

---
 exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java |   68 +++++++++++++++++++++++++++++++---
 1 files changed, 62 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..9d1ce1a 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,38 @@
     /**
      * 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代表存在2代表删除）
      */
@@ -179,4 +195,44 @@
                 .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;
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.2