From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java
index eda9ed5..f4c54c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailTraceController.java
@@ -7,11 +7,10 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.ServiceSubtaskDetailTrace;
-import com.smartor.domain.VO.DetailTraceDealVO;
-import com.smartor.domain.VO.SatisfactionExceptConfigQuestionReqVO;
-import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
-import com.smartor.service.IServiceSubtaskDetailTraceService;
+import com.ruoyi.task.domain.ServiceSubtaskDetailTrace;
+import com.ruoyi.task.domain.VO.DetailTraceDealVO;
+import com.ruoyi.task.domain.VO.ServiceSubtaskDetailTraceVO;
+import com.ruoyi.task.service.IServiceSubtaskDetailTraceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +21,10 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
+import com.ruoyi.task.domain.ServiceSubtaskDetailTrace;
+import com.ruoyi.task.domain.VO.DetailTraceDealVO;
+import com.ruoyi.task.domain.VO.ServiceSubtaskDetailTraceVO;
+import com.ruoyi.task.service.IServiceSubtaskDetailTraceService;
/**
* 闅忚浠诲姟寮傚父璁板綍璺熻釜Controller
@@ -62,33 +65,16 @@
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/tracedeallist")
public Map<String, Object> tracedeallist(@RequestBody DetailTraceDealVO detailTraceDealVO) {
+ // PageUtils.getOffset 杩斿洖鐨勬槸 offset锛孲QL 閲屾寜 limit/offset 浣跨敤
Integer offset = PageUtils.getOffset(detailTraceDealVO.getPageNum(), detailTraceDealVO.getPageSize());
detailTraceDealVO.setPageNum(offset);
+ // 涓�娆℃煡璇㈠悓鏃惰繑鍥炲垎椤垫暟鎹�侀棶棰樻�绘暟鍜屽叏閲忔眹鎬�
+ // 锛堝師鏉ヤ负浜嗘嬁鎬绘暟鎶� method 鍙堝叏閲忚窇浜嗕竴閬嶏紝N+1 涔熻窡鐫�璺戠浜岄亶锛�
Map<String, Object> result = serviceSubtaskDetailTraceService.tracedeallist(detailTraceDealVO);
- // 鏌ヨ鎬绘暟锛堜笉鍒嗛〉锛�
- detailTraceDealVO.setPageNum(null);
- detailTraceDealVO.setPageSize(null);
- Map<String, Object> totalResult = serviceSubtaskDetailTraceService.tracedeallist(detailTraceDealVO);
- List<?> totalRows = (List<?>) totalResult.get("detailTraceDealDTOList");
-
- //灏嗘�绘暟淇℃伅娣诲姞鍒扮粨鏋滀腑
- result.put("totalException", totalResult.get("totalException"));
- result.put("noDealException", totalResult.get("noDealException"));
- result.put("yesDealException", totalResult.get("yesDealException"));
-
- return getDataTable3(CollectionUtils.isNotEmpty(totalRows) ? totalRows.size() : 0, result);
- }
-
- /**
- * 鑾峰彇婊℃剰搴﹀紓甯搁厤缃鐩�
- */
- @ApiOperation("鑾峰彇婊℃剰搴﹀紓甯搁厤缃鐩�")
- @PostMapping("/getSatisfactionExceptConfigQuestion")
- public Map<String, Object> getSatisfactionExceptConfigQuestion(@RequestBody SatisfactionExceptConfigQuestionReqVO questionReqVO) {
- log.info("鑾峰彇婊℃剰搴﹀紓甯搁厤缃鐩殑鍏ュ弬: {}", questionReqVO);
- Map<String, Object> satisfactionExceptConfigQuestion = serviceSubtaskDetailTraceService.getSatisfactionExceptConfigQuestion(questionReqVO);
- return satisfactionExceptConfigQuestion;
+ Object questionTotal = result.get("questionTotal");
+ long total = questionTotal == null ? 0L : Long.parseLong(String.valueOf(questionTotal));
+ return getDataTable3(total, result);
}
/**
--
Gitblit v1.9.3