From 1713fac8ca97c63924d2f1ed08ef520a7b4a4439 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 二月 2026 17:34:24 +0800
Subject: [PATCH] 修改分页
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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 3b82483..6bdfa50 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
@@ -86,11 +86,16 @@
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@ApiOperation("鏌ヨ鎮ｈ�呴殢璁夸俊鎭�")
- //@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
-// @Cacheable(value = "patItem", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskVO.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
@PostMapping("/patItem")
- public TableDataInfo patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
- PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ public Map<String, Object> patItem(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ if (serviceSubtaskVO.getLeavehospitaldistrictcodes() != null && serviceSubtaskVO.getLeavehospitaldistrictcodes().size() > 10) {
+ throw new BaseException("鐥呭尯鏌ヨ鏁伴噺涓嶈兘瓒呰繃10涓�");
+ }
+ if (serviceSubtaskVO.getLeaveldeptcodes() != null && serviceSubtaskVO.getLeaveldeptcodes().size() > 10) {
+ throw new BaseException("绉戝鏌ヨ鏁伴噺涓嶈兘瓒呰繃10涓�");
+ }
+
+ serviceSubtaskVO.setPageNum(PageUtils.getOffset(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize()));
List<ServiceSubtask> serviceSubtaskList = null;
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
@@ -111,21 +116,16 @@
}
// patItemCount 璋冪敤redisCache璁板綍缁熻鏁版嵁
-// Map<String, Object> map = patItemCount(serviceSubtaskVO);
Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
map.put("serviceSubtaskList", serviceSubtaskList);
List<Map<String, Object>> list = new ArrayList<>();
list.add(map);
- //鑾峰彇total
- long total = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- serviceSubtaskVO.setPageNum(null);
- serviceSubtaskVO.setPageSize(null);
- serviceSubtaskService.patItem(serviceSubtaskVO);
- }
- });
- return getDataTable2(total, list);
+
+ serviceSubtaskVO.setPageNum(null);
+ serviceSubtaskVO.setPageSize(null);
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.patItem(serviceSubtaskVO);
+
+ return getDataTable3(CollectionUtils.isNotEmpty(serviceSubtasks) ? serviceSubtasks.size() : 0L, list);
}
/**
@@ -490,11 +490,10 @@
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
- String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle",
- serviceSubtaskCountReq.getOrgid());
- if (ObjectUtils.isNotEmpty(followUpCountStyle)){
+ String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", serviceSubtaskCountReq.getOrgid());
+ if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
- }else {
+ } else {
serviceSubtaskCountReq.setFollowUpCountStyle("1");
}
return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
@@ -574,7 +573,7 @@
}
String configKey = serviceSubtaskCountReq.getConfigKey();
if (StringUtils.isNotEmpty(configKey)) {
- String configValue = configService.selectConfigByKey(configKey,serviceSubtaskCountReq.getOrgid());
+ String configValue = configService.selectConfigByKey(configKey, serviceSubtaskCountReq.getOrgid());
serviceSubtaskCountReq.setConfigValue(configValue);
if (StringUtils.isEmpty(configValue)) {
String logInfo = "getSfStatisticsCount-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
@@ -599,7 +598,7 @@
//澶嶈瘖缁熻
String configKey = serviceSubtaskCountReq.getConfigKey();
if (StringUtils.isNotEmpty(configKey)) {
- String configValue = configService.selectConfigByKey(configKey,serviceSubtaskCountReq.getOrgid());
+ String configValue = configService.selectConfigByKey(configKey, serviceSubtaskCountReq.getOrgid());
if (StringUtils.isEmpty(configValue)) {
String logInfo = "getSfStatisticsCountDetails-鍙傛暟 " + configKey + " 鏈厤缃�, 璇烽厤缃ソ鍚庨噸璇�";
log.error(logInfo);
--
Gitblit v1.9.3