From 03be8358a6574713f67eb0b254c6a2beda96685d Mon Sep 17 00:00:00 2001
From: huangge1199 <huangge1199@hotmail.com>
Date: Wed, 13 Aug 2025 09:55:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=8C=87=E6=A0=87=E5=BA=93?=
 =?UTF-8?q?=EF=BC=9A=E6=8C=87=E6=A0=87=E8=BE=93=E5=87=BA=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iet/ustb/sf/service/impl/TargetServiceImpl.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
index 0833616..083e367 100644
--- a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
+++ b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java
@@ -111,9 +111,17 @@ public class TargetServiceImpl extends ServiceImpl<TargetMapper, Target>
     @Override
     public String getResult(JSONObject params) {
         String sql = getResultSql(params);
-        List<Map<String, Object>> list = SqlRunner.db().selectList(sql);
+        List<TargetOption> searchList = params.getJSONArray("search").toJavaList(TargetOption.class);
+        String cycle = "yesterday";
+        for (TargetOption search : searchList) {
+            if (search.getType() == 1) {
+                cycle = search.getFun();
+            }
+        }
+        String[] strArr = utilService.getCurrentCycleDataByCycle(new Date(), cycle);
+        List<Map<String, Object>> list = SqlRunner.db().selectList(sql, strArr[3], strArr[4]);
         TargetOption result = params.getJSONObject("result").toJavaObject(TargetOption.class);
-        return list.get(0).get(result.getColumnName()).toString();
+        return list.get(0) == null ? "0" : list.get(0).get(result.getColumnName()).toString();
     }
 
     @Override