From 1eb0d18ece3d2a7bb55e5176567d2259c9cbf447 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 8 May 2023 09:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java    | 4 ++--
 .../cyf/api/crudeoilstorage/CrudeOilStorageQuery.java      | 2 +-
 .../cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java  | 7 +++++++
 .../cyf/biz/crudeoilstorage/CrudeOilStorageService.java    | 7 +++++++
 .../flowmeterinformation/FlowmeterInformationService.java  | 4 ++++
 .../cyf/biz/tankinformation/TankInformationService.java    | 4 +++-
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
index 52022573..6309604a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
@@ -16,7 +16,7 @@ public class CrudeOilOutboundQuery implements Query {
 
 
     //销售合同编号
-    private String salesContractNumber;
+    private String contractNumber;
     //签订时间
     private String contractSigningDate;
     //流量计sid
@@ -27,5 +27,5 @@ public class CrudeOilOutboundQuery implements Query {
     private String value;
     private String remarks;
     //出库时间
-    private String deliveryDate;
+    private String date;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java
index d7bf6c1d..902b8758 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageQuery.java
@@ -31,5 +31,5 @@ public class CrudeOilStorageQuery implements Query {
     private String supplierSid;
     private String remarks;
     //入库日期
-    private String warehousingDate;
+    private String date;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
index 49a057a0..c09bd42b 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
@@ -19,6 +19,7 @@ import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
 import com.yxt.supervise.cyf.biz.flowmeterinformation.FlowmeterInformationMapper;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +39,12 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
     public PagerVo<CrudeOilOutboundVo> listPageVo(PagerQuery<CrudeOilOutboundQuery> pq) {
         CrudeOilOutboundQuery query = pq.getParams();
         QueryWrapper<CrudeOilOutbound> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getDate())) {
+            qw.eq("STR_TO_DATE(c.deliverDate,'%Y-%m-%d')", query.getDate());
+        }
+        if (StringUtils.isNotBlank(query.getContractNumber())) {
+            qw.like("c.salesContractNumber", query.getContractNumber());
+        }
         IPage<CrudeOilOutbound> page = PagerUtil.queryToPage(pq);
         IPage<CrudeOilOutboundVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<CrudeOilOutboundVo> p = PagerUtil.pageToVo(pagging, null);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
index 37825a8c..91027f05 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
@@ -14,6 +14,7 @@ import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageQuery;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +30,12 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
     public PagerVo<CrudeOilStorageVo> listPageVo(PagerQuery<CrudeOilStorageQuery> pq) {
         CrudeOilStorageQuery query = pq.getParams();
         QueryWrapper<CrudeOilStorage> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getDate())) {
+            qw.eq("STR_TO_DATE(c.warehousingDate,'%Y-%m-%d')", query.getDate());
+        }
+        if (StringUtils.isNotBlank(query.getContractNumber())) {
+            qw.like("c.contractNumber", query.getContractNumber());
+        }
         IPage<CrudeOilStorage> page = PagerUtil.queryToPage(pq);
         IPage<CrudeOilStorageVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<CrudeOilStorageVo> p = PagerUtil.pageToVo(pagging, null);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java
index 9245bf6b..f763d8d9 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/flowmeterinformation/FlowmeterInformationService.java
@@ -12,6 +12,7 @@ import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformation;
 import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationDto;
 import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationQuery;
 import com.yxt.supervise.cyf.api.flowmeterinformation.FlowmeterInformationVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,6 +28,9 @@ public class FlowmeterInformationService extends MybatisBaseService<FlowmeterInf
     public PagerVo<FlowmeterInformationVo> listPageVo(PagerQuery<FlowmeterInformationQuery> pq) {
         FlowmeterInformationQuery query = pq.getParams();
         QueryWrapper<FlowmeterInformation> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("f.name", query.getName());
+        }
         IPage<FlowmeterInformation> page = PagerUtil.queryToPage(pq);
         IPage<FlowmeterInformationVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FlowmeterInformationVo> p = PagerUtil.pageToVo(pagging, null);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
index 1b1bbc71..469bd2dd 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java
@@ -28,13 +28,15 @@ public class TankInformationService extends MybatisBaseService<TankInformationMa
     public PagerVo<TankInformationVo> listPageVo(PagerQuery<TankInformationQuery> pq) {
         TankInformationQuery query = pq.getParams();
         QueryWrapper<TankInformation> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getNumber())) {
+            qw.like("t.number", query.getNumber());
+        }
         IPage<TankInformation> page = PagerUtil.queryToPage(pq);
         IPage<TankInformationVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<TankInformationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
     public List<TankInformationVo> tankList() {
-
         return baseMapper.tankList();
     }
     public ResultBean save(TankInformationDto dto){