From 37e23ae4323114564dadbacf75449b75ad957bbf Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 13 七月 2026 16:24:01 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index f73cbce..2954bb2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -224,10 +224,10 @@
/**
- * 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃
+ * 瀵煎嚭鍗曚竴浠诲姟鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
- @Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
+ @Log(title = "鍗曚竴浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
LoginUser loginUser = getLoginUser();
@@ -238,6 +238,7 @@
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
List<ServiceSubtaskExport> serviceSubtaskExports = null;
+ List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
serviceSubtaskExports = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExport.class);
for (ServiceSubtaskExport serviceSubtaskExport : serviceSubtaskExports) {
@@ -255,11 +256,17 @@
}
}
- }
- ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
- util.exportExcel(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
- }
+ //鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
+ List<Long> taskIds = serviceSubtaskList.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
+ serviceSubtaskDetailRatioExports = serviceSubtaskService.statQuestionOption(taskIds);
+ }
+
+
+ ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
+ util.exportExcelTwoSheet(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�",
+ serviceSubtaskDetailRatioExports, "闂璇︽儏鍗犳瘮", ServiceSubtaskDetailRatioExport.class);
+ }
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
@@ -879,6 +886,13 @@
return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO);
}
+ @ApiOperation("鑾峰彇瀹ｆ暀缁熻瓒呴摼鎺�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/gethelibraryCountHyperlink")
+ public AjaxResult gethelibraryCountHyperlink(@RequestBody HeLibraryCountVO heLibraryCountVO) {
+ return success(serviceSubtaskService.gethelibraryCountHyperlink(heLibraryCountVO));
+ }
+
/**
* 鎵嬪姩鍙戦�侀棶鍗锋ā鏉跨殑鐭俊鍔熻兘
*
--
Gitblit v1.9.3