From dde999cd57973522d54dd2abfa9a2888d322072a Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 28 Jun 2023 16:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E7=BC=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../defect/service/impl/DefectCheckServiceImpl.java          |  4 +++-
 .../defect/service/impl/OperDefectServiceImpl.java           |  4 ++--
 .../main/java/com/hnac/hzims/operational/util/TimeUtils.java | 12 +++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
index 211a043..c7172ab 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
@@ -36,6 +36,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
@@ -115,7 +116,8 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
             throw new ServiceException("保存现象失败！");
         }
         // 步骤2.开启缺陷流程
-        this.startDefectCheckV2(entity);
+        OperPhenomenonEntity operPhenomenon = this.getOne(Condition.getQueryWrapper(entity));
+        this.startDefectCheckV2(operPhenomenon);
         return entity;
     }
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
index 94e5e4d..e9944b7 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
@@ -159,10 +159,10 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
                 queryWrapper.eq(OperDefectEntity::getExistDefectId, defectVO.getExistDefectId());
             }
             if (Func.isNotEmpty(defectVO.getConclusionTime())) {
-                queryWrapper.le(OperDefectEntity::getConclusionTime, defectVO.getConclusionTime());
+                queryWrapper.ge(OperDefectEntity::getConclusionTime, defectVO.getConclusionTime());
             }
             if (Func.isNotEmpty(defectVO.getConclusionEndTime())) {
-                queryWrapper.ge(OperDefectEntity::getConclusionTime, defectVO.getConclusionEndTime());
+                queryWrapper.le(OperDefectEntity::getConclusionTime, defectVO.getConclusionEndTime());
             }
             if (Func.isNotEmpty(defectVO.getConclusion())) {
                 queryWrapper.like(OperDefectEntity::getConclusion, defectVO.getConclusion());
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java
index cf784b7..dbd2c4b 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java
@@ -1,6 +1,5 @@
 package com.hnac.hzims.operational.util;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 public class TimeUtils {
@@ -17,11 +16,18 @@ public class TimeUtils {
 	 */
 	public static Long getDifferTime(Date endDate, Date nowDate) {
 //		long nd = 1000 * 24 * 60 * 60L;
+		// 获得两个时间的毫秒时间差异
+//		long nh = 1000 * 60 * 60L;
+//		long diff = endDate.getTime() - nowDate.getTime();
+//		BigDecimal s=BigDecimal.valueOf(diff).divide(BigDecimal.valueOf(diff)).setScale(0, BigDecimal.ROUND_HALF_UP);
+//		Long hour=s.longValue();
+//		return hour;
+		long nd = 1000 * 24 * 60 * 60L;
 		long nh = 1000 * 60 * 60L;
 		// 获得两个时间的毫秒时间差异
 		long diff = endDate.getTime() - nowDate.getTime();
-		BigDecimal s=BigDecimal.valueOf(diff).divide(BigDecimal.valueOf(diff)).setScale(0, BigDecimal.ROUND_HALF_UP);
-		Long hour=s.longValue();
+		// 计算差多少小时
+		long hour = diff % nd / nh;
 		return hour;
 	}