From 0e1595f70135cab3568795ef8a5860e5c2cbd708 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 4 Jan 2023 15:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A8=BC=E5=8A=A8=E7=8E=87?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anomaly/controller/ReportController.java  | 14 +++++++++++
 .../mesnac/anomaly/mapper/ReportMapper.java   |  7 ++++++
 .../mesnac/anomaly/service/ReportService.java |  7 ++++++
 .../service/impl/ReportServiceImpl.java       | 13 +++++++++++
 .../main/resources/mapper/ReportMapper.xml    | 23 +++++++++++++++++++
 5 files changed, 64 insertions(+)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index 8af5e438..0fb04c97 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -628,6 +628,20 @@ public class ReportController {
         }
     }
 
+    /**
+     * 设备稼动率报表
+     * @param
+     * @return
+     */
+    @GetMapping("/operationRateOfEquipmentReport")
+    public R operationRateOfEquipmentReport(@RequestParam(required = false) Map paramMap){
+        try {
+            return R.ok(reportService.operationRateOfEquipmentReport(paramMap));
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+
     /**
      * 工时看板
      * @param
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index fe5edea4..6d4de263 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -328,4 +328,11 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, String>> inventoryTableSave(Map paramMap);
+
+    /**
+     * 设备稼动率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> operationRateOfEquipmentReport(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
index 69e1c893..a20fb615 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
@@ -320,4 +320,11 @@ public interface ReportService {
      * @return
      */
     List<Map<String, String>> inventoryTableSave(Map paramMap);
+
+    /**
+     * 设备稼动率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> operationRateOfEquipmentReport(Map paramMap);
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 6aa32011..9b143d7a 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1786,6 +1786,19 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.inventoryTableSave(paramMap);
     }
 
+    /**
+     * 设备稼动率报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> operationRateOfEquipmentReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.operationRateOfEquipmentReport(paramMap);
+    }
+
     /**
      * 工时统计报表
      * @param paramMap
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 9fbc9610..18bc83c6 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -3307,6 +3307,29 @@ SELECT zab.CREATED_DATE_TIME,
             </if>
         </where>
     </select>
+    <select id="operationRateOfEquipmentReport" resultType="java.util.Map">
+        SELECT *
+        FROM OPERATION_RATE_OF_EQUIPMENT_REPORT V
+        WHERE 1=1
+        <if test="workCenter != null and workCenter != ''">
+            AND V.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="resrce != null and resrce != ''">
+            AND V.RESRCE = #{resrce}
+        </if>
+        <if test="sapDescription != null and sapDescription != ''">
+            AND V.SAP_WORK_CENTER_DESCRIPTION like '%${sapDescription}%'
+        </if>
+        <if test="resrceDescription != null and resrceDescription != ''">
+            AND V.RESRCE_DESCRIPTION like '%${resrceDescription}%'
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND V.SEND_DATE >= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND V.SEND_DATE &lt;= #{endDate}
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file