From 6659135780e718758417efde4c8c351c69e3755b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 11 十二月 2025 15:52:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 2fb4c59..4326803 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
@@ -29,9 +29,12 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -56,6 +59,9 @@
@Autowired
private IServiceSubtaskRecordService serviceSubtaskRecordService;
+
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
@@ -209,6 +215,48 @@
}
/**
+ * 鏍规嵁鐤剧梾妯＄硦鏌ヨ
+ */
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:query')")
+ @PostMapping(value = "/getSubtaskByDiagname")
+ public Map<String, Object> getSubtaskByDiagname(@RequestBody ServiceSubtask serviceSubtask) {
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ serviceSubtask.setOrgid(user.getOrgid());
+ serviceSubtask.setPageNum(PageUtils.getOffset(serviceSubtask.getPageNum(), serviceSubtask.getPageSize()));
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskService.selectServiceSubtaskByDiagname(serviceSubtask);
+ Map<String, Object> rspData = new HashMap();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("rows", serviceSubtaskList);
+
+ serviceSubtask.setPageNum(null);
+ serviceSubtask.setPageSize(null);
+ List<ServiceSubtask> total = serviceSubtaskService.selectServiceSubtaskByDiagname(serviceSubtask);
+ if (CollectionUtils.isNotEmpty(total)) rspData.put("total", total.size());
+ else rspData.put("total", 0);
+ return rspData;
+ }
+
+
+ /**
+ * 闅忚缁熻瀵煎嚭
+ */
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ @Log(title = "闅忚缁熻瀵煎嚭锛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/getSubtaskByDiagnameExport")
+ public void getSubtaskByDiagnameExport(HttpServletResponse response, List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList) {
+ ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);
+
+ if (active.equals("ls") || active.equals("druid")) {
+ util.exportExcel(response, serviceSubtaskDiagnameList, LocalDate.now().getMonthValue() + "闅忚缁熻瀵煎嚭");
+ } else {
+ util.exportExcel(response, serviceSubtaskDiagnameList, "闅忚缁熻瀵煎嚭");
+ }
+ }
+
+
+ /**
* 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟
*/
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟")
@@ -347,7 +395,7 @@
*/
@ApiOperation("鑾峰彇闅忚婊℃剰搴︾粺璁�")
@PostMapping("/getSfStatisticsJoy")
- public AjaxResult getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ public Map<String, Object> getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
@@ -361,9 +409,15 @@
@Log(title = "闅忚缁熻瀵煎嚭锛�", businessType = BusinessType.EXPORT)
@PostMapping("/getSfStatisticsExport")
public void export(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) {
- List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
+ List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatisticsExport(serviceSubtaskCountReq);
+
ExcelUtil<ServiceSubtaskStatistic> util = new ExcelUtil<ServiceSubtaskStatistic>(ServiceSubtaskStatistic.class);
- util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭");
+
+ if (active.equals("ls") || active.equals("druid")) {
+ util.exportExcel(response, sfStatistics, LocalDate.now().getMonthValue() + "鏈堝嚭闄㈤殢璁跨粺璁¤〃");
+ } else {
+ util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭");
+ }
}
/**
--
Gitblit v1.9.3