From 3e7339cc3e182ce7a6b47993998beef5ecc8e163 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 7 Nov 2024 17:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=80=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataAnalysisServiceImpl.java  |  2 +-
 .../op/open/service/impl/OpenServiceImpl.java  | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
index d0a40e1b..d3954431 100644
--- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
+++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java
@@ -1017,7 +1017,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         List<ReportOrderEnergyDTO> reportOrderEnergyDTOList = reportPointDnbMapper.OrderEnergyList(reportOrderEnergyDTO);
         if (reportOrderEnergyDTOList != null && reportOrderEnergyDTOList.size() > 0) {
             for (int i = 0; i < reportOrderEnergyDTOList.size(); i++) {
-                if (reportOrderEnergyDTOList.get(i).getElectricityNo() != null && reportOrderEnergyDTOList.get(i).getStartWorkTime() != null && reportOrderEnergyDTOList.get(i).getEndWorkTime() != null) {
+                if ((reportOrderEnergyDTOList.get(i).getElectricityNo() != null && !reportOrderEnergyDTOList.get(i).getElectricityNo().isEmpty())  && reportOrderEnergyDTOList.get(i).getStartWorkTime() != null && reportOrderEnergyDTOList.get(i).getEndWorkTime() != null) {
                     //获取这个工单所在产线的电表编号
                     String monitorid = reportOrderEnergyDTOList.get(i).getElectricityNo();
                     //获取这个工单的开始日期和结束日期
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 0627c90b..a06451f9 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -1,8 +1,10 @@
 package com.op.open.service.impl;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.constant.Constants;
 import com.op.common.core.utils.DateUtils;
@@ -792,23 +794,7 @@ public class OpenServiceImpl implements OpenService {
         return false;
     }
 
-    public static void main(String args[]){
-//        // 创建两个日期时间对象
-//        LocalDateTime dateTime1 = LocalDateTime.of(2024, 4, 18, 9, 33); // 2023年1月1日 10:30
-//        LocalDateTime dateTime2 = LocalDateTime.now(); // 2023年1月2日 11:45
-//        // 计算分钟差
-//        long minutesBetween = Duration.between(dateTime1, dateTime2).toMinutes();
-//        if(minutesBetween<=1){
-//            System.out.println("++++++++++++检验任务1分钟内生成过，不再重复创建++++++++++++++");
-//        }
 
-        int f = -100;
-        if(f != -100){
-            System.out.println("-100");
-        }else{
-            System.out.println("0");
-        }
-    }
 
     @Override
     public AjaxResult getDeliveryNoteDetail(Map paramMap) {