diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index a532cf62..4e6fbcac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -79,5 +79,25 @@ public class PayPaymentCheckController extends JeroController getLastRecord(String projectId) { + + List list; + try{ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecord::getProjectId, projectId); + wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.TO_BE_REVIEWED.getCode()); + wrapper.orderByDesc(PayPaymentRecord::getCreateTime); + wrapper.last("limit 1"); + list = payPaymentRecordService.list(wrapper); + + }catch (Exception e){ + log.error("审核异常",e); + return Result.error(e.getMessage()); + } + return Result.OK(list.get(0)); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 9e3654e6..3c647cab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.jero.common.aspect.annotation.Dict; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; @@ -17,10 +18,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; /** * @Description: pay_payment_record @@ -105,4 +103,7 @@ public class PayPaymentRecord implements Serializable { @ApiModelProperty(value = "审核时间") private String reviewTime; + + @ApiModelProperty(value = "审核说明") + private String reviewInstructions; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java index cf4962b3..dc821cbd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -103,4 +104,7 @@ public class PayPaymentRecordSub implements Serializable { @ApiModelProperty(value = "审核时间") private String reviewTime; + + @ApiModelProperty(value = "审核说明") + private String reviewInstructions; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index b2e8ccdb..c81c6ddc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -4,10 +4,10 @@