From 9ccea904dc27ee9e082388df9d5a3a5dc39f0c9d Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Thu, 5 Sep 2024 11:04:53 +0800
Subject: [PATCH] =?UTF-8?q?42966=20=E8=AE=BE=E5=A4=87=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8-=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D=E7=A7=B0=E3=80=81=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=98=E9=87=8FID=E5=8F=AF=E4=BB=A5=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=BE=93=E5=85=A5=E6=97=B6,?=
 =?UTF-8?q?=E7=94=A8=E9=80=97=E5=8F=B7=E9=9A=94=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/report/MesEquipmentLogDetailService.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
index 984eda0..6009bae 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.StringJoiner;
 
 @Service
@@ -29,9 +30,17 @@ public class MesEquipmentLogDetailService extends BaseMesService<MesEquipmentLog
         DdlPreparedPack.getStringEqualPack(new StringJoiner(MesExtConstWords.E_UNDERLINE).add(bean.getOrganizeCode()).add(bean.getEquipId().toString()).toString(), MesExtConstWords.ORG_EQUIP_ID, packBean);
 //        DdlPreparedPack.getNumEqualPack(bean.getEquipId(), MesExtConstWords.EQUIP_ID, packBean);
         DdlPreparedPack.getNumEqualPack(bean.getVariableType(), MesExtConstWords.VARIABLE_TYPE, packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        if(!StringUtils.isEmpty(bean.getEquipVariableId().toString().contains(","))){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getEquipVariableId().toString().split(",")), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        }else {
+            DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        }
+        if(!StringUtils.isEmpty(bean.getEquipVariableName().contains(","))){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getEquipVariableName().split(",")), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
+        }else {
+            DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
+        }
 //        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
         DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
     }