From a11465387cb67853ef9252a679c43ef2ff75d718 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 24 四月 2026 19:12:52 +0800
Subject: [PATCH] 提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 59 ++++++++++++++++++-----------------------------------------
1 files changed, 18 insertions(+), 41 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 e56e2f7..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;
@@ -242,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) {
@@ -273,7 +273,7 @@
serviceSubtaskService.patItem2(serviceSubtaskEntity);
}
});
- return getDataTable2(total, list);
+ return getDataTable3(total, list);
}
/**
@@ -437,37 +437,6 @@
}
/**
- * 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)
- */
- @ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)")
- //@PreAuthorize("@ss.hasPermi('system:task:add')")
- @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/insertOrUpdateTaskByTaskId")
- public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) {
- log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- ivrTaskVO.setCreateBy(user.getNickName());
- ivrTaskVO.setUpdateBy(user.getNickName());
- ivrTaskVO.setOrgid(user.getOrgid());
- //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){
- serviceSubtask.setTaskid(ivrTaskVO.getTaskid());
- serviceSubtask.setOrgid(user.getOrgid());
- serviceSubtask.setCampusid(user.getCampusid());
- ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
- ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances());
-
- return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
- }else {
- return error("insertOrUpdateTaskByTaskId taskid涓嶅彲涓虹┖");
- }
-
- }
-
- /**
* 鐢佃瘽鍥炶皟浠诲姟(涓婃捣)
*/
@ApiOperation("鐢佃瘽鍥炶皟浠诲姟")
@@ -546,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));
}
/**
@@ -620,7 +595,6 @@
}
-
/**
* 寤剁画鎶ょ悊缁熻
*/
@@ -638,9 +612,6 @@
}
return success(serviceSubtaskService.getContinueNurseCount(serviceSubtaskCotinueCountVO));
}
-
-
-
/**
@@ -759,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