From 9371db15af12aa29224109456fdb7592ce790f37 Mon Sep 17 00:00:00 2001
From: siyang <2337720667@qq.com>
Date: Mon, 9 Sep 2024 09:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A2=B3=E8=B6=B3=E8=BF=B9=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E5=8F=AA?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=AE=8C=E5=B7=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CarbonPubProductionResultServiceImpl.java    | 4 +---
 .../service/impl/IotCarbonProductionResultServiceImpl.java    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionResultServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionResultServiceImpl.java
index db0160d..a8ddea2 100644
--- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionResultServiceImpl.java
+++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionResultServiceImpl.java
@@ -5,7 +5,6 @@ import static com.thing.carbon.pub.entity.table.CarbonPubProductionResultEntityT
 import static com.thing.common.core.enumeration.CarbonLifecycleEnum.*;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryColumn;
@@ -494,8 +493,7 @@ public class CarbonPubProductionResultServiceImpl extends BaseServiceImpl<Carbon
         if(Objects.nonNull(start) && Objects.nonNull(end)){
             Date startDate = sdf.parse(start);
             Date endDate = sdf.parse(end);
-            wrapper.and(CARBON_PUB_PRODUCTION_RESULT_ENTITY.START_TIME.between(startDate, endDate)
-                    .or(CARBON_PUB_PRODUCTION_RESULT_ENTITY.FINISH_TIME.between(startDate, endDate)));
+            wrapper.between(CarbonPubProductionResultEntity::getFinishTime, startDate, endDate);
         }
         return list(wrapper);
     }
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java
index d59c7a4..e8f02c8 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java
@@ -10,7 +10,6 @@ import com.mybatisflex.core.query.QueryColumn;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.carbontrack.production.entity.IotCarbonProductionVarietyEntity;
 import com.thing.carbontrack.production.mapper.IotCarbonProductionVarietyMapper;
-import com.thing.carbontrack.production.service.IotCarbonProductionVarietyService;
 import com.thing.carbontrack.productionResult.dto.*;
 import com.thing.carbontrack.productionResult.entity.IotCarbonProductionResultEntity;
 import com.thing.carbontrack.productionResult.mapper.IotCarbonProductionResultMapper;
@@ -717,8 +716,7 @@ public class IotCarbonProductionResultServiceImpl
         if(Objects.nonNull(start) && Objects.nonNull(end)){
             Date startDate = sdf.parse(start);
             Date endDate = sdf.parse(end);
-            wrapper.and(IOT_CARBON_PRODUCTION_RESULT_ENTITY.START_TIME.between(startDate, endDate)
-                    .or(IOT_CARBON_PRODUCTION_RESULT_ENTITY.FINISH_TIME.between(startDate, endDate)));
+            wrapper.between(IotCarbonProductionResultEntity::getFinishTime, startDate, endDate);
         }
         return list(wrapper);
     }