From 41ac1512f52f7670fff3200168b8bdd23c0b6489 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 20 十一月 2026 09:12:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
index 06b4a55..9651585 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/controller/ServiceSubtaskController.java
@@ -598,7 +598,11 @@
serviceSubtaskCountReq.setPageNum(null);
serviceSubtaskCountReq.setPageSize(null);
List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
- return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
+ // 淇锛氬師鏉ヨ繖閲屾妸鍚屼竴涓粺璁℃煡璇㈣繛璋冧袱娆★紙绗竴娆$殑缁撴灉琚洿鎺ヤ涪寮冿級锛�
+ // 绛変簬姣忔璇锋眰鐧借窇涓�閬嶃�屽叏閲忔槑缁嗗洖鍐呭瓨绱姞銆嶃�傜幇鍦ㄥ鐢ㄥ悓涓�娆℃煡璇㈢粨鏋溿��
+ // 娉ㄦ剰 total 鐨勫彇鍊艰〃杈惧紡淇濇寔鍘熸牱锛坄isEmpty ? size() : 0` 鎭掍负 0锛屽睘鏃㈡湁琛屼负锛夛紝
+ // 瑕佹敼鎴� sfStatistics.size() 闇�涓庡墠绔‘璁ゅ悗鍐嶅姩銆�
+ return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, sfStatistics);
}
// =====================================================================================
@@ -1239,7 +1243,12 @@
*/
@PostMapping(value = "/scanGenerateSubtask")
public AjaxResult scanGenerateSubtask(@RequestBody ServiceTask serviceTask) {
- return AjaxResult.success(serviceSubtaskService.scanGenerateSubtask(serviceTask));
+ String url = serviceSubtaskService.scanGenerateSubtask(serviceTask);
+ // data 涓虹┖蹇呴』鍥� code=500锛氬墠绔彧鐪� code锛�200 + 绌轰覆浼氳璇綋鎴愩�岀敓鎴愭垚鍔熶絾娌¢摼鎺ャ��
+ if (StringUtils.isEmpty(url)) {
+ return AjaxResult.error("鎵爜鐢熸垚浠诲姟澶辫触锛氭湭鍙栧埌浜岀淮鐮侀摼鎺�");
+ }
+ return AjaxResult.success(url);
}
@PostMapping("/syncMedInhospForShiyi")
--
Gitblit v1.9.3