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/dto/rep/NonCoalPayDetailH5RepDto.java | 7 +++++++
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 7 +++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
index e2f36b3..c1dd6b4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
@@ -1,8 +1,11 @@
package com.gkhy.exam.pay.dto.rep;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
@@ -43,4 +46,8 @@
@ApiModelProperty("财政缴款编码")
private String orderId;
+ @ApiModelProperty("填报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
}
\ No newline at end of file
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index be83da0..b273dae 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -52,7 +52,8 @@
<result property="categoryAmount" column="category_amount"/>
</resultMap>
- <resultMap id="getNonCoalPayResultH5" type="com.gkhy.exam.pay.dto.rep.NonCoalPayDetailH5RepDto">
+ <resultMap id="getNonCoalPayResultH5" type="com.gkhy.exam.pay.dto.rep.NonCoalPayDetailH5RepDto"
+ extends="getNonCoalPayResult">
<result property="nonCoalStudentId" column="non_coal_student_id"/>
<result property="phone" column="phone"/>
<result property="idCard" column="id_card"/>
@@ -62,6 +63,7 @@
<result property="fileData" column="file_data"/>
<result property="nonCoalPayType" column="non_coal_pay_type"/>
<result property="orderId" column="order_id"/>
+ <result property="createTime" column="create_time"/>
</resultMap>
@@ -185,7 +187,8 @@
-- t.gov_pay_status,
t.file_data,
t.pay_type as non_coal_pay_type,
- t.order_id
+ t.order_id,
+ t.create_time
from non_coal_pay a
inner join non_coal_pay_student t on t.non_coal_pay_id = a.id and t.del_flag = 0
inner join non_coal_pay_category b on a.id = b.non_coal_pay_id and b.del_flag = 0
--
Gitblit v1.9.2