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 @@