From ebb93427d2b79f53be414dcc0857d7135f91fda7 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 22 九月 2026 14:23:28 +0800
Subject: [PATCH] 【丽水】是否手动电话标记
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 a4357cf..f39e3a1 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
@@ -194,13 +194,14 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
- public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
+ public void patItemExport(HttpServletResponse response, ServiceSubtaskVO serviceSubtaskVO) {
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
serviceSubtaskVO.setOrgid(user.getOrgid());
List<ServiceSubtaskRes> serviceSubtaskList = null;
if (serviceSubtaskVO != null) {
- serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
+ ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
+ serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskEntity);
}
List<ServiceSubtaskExport> serviceSubtaskExports = null;
List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
@@ -220,11 +221,11 @@
serviceSubtaskExport.setEndDay(endDay);
}
}
- QuestionResultVO questionResultVO = new QuestionResultVO();
- questionResultVO.setServiceType(serviceSubtaskVO.getServiceType());
- questionResultVO.setEndOutHospTime(serviceSubtaskVO.getEndOutHospTime());
- questionResultVO.setStartOutHospTime(serviceSubtaskVO.getStartOutHospTime());
- serviceSubtaskDetailRatioExports = serviceSubtaskService.getDetailRatio(questionResultVO, serviceSubtaskList);
+ SltdMydTotalVO sltdMydTotalVO = new SltdMydTotalVO();
+ sltdMydTotalVO.setServiceTypeList(Arrays.asList(serviceSubtaskVO.getServiceType()));
+ sltdMydTotalVO.setEndOutHospTime(serviceSubtaskVO.getEndOutHospTime());
+ sltdMydTotalVO.setStartOutHospTime(serviceSubtaskVO.getStartOutHospTime());
+ serviceSubtaskDetailRatioExports = serviceSubtaskService.getDetailRatio(sltdMydTotalVO, serviceSubtaskList);
}
@@ -389,7 +390,11 @@
ivrTaskVO.setCreateBy(user.getNickName());
ivrTaskVO.setUpdateBy(user.getNickName());
ivrTaskVO.setOrgid(user.getOrgid());
- ivrTaskVO.setCampusid(user.getCampusid());
+ if(StringUtils.isNotEmpty(user.getCampusid())){
+ ivrTaskVO.setCampusid(user.getCampusid());
+ }else {
+ ivrTaskVO.setCampusid("1");
+ }
return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
@@ -544,6 +549,7 @@
SysUserDept sysUserWard = new SysUserDept();
sysUserWard.setUserId(user.getUserId());
sysUserWard.setOrgid(user.getOrgid());
+ sysUserWard.setCampusid(user.getCampusid());
sysUserWard.setDeptType("2");
List<SysUserDept> wardList = sysUserDeptService.selectSysUserDeptList(sysUserWard);
if (CollectionUtils.isNotEmpty(wardList)) {
@@ -558,6 +564,7 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(user.getUserId());
sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setCampusid(user.getCampusid());
sysUserDept.setDeptType("1");
List<SysUserDept> deptList = sysUserDeptService.selectSysUserDeptList(sysUserDept);
if (CollectionUtils.isNotEmpty(deptList)) {
@@ -835,11 +842,13 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(sysUser.getUserId());
sysUserDept.setOrgid(sysUser.getOrgid());
+ sysUserDept.setCampusid(sysUser.getCampusid());
sysUserDept.setDeptType("1");
List<SysUserDept> sysUserDepts = sysUserDeptService.selectSysUserDeptList(sysUserDept);
SysUserDept sysUserWard = new SysUserDept();
sysUserWard.setUserId(sysUser.getUserId());
sysUserWard.setOrgid(sysUser.getOrgid());
+ sysUserWard.setCampusid(sysUser.getCampusid());
sysUserWard.setDeptType("2");
List<SysUserDept> sysUserWards = sysUserDeptService.selectSysUserDeptList(sysUserWard);
List<String> deptCodes = sysUserDepts.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
@@ -952,6 +961,13 @@
ryTask.dealSubtaskDeadline(orgid, day);
return AjaxResult.success("銆恉ealSubtaskDeadline銆戝悓姝ヤ换鍔″凡鍚姩锛屽ぉ鏁颁负" + day + "澶╋紝璇风◢鍚庢煡鐪嬬粨鏋�");
}
+
+ @PostMapping("/sendExceptInfo")
+ public AjaxResult sendExceptInfo() throws Exception {
+ ryTask.sendExceptInfo();
+ return AjaxResult.success("sendExceptInfo");
+ }
+
/**
* 甯edis缂撳瓨鐨勭粺璁℃煡璇紝渚沺atItem鍜宲atItemCount鍏辩敤锛屾潯浠朵笉鍙樻椂鐩存帴鍛戒腑缂撳瓨
*/
--
Gitblit v1.9.3