From 6f1e752bf00b584c8a17569578fa8e54cdb71b60 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 27 十月 2025 13:34:59 +0800
Subject: [PATCH] 处理选项不显示的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 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 c060a90..b3593bb 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
@@ -18,6 +18,7 @@
import com.smartor.mapper.PatMedOuthospMapper;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
+import com.smartor.service.IServiceTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -46,6 +47,9 @@
private IServiceSubtaskService serviceSubtaskService;
@Autowired
+ private IServiceTaskService serviceTaskService;
+
+ @Autowired
private IServiceSubtaskRecordService serviceSubtaskRecordService;
/**
@@ -70,6 +74,9 @@
if (ObjectUtils.isNotEmpty((serviceSubtask.getTaskid())))
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
+
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if (ObjectUtils.isNotEmpty(serviceTask)) serviceSubtask.setPreachform(serviceTask.getPreachform());
}
Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
map.put("serviceSubtaskList", serviceSubtaskList);
@@ -85,7 +92,6 @@
}
});
return getDataTable2(total, list);
-// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
}
@@ -111,8 +117,6 @@
}
}
-
-
ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
util.exportExcel(response, serviceSubtaskExprots, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
}
@@ -163,6 +167,17 @@
List<ServiceSubtask> list = serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
ExcelUtil<ServiceSubtask> util = new ExcelUtil<ServiceSubtask>(ServiceSubtask.class);
util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁");
+ }
+
+ /**
+ * 闅忚鏁版嵁鏌ヨ
+ */
+ @Log(title = "闅忚鏁版嵁鏌ヨ", businessType = BusinessType.EXPORT)
+ @PostMapping("/querySubtaskList")
+ public AjaxResult querySubtaskList(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
+ return success(serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO));
}
@@ -254,8 +269,6 @@
@PostMapping("/phoneCallBackYQ")
public PhoneCallBackYQVO phoneCallBackYQ(@RequestBody PhoneCallReqYQVO phoneCallReqYQVO) {
log.info("鐢佃瘽ASR閫氳瘽鍥炶皟(闆ㄧ划) 锛焮}", phoneCallReqYQVO);
-// SysUser user = getLoginUser().getUser();
-// phoneCallReqYQVO.setOrgid(user.getOrgid());
PhoneCallBackYQVO phoneCallBackYQVO = serviceSubtaskService.phoneCallBackYQ(phoneCallReqYQVO);
return phoneCallBackYQVO;
}
@@ -325,6 +338,18 @@
}
/**
+ * 鑾峰彇闅忚缁熻姣斾緥
+ */
+ @ApiOperation("鑾峰彇闅忚婊℃剰搴︾粺璁�")
+ @PostMapping("/getSfStatisticsJoy")
+ public AjaxResult getSfStatisticsJoy(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
+ return error("鏈嶅姟绫诲瀷涓嶈兘涓虹┖");
+ }
+ return success(serviceSubtaskService.getSfStatisticsJoy(serviceSubtaskCountReq));
+ }
+
+ /**
* 闅忚缁熻瀵煎嚭
*/
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@@ -348,4 +373,17 @@
return success(serviceStatistics);
}
+
+ /**
+ * 鑾峰彇闅忚缁熻姣斾緥
+ */
+ @ApiOperation("鑾峰彇闅忚婊℃剰搴︽槑缁�")
+ @PostMapping("/getSfStatisticsJoydetails")
+ public AjaxResult getSfStatisticsJoydetails(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) {
+ return error("绉戝鎴栫梾鍖轰笉鑳戒负绌�");
+ }
+ return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
+ }
+
}
--
Gitblit v1.9.3