From 752ff7ce8f54046997db37dd27eaa856a184450b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 18 Apr 2023 21:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/controller/inout/IoOrderDetailBizController.java | 1 +
.../com/glxp/api/entity/inout/IoOrderDetailBizEntity.java | 2 +-
.../com/glxp/api/req/basic/FilterBussinessTypeRequest.java | 2 ++
.../resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml | 5 ++++-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index d1d32380..84779fcc 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -50,6 +50,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
index 285e4f43..15b29ced 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
@@ -92,7 +92,7 @@ public class IoOrderDetailBizEntity {
/**
* 价格
*/
- @TableField(value = "price")
+ @TableField(value = "price",fill = FieldFill.UPDATE)
private BigDecimal price;
/**
diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
index 7f7cf364..badabe9b 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
@@ -112,5 +112,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
private Integer corpType;
private Integer sortNum;
+ private Integer actionType;
+
}
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index aeb13d77..28f26620 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -33,6 +33,9 @@
AND bu.secCheckEnable = #{secCheckEnable}
+
+ AND bu.actionType = #{actionType}
+
AND bu.busType = #{busType}
@@ -52,7 +55,7 @@
]]>
- order by bu.sortNum desc
+ order by bu.sortNum