From 1d14dbbf2005f38ced5a20e29acd1298efe2a318 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Wed, 22 Jan 2025 15:55:26 +0800
Subject: [PATCH] 特种作业非煤缴费版本导入优化
---
exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java | 20 +++++++--
exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java | 16 ++++---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java | 4 +-
exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml | 7 ++-
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 19 +++++++--
5 files changed, 44 insertions(+), 22 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 abf6597..e2f36b3 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
@@ -16,10 +16,6 @@
public class NonCoalPayDetailH5RepDto extends NonCoalPayDetailRepDto {
private static final long serialVersionUID = 1L;
-
- /**
- *
- */
@ApiModelProperty("交款人数据id")
private Long nonCoalStudentId;
@@ -29,8 +25,22 @@
@ApiModelProperty("缴费人身份证号")
private String idCard;
-
@ApiModelProperty("缴费人名称")
private String studentName;
+ @ApiModelProperty("缴费状态0否1是")
+ private Integer payStatus;
+
+// @ApiModelProperty("待定财政缴费状态0未缴费1缴费中2完成缴费")
+// private Long govPayStatus;
+
+ @ApiModelProperty("缴费凭证")
+ private String fileData;
+
+ @ApiModelProperty("交款类型1个人2团体")
+ private Long nonCoalPayType;
+
+ @ApiModelProperty("财政缴款编码")
+ private String orderId;
+
}
\ No newline at end of file
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 dec9855..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;
/**
@@ -95,8 +97,9 @@
@ApiModelProperty("财政缴款凭证")
private String fileData;
- @ApiModelProperty("财政缴费状态0未缴费1缴费中2完成缴费")
- private Long govPayStatus;
+ @ApiModelProperty("缴费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
/**
* 删除标志（0代表存在2代表删除）
*/
@@ -225,12 +228,11 @@
this.fileData = fileData;
}
- public Long getGovPayStatus() {
- return govPayStatus;
+ public Date getPayTime() {
+ return payTime;
}
- public void setGovPayStatus(Long govPayStatus) {
- this.govPayStatus = govPayStatus;
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
}
-
}
\ No newline at end of file
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
index d42cd8a..3b78a96 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
@@ -72,7 +72,7 @@
NonCoalPay nonCoalPay = checkNonCoalPay(nonCoalPayStudent.getNonCoalPayId());
nonCoalPayStudent.setPayType(nonCoalPay.getPayPersonType().longValue());
// nonCoalPayStudent.setOrderNo(RandomUtil.generateOrderNumber());
- nonCoalPayStudent.setGovPayStatus(0L);
+
nonCoalPayStudent.setCreateBy(SecurityUtils.getUsername());
return nonCoalPayStudentMapper.insertNonCoalPayStudent(nonCoalPayStudent);
}
@@ -212,7 +212,7 @@
stu1.setName(stu.getName());
stu1.setIdCard(stu.getIdCard());
stu1.setPhone(stu.getPhone());
- stu1.setGovPayStatus(0L);
+
// stu1.setOrderNo(RandomUtil.generateOrderNumber());
stu1.setSex(StudentSex.BOY.getStatus().equals(stu.getSex().trim()) ? 0L : 1L);
nonCoalPayStudentMapper.insertNonCoalPayStudent(stu1);
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 9370704..be83da0 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -57,7 +57,11 @@
<result property="phone" column="phone"/>
<result property="idCard" column="id_card"/>
<result property="studentName" column="student_name"/>
-
+ <result property="payStatus" column="pay_status"/>
+ <!-- <result property="govPayStatus" column="gov_pay_status"/>-->
+ <result property="fileData" column="file_data"/>
+ <result property="nonCoalPayType" column="non_coal_pay_type"/>
+ <result property="orderId" column="order_id"/>
</resultMap>
@@ -161,22 +165,27 @@
select a.id,
a.batch_name,
a.dept_id,
- d2.name as district_name,
+ d2.name as district_name,
d.dept_name,
a.district_code,
a.pay_type,
a.amount,
a.year,
a.quarter,
- b.id as non_category_id,
+ b.id as non_category_id,
b.category_id,
c.subject_name,
c.category_type,
b.category_amount,
- t.id as non_coal_student_id,
+ t.id as non_coal_student_id,
t.phone,
t.id_card,
- t.name as student_name
+ t.name as student_name,
+ t.pay_status,
+-- t.gov_pay_status,
+ t.file_data,
+ t.pay_type as non_coal_pay_type,
+ t.order_id
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
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
index 4ef1099..06d44bf 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
@@ -22,7 +22,7 @@
<result property="orderNo" column="order_no"/>
<result property="orderId" column="order_id"/>
<result property="fileData" column="file_data"/>
- <result property="govPayStatus" column="gov_pay_status"/>
+ <result property="payTime" column="pay_time"/>
</resultMap>
<sql id="selectNonCoalPayStudentVo">
@@ -43,7 +43,7 @@
order_no,
order_id,
file_data,
- gov_pay_status
+ pay_time
from non_coal_pay_student
</sql>
@@ -121,9 +121,10 @@
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="sex != null">sex = #{sex},</if>
+ <if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
<if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
<if test="fileData != null and fileData != ''">file_data = #{fileData},</if>
- <if test="govPayStatus != null">gov_pay_status = #{govPayStatus},</if>
+ <if test="payTime != null">pay_time = #{payTime},</if>
<if test="payType != null">pay_type = #{payType},</if>
<if test="payCode != null">pay_code = #{payCode},</if>
<if test="payStatus != null">pay_status = #{payStatus},</if>
--
Gitblit v1.9.2