From 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 05 十一月 2025 11:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 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 a8c2986..2fb4c59 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
@@ -2,6 +2,7 @@
import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -10,6 +11,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.PreachFormEnum;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -18,9 +20,12 @@
import com.smartor.mapper.PatMedOuthospMapper;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
+import com.smartor.service.IServiceTaskService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.implementation.bytecode.Throw;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,6 +50,9 @@
public class ServiceSubtaskController extends BaseController {
@Autowired
private IServiceSubtaskService serviceSubtaskService;
+
+ @Autowired
+ private IServiceTaskService serviceTaskService;
@Autowired
private IServiceSubtaskRecordService serviceSubtaskRecordService;
@@ -70,6 +79,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 +97,6 @@
}
});
return getDataTable2(total, list);
-// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
}
@@ -111,8 +122,6 @@
}
}
-
-
ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
util.exportExcel(response, serviceSubtaskExprots, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
}
@@ -163,6 +172,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 +274,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 +343,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')")
@@ -342,8 +372,40 @@
@ApiOperation("鏈嶅姟缁熻鏌ヨ-鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁")
@PostMapping("/getServiceStatistics")
public AjaxResult getServiceStatistics(@RequestBody ServiceStatisticsRequest serviceStatisticsRequest) {
+ SysUser user = getLoginUser().getUser();
+ serviceStatisticsRequest.setOrgid(user.getOrgid());
List<ServiceStatisticsResponse> serviceStatistics = serviceSubtaskService.getServiceStatistics(serviceStatisticsRequest);
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));
+ }
+
+
+ /**
+ * 鍙戦�佺煭淇℃ā鏉�
+ */
+ @ApiOperation("鍙戦�佺煭淇℃ā鏉�")
+ @PostMapping("/sendMsgTemplate")
+ public Map<String, Object> sendMsgTemplate(@RequestBody List<PatArchiveSrmVO> patArchiveSrmVOS) {
+ if (CollectionUtils.isEmpty(patArchiveSrmVOS)) {
+ throw new BaseException("鎮ｈ�呬俊鎭笉鑳戒负绌�");
+ }
+ List<PatArchiveSrmVO> pasList = serviceSubtaskService.sendMsgTemplate(patArchiveSrmVOS);
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", HttpStatus.SUCCESS);
+ map.put("fail", CollectionUtils.isEmpty(pasList) ? null : pasList);
+ return map;
+ }
+
}
--
Gitblit v1.9.3