From 15fad6a0122b0757399885c4232056da64996013 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 25 四月 2026 17:06:23 +0800
Subject: [PATCH] 添加一下 @DateTimeFormat
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 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 e9abbe2..7c459cc 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
@@ -23,6 +23,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserDeptService;
import com.smartor.domain.*;
+import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.ServiceSubtaskVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -119,16 +120,6 @@
// 鐩存帴浠庡凡鏈夎仛鍚堢粨鏋滄帹绠梩otal锛岄伩鍏嶅幓鎺夊垎椤靛悗鍐嶅叏閲忔煡涓�閬嶅ぇ琛�
long total = 0L;
try {
-// * wzx: 鏈墽琛屾暟閲�
-// * ysf: 宸查殢璁挎暟閲�
-// * fssb: 鍙戦�佸け璐ユ暟閲�
-// * yfs: 宸插彂閫佹暟閲�
-// * dsf: 寰呴殢璁挎暟閲�
-
-// long wzx = map.get("wzx") != null ? ((Number) map.get("wzx")).longValue() : 0L;
-// long ysf = map.get("ysf") != null ? ((Number) map.get("ysf")).longValue() : 0L;
-// long dsf = map.get("dsf") != null ? ((Number) map.get("dsf")).longValue() : 0L;
-// long fssb = map.get("fssb") != null ? ((Number) map.get("fssb")).longValue() : 0L;
total = map.get("total") != null ? ((Number) map.get("total")).longValue() : 0L;
} catch (Exception e) {
@@ -185,7 +176,7 @@
if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
redisFlag = true;
map = redisMap;
- redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
}
}
if (!redisFlag) {
@@ -252,13 +243,12 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/patItemByCondition")
- public TableDataInfo patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ public Map<String, Object> patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> serviceSubtaskList = null;
ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
serviceSubtaskEntity.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
if (serviceSubtaskEntity != null) {
- PageUtils.startPageByPost(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize());
-
+ serviceSubtaskEntity.setPageNum(PageUtils.getOffset(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize()));
serviceSubtaskList = serviceSubtaskService.patItem2(serviceSubtaskEntity);
}
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -283,7 +273,7 @@
serviceSubtaskService.patItem2(serviceSubtaskEntity);
}
});
- return getDataTable2(total, list);
+ return getDataTable3(total, list);
}
/**
@@ -525,17 +515,23 @@
@ApiOperation("鑾峰彇闅忚缁熻姣斾緥")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getSfStatistics")
- public AjaxResult getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ public Map<String, Object> getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
}
+ Integer offset = PageUtils.getOffset(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
+ serviceSubtaskCountReq.setPageNum(offset);
+
String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", serviceSubtaskCountReq.getOrgid());
if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
} else {
serviceSubtaskCountReq.setFollowUpCountStyle("1");
}
- return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
+ serviceSubtaskCountReq.setPageNum(null);
+ serviceSubtaskCountReq.setPageSize(null);
+ List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
+ return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
}
/**
@@ -599,7 +595,6 @@
}
-
/**
* 寤剁画鎶ょ悊缁熻
*/
@@ -617,9 +612,6 @@
}
return success(serviceSubtaskService.getContinueNurseCount(serviceSubtaskCotinueCountVO));
}
-
-
-
/**
@@ -738,5 +730,11 @@
return map;
}
+ @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻")
+ @PostMapping("/gethelibraryCount")
+ public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO) {
+ log.info("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻鐨勫叆鍙備负锛歿}", heLibraryCountVO);
+ return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO);
+ }
}
--
Gitblit v1.9.3