From 2572ca2b7e36f4abf7c9f7064cb6ebb75f7d42c0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Jun 2024 18:42:59 +0800 Subject: [PATCH] =?UTF-8?q?6/4=20=E4=BC=98=E5=8C=96=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=E9=97=B4=E4=BB=A5=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=B8=A6=E7=A5=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoOrderController.java | 1 + .../glxp/api/req/inout/FilterOrderDetailResultRequest.java | 2 ++ .../com/glxp/api/res/inout/IoOrderDetailResultResponse.java | 3 +++ .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 4 ++++ src/main/resources/schemas/schema_v2.4.sql | 6 ++++++ 5 files changed, 16 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 051918c96..54e52f217 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1011,6 +1011,7 @@ public class IoOrderController extends BaseController { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateUser(getUserId() + ""); ioOrderEntity.setConfirmUser(getUserId() + ""); + ioOrderEntity.setConfirmTime(new Date()); if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) { ioOrderEntity.setConfirmTime(new Date()); diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index 4bff91714..eb2c06bf8 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -58,4 +58,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String employeeName; private String fromInvName; private String locInvName; + private String confirmStarTime; //发票确认起始日期 + private String confirmEndTime; //发票确认结束日期 } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 0ba0803d0..183fb4329 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -211,6 +211,9 @@ public class IoOrderDetailResultResponse { //金额 private BigDecimal amount; + @ExcelProperty(value = "发票确认时间", index = 12) + private Date confirmTime; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 71a704e3e..869e70f04 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -26,6 +26,7 @@