From 8464895b3474ed5dfc7d8ad9fa30a730bcb04000 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 11 五月 2024 15:51:34 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml                     |    2 +-
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java                                |    3 +++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
index 4e3746d..1889d54 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
@@ -2,12 +2,15 @@
 
 import lombok.Data;
 
+import java.util.UUID;
+
 /**
  * @author Lius
  * @date 2023/12/8 10:38
  */
 @Data
 public class MdcProcessCountDto {
+    private String id = UUID.randomUUID().toString();
     private String equipmentId;
     private String equipmentName;
     private String driveType;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
index 74b4eb2..05698e7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentWorklineMapper.xml
@@ -7,7 +7,7 @@
     </select>
 
     <select id="findRunningData" resultType="java.lang.String">
-        SELECT ProductCount FROM [${tableName}] WHERE CollectTime BETWEEN #{ startTime } AND #{ endTime } GROUP BY ProductCount ORDER BY ProductCount
+        SELECT ProductCount FROM [${tableName}] WHERE ProductCount &lt;&gt; '' AND CollectTime BETWEEN #{ startTime } AND #{ endTime } GROUP BY ProductCount ORDER BY ProductCount
     </select>
 
     <select id="getEquipProgramNum" resultType="org.jeecg.modules.mdc.dto.EquipmentMachingDto">
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
index 6d3cb80..56a8633 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
@@ -105,6 +105,8 @@
             if (shiftSubIdList != null && !shiftSubIdList.isEmpty()) {
                 String shift = String.join(",", shiftSubIdList);
                 mdcOverallEquipmentEfficiency.setShift(shift);
+            } else {
+                mdcOverallEquipmentEfficiency.setShift("鏃�");
             }
 
             if (StringUtils.isEmpty(mdcOverallEquipmentEfficiency.getShift())) {

--
Gitblit v1.9.3