From 2ec29b5946b31eb917f170897878e453196e4172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM>
Date: Thu, 16 Apr 2026 13:54:42 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E8=B6=8A=E5=8D=97=E5=AF=8C=E4=BD=B3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/StructattrMapper.xml   | 56 +++++++++++++++++
 .../service/dao/mapper/StructattrMapper.xml   | 60 -------------------
 2 files changed, 56 insertions(+), 60 deletions(-)
 delete mode 100644 nladmin-system/nlsso-server/src/main/resources/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
index 4399aec..8a77696 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
@@ -144,4 +144,60 @@
         from st_ivt_structattr
         where is_used=1 and sect_code  <![CDATA[<>]]>  'SSX'
     </select>
+
+
+    <!-- 获取报表统计数据 -->
+    <select id="getReportData" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            COUNT(DISTINCT task_id) AS taskCount,
+            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTaskCount,
+            COUNT(DISTINCT struct_id) AS locationCount,
+            SUM(CASE WHEN is_used = '1' AND storagevehicle_code IS NOT NULL THEN 1 ELSE 0 END) AS usedLocationCount
+        FROM
+            sch_base_task t
+                LEFT JOIN
+            st_ivt_structattr s ON t.point_code1 = s.struct_code OR t.point_code2 = s.struct_code
+        WHERE
+            t.create_time >= DATE_SUB(NOW(), INTERVAL 7 DAY)
+    </select>
+
+    <!-- 获取最近7天的历史数据 -->
+    <select id="getHistoryData" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            DATE(create_time) AS date,
+            COUNT(task_id) AS taskCount,
+            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedCount
+        FROM
+            sch_base_task
+        WHERE
+            create_time >= DATE_SUB(NOW(), INTERVAL 7 DAY)
+        GROUP BY
+            DATE(create_time)
+        ORDER BY
+            date ASC
+    </select>
+
+    <!-- 获取本周任务数据 -->
+    <select id="getThisWeekData" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            COUNT(task_id) AS totalTasks,
+            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTasks,
+            ROUND(SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) / COUNT(task_id) * 100, 2) AS completionRate
+        FROM
+            sch_base_task
+        WHERE
+            YEARWEEK(create_time, 1) = YEARWEEK(NOW(), 1)
+    </select>
+
+    <!-- 获取上周任务数据 -->
+    <select id="getLastWeekData" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            COUNT(task_id) AS totalTasks,
+            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTasks,
+            ROUND(SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) / COUNT(task_id) * 100, 2) AS completionRate
+        FROM
+            sch_base_task
+        WHERE
+            YEARWEEK(create_time, 1) = YEARWEEK(NOW(), 1) - 1
+    </select>
 </mapper>
diff --git a/nladmin-system/nlsso-server/src/main/resources/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml b/nladmin-system/nlsso-server/src/main/resources/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
deleted file mode 100644
index cc7e154..0000000
--- a/nladmin-system/nlsso-server/src/main/resources/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.basedata_manage.service.dao.mapper.StructattrMapper">
-
-    <!-- 获取报表统计数据 -->
-    <select id="getReportData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
-            COUNT(DISTINCT task_id) AS taskCount,
-            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTaskCount,
-            COUNT(DISTINCT struct_id) AS locationCount,
-            SUM(CASE WHEN is_used = '1' AND storagevehicle_code IS NOT NULL THEN 1 ELSE 0 END) AS usedLocationCount
-        FROM
-            sch_base_task t
-        LEFT JOIN
-            st_ivt_structattr s ON t.point_code1 = s.struct_code OR t.point_code2 = s.struct_code
-        WHERE
-            t.create_time >= DATE_SUB(NOW(), INTERVAL 7 DAY)
-    </select>
-
-    <!-- 获取最近7天的历史数据 -->
-    <select id="getHistoryData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
-            DATE(create_time) AS date,
-            COUNT(task_id) AS taskCount,
-            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedCount
-        FROM
-            sch_base_task
-        WHERE
-            create_time >= DATE_SUB(NOW(), INTERVAL 7 DAY)
-        GROUP BY
-            DATE(create_time)
-        ORDER BY
-            date ASC
-    </select>
-
-    <!-- 获取本周任务数据 -->
-    <select id="getThisWeekData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
-            COUNT(task_id) AS totalTasks,
-            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTasks,
-            ROUND(SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) / COUNT(task_id) * 100, 2) AS completionRate
-        FROM
-            sch_base_task
-        WHERE
-            YEARWEEK(create_time, 1) = YEARWEEK(NOW(), 1)
-    </select>
-
-    <!-- 获取上周任务数据 -->
-    <select id="getLastWeekData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT
-            COUNT(task_id) AS totalTasks,
-            SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) AS completedTasks,
-            ROUND(SUM(CASE WHEN task_status = '4' THEN 1 ELSE 0 END) / COUNT(task_id) * 100, 2) AS completionRate
-        FROM
-            sch_base_task
-        WHERE
-            YEARWEEK(create_time, 1) = YEARWEEK(NOW(), 1) - 1
-    </select>
-
-</mapper>
\ No newline at end of file