From 3e77c29858869a45025dae34ea708150065e938b Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Mon, 15 Jul 2024 17:56:15 +0800 Subject: [PATCH] no message --- .../reconciliation/tab/favourable.vue | 4 ++-- .../reconciliation/tab/ref.vue | 4 ++-- .../reconciliation/tab/trading.vue | 4 ++-- .../src/views/handover/HandoverDetails.vue | 6 ++++-- .../src/views/oilConfig/oilInventory/list.vue | 11 +++++++++- .../src/views/oilConfig/oilPurchase/list.vue | 12 ++++++++++- fuintAdmin/src/views/order/order_Added.vue | 6 +++--- fuintAdmin/src/views/order/order_Cashier.vue | 6 ++++-- fuintAdmin/src/views/order/order_Goods.vue | 7 +++++-- fuintAdmin/src/views/order/order_Oil.vue | 4 ++-- fuintAdmin/src/views/order/order_Vip.vue | 6 +++--- .../entity/FavorableRecords.java | 8 ++++++++ .../impl/FavorableRecordsServiceImpl.java | 20 ++++++++++++++++++- 13 files changed, 75 insertions(+), 23 deletions(-) diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue index 69a68662e..e03d8ca08 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue @@ -69,8 +69,8 @@ - - + + diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue index fb92727de..0738ed88c 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue @@ -98,8 +98,8 @@ - - + + diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue index 74e8dbf6b..090fb46db 100644 --- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue +++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue @@ -166,8 +166,8 @@ - - + + diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue index dc2cd5cde..452ef12ef 100644 --- a/fuintAdmin/src/views/handover/HandoverDetails.vue +++ b/fuintAdmin/src/views/handover/HandoverDetails.vue @@ -51,7 +51,8 @@ - + .app-container { width: 100%; - height: 100%; + height: 100vh +; background: #f6f8f9; //padding-top: 0px; //padding: 0px diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue index efa80ac17..63f02c76f 100644 --- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue @@ -30,7 +30,7 @@ 搜索 - + 重置 @@ -204,6 +204,15 @@ export default { this.queryParams.page = 1; this.getList(); }, + resetQuery() { + this.queryParams = { + inventoryNumber:'', + status: '', + page:null, + pageSize:null + }; + this.getList(); + }, } } diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue index 41dc67a07..e28c5f6da 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue @@ -42,7 +42,7 @@ 搜索 - + 重置 @@ -213,6 +213,16 @@ export default { this.queryParams.page = 1; this.getList(); }, + resetQuery() { + this.queryParams = { + supplierId: '', + tankName: '', + status: '', + page:null, + pageSize:null + }; + this.getList(); + }, } } diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index 1f3a1920c..f41020ad7 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -140,9 +140,9 @@ - - - + + +
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 50cb5d877..09f05f948 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -119,8 +119,8 @@
- - + +
@@ -692,6 +692,8 @@ import {refundApi} from "@/api/order/refund"; width: 100%; display: flex; align-items: center; + flex-wrap: wrap; + } .box{ //box-sizing: border-box; diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index b16c5c7a5..3c3b5915b 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -152,8 +152,8 @@
- - + +
@@ -610,6 +610,8 @@ export default { width: 100%; display: flex; align-items: center; + flex-wrap: wrap; + } .box{ //box-sizing: border-box; @@ -624,6 +626,7 @@ export default { background: rgba(64,158,255,0.05); border-radius: 6px 6px 6px 6px; border: 1px solid #409EFF; + } .el-form--inline .el-form-item { margin-right: 44px; diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index 87e7662cc..64b39fc5b 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -184,8 +184,8 @@
- - + +
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index bc39f9be2..b54ee4224 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -145,9 +145,9 @@
- - - + + +
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java index ce02cbec8..32b478c44 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java @@ -3,12 +3,15 @@ package com.fuint.business.marketingActivity.favorableRecords.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serializable; +import java.util.Map; /** * 优惠记录表(FavorableRecords)表实体类 @@ -48,5 +51,10 @@ public class FavorableRecords extends Model { private Date updateTime; + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params; + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java index 1ea1f1169..e815c7142 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java @@ -60,10 +60,28 @@ public class FavorableRecordsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(FavorableRecords::getStoreId, nowAccountInfo.getStoreId()); queryWrapper.eq(FavorableRecords::getChainStoreId, nowAccountInfo.getChainStoreId()); + + if (ObjectUtil.isEmpty(favorableRecords) && ObjectUtil.isEmpty(favorableRecords.getParams())){ + if (ObjectUtil.isEmpty(favorableRecords.getParams().get("beginTime")) && ObjectUtil.isEmpty(favorableRecords.getParams().get("endTime"))) { + queryWrapper.between(FavorableRecords::getCreateTime, favorableRecords.getParams().get("beginTime"), favorableRecords.getParams().get("endTime")); + } else if (favorableRecords.getParams().get("beginTime") != null) { + queryWrapper.ge(FavorableRecords::getCreateTime, favorableRecords.getParams().get("beginTime")); + } else if (favorableRecords.getParams().get("endTime") != null) { + queryWrapper.le(FavorableRecords::getCreateTime, favorableRecords.getParams().get("endTime")); + } + } + + + + if (ObjectUtil.isNotEmpty(favorableRecords.getOrderNo())) { + queryWrapper.like(FavorableRecords::getOrderNo, favorableRecords.getOrderNo()); + + } + if (ObjectUtil.isNotEmpty(favorableRecords.getFavFrom())) queryWrapper.eq(FavorableRecords::getFavFrom, favorableRecords.getFavFrom()); if (ObjectUtil.isNotEmpty(favorableRecords.getFavType())) - queryWrapper.eq(FavorableRecords::getFavType, favorableRecords.getFavType()); + queryWrapper.like(FavorableRecords::getFavType, favorableRecords.getFavType()); if (ObjectUtil.isNotEmpty(favorableRecords.getFavConsumptionType())) queryWrapper.eq(FavorableRecords::getFavConsumptionType, favorableRecords.getFavConsumptionType()); IPage page1 = page(page, queryWrapper);