From 9aca6b6a72ebaa209f83778ee1e6d746fd54522f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 11 六月 2026 14:53:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 647fa44..86252e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -4,11 +4,12 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
-import com.smartor.domain.ServiceSubTaskDetailReq;
-import com.smartor.domain.ServiceSubtask;
-import com.smartor.domain.ServiceSubtaskDetail;
+import com.ruoyi.system.service.ISysConfigService;
+import com.smartor.domain.*;
+import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.service.IServiceSubtaskDetailService;
import com.smartor.service.IServiceSubtaskService;
import io.swagger.annotations.Api;
@@ -18,6 +19,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
+import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
/**
* 璇煶浠诲姟缁撴灉鏄庣粏Controller
@@ -33,6 +36,9 @@
private IServiceSubtaskDetailService ServiceSubtaskDetailService;
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+
+ @Autowired
+ private ISysConfigService configService;
/**
* 鏌ヨ鍗曚釜浜虹殑璇煶淇℃伅
@@ -143,4 +149,47 @@
return toAjax(ServiceSubtaskDetailService.deleteServiceSubtaskDetailByCalldetailids(calldetailids));
}
+ /**
+ * 鎸囨爣缁熻
+ */
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
+ @ApiOperation("鎸囨爣缁熻")
+ @GetMapping(value = "/countPatByTarget/{targetid}")
+ public AjaxResult countPatByTarget(@PathVariable("targetid") Long targetid) {
+ return success(ServiceSubtaskDetailService.countPatByTarget(targetid));
+ }
+
+
+ /**
+ * 鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)
+ */
+ @ApiOperation("鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏")
+ @PostMapping("/getServiceSubtaskDetails")
+ public List<Map<String, Object>> getServiceSubtaskDetails(@RequestBody ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
+ List<Map<String, Object>> map = new ArrayList<>();
+ map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
+ return map;
+ }
+
+ /**
+ * 鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)
+ */
+ @ApiOperation("鑾峰彇闅忚璇︽儏-鎸囨爣璇︽儏(瓒呴摼鎺�)")
+ @PostMapping("/getServiceSubtaskDetailsHyperlink")
+ public List<Map<String, Object>> getServiceSubtaskDetailsHyperlink(@RequestBody ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
+ LoginUser loginUser = getLoginUser();
+ String orgid = loginUser.getUser().getOrgid();
+ String configKey = serviceSubtaskDetailVO.getConfigKey();
+ if (StringUtils.isNotEmpty(configKey)) {
+ String configValue = configService.selectConfigByKey(configKey, orgid);
+ serviceSubtaskDetailVO.setConfigValue(configValue);
+ if (StringUtils.isEmpty(configValue)) {
+ String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
+ log.error(logInfo);
+ }
+ }
+ List<Map<String, Object>> map = new ArrayList<>();
+ map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
+ return map;
+ }
}
--
Gitblit v1.9.3