From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 103 ++++-----------------------------------------------
1 files changed, 8 insertions(+), 95 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 85ceebe..2571c89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -10,15 +10,7 @@
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService;
-import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.*;
-import com.smartor.domain.VO.MydTrendReqVO;
-import com.smartor.domain.VO.MzMydScoreRankVO;
-import com.smartor.domain.VO.QuestionCountKsOrBqVO;
-import com.smartor.domain.VO.SltdMydTotalVO;
-import com.smartor.domain.entity.ServiceSubtaskEntity;
-import com.smartor.service.IServiceSubtaskDetailService;
-import com.smartor.service.IServiceSubtaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -26,10 +18,17 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.framework.datasource.DynamicDataSourceContextHolder.log;
+import com.ruoyi.task.domain.ServiceSubtask;
+import com.ruoyi.task.domain.ServiceSubtaskDetail;
+import com.ruoyi.task.domain.ServiceSubtaskDetailVO;
+import com.ruoyi.task.service.IServiceSubtaskDetailService;
+import com.ruoyi.task.service.IServiceSubtaskService;
+import com.ruoyi.task.domain.ServiceSubTaskDetailReq;
/**
* 璇煶浠诲姟缁撴灉鏄庣粏Controller
@@ -201,90 +200,4 @@
map = ServiceSubtaskDetailService.getServiceSubtaskDetails(serviceSubtaskDetailVO);
return map;
}
-
-
- /**
- * 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
- */
- @ApiOperation("鐪佺珛鍚屽痉婊℃剰搴︽暟鎹粺璁�")
- @PostMapping("/sltdMydTotalByScore")
- public Map<String, Object> sltdMydTotalByScore(@RequestBody SltdMydTotalVO sltdMydTotalVO) {
- List<ServiceSubtaskRes> serviceSubtaskResList = null;
- if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList())) {
- //serviceType鍙兘浼氬嚭鐜板涓紝涓嶆兂澶氬啓鏂规硶浜嗭紝涓�涓竴涓煡璇㈠惂
- for (String st : sltdMydTotalVO.getServiceTypeList()) {
- ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
- serviceSubtaskEntity.setServiceType(st);
- serviceSubtaskEntity.setEndOutHospTime(sltdMydTotalVO.getEndOutHospTime());
- serviceSubtaskEntity.setStartOutHospTime(sltdMydTotalVO.getStartOutHospTime());
- serviceSubtaskEntity.setDeptOrDistrict(sltdMydTotalVO.getDeptOrDistrict());
- serviceSubtaskEntity.setLeavehospitaldistrictcodes(sltdMydTotalVO.getLeavehospitaldistrictcodes());
- serviceSubtaskEntity.setLeaveldeptcodes(sltdMydTotalVO.getLeaveldeptcodes());
- if (serviceSubtaskEntity != null) {
- List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.getServiceSubtasks(serviceSubtaskEntity);
- List<ServiceSubtaskRes> serviceSubtaskRes = DtoConversionUtils.sourceToTarget(serviceSubtasks, ServiceSubtaskRes.class);
- if (CollectionUtils.isNotEmpty(serviceSubtaskResList)) {
- serviceSubtaskResList.addAll(serviceSubtaskRes);
- } else {
- if (CollectionUtils.isEmpty(serviceSubtaskResList)) serviceSubtaskResList = serviceSubtaskRes;
- }
- }
- }
- }
- // 鎸� questiontext 鍒嗙粍鍚庤浆鎹负 QuestionResultVO
- List<QuestionResultDTO> result = new ArrayList<>();
- if (CollectionUtils.isNotEmpty(serviceSubtaskResList)) {
- List<ServiceSubtaskDetailRatioExport> detailList = serviceSubtaskService.getDetailRatio(sltdMydTotalVO, serviceSubtaskResList);
-
- if (CollectionUtils.isNotEmpty(detailList)) {
- Map<String, List<ServiceSubtaskDetailRatioExport>> groupedMap = detailList.stream().collect(Collectors.groupingBy(ServiceSubtaskDetailRatioExport::getQuestiontext));
-
- groupedMap.forEach((questionText, exportList) -> {
- QuestionResultDTO questionResultDTO = new QuestionResultDTO();
- questionResultDTO.setQeustionText(questionText);
- questionResultDTO.setSubtaskDetailRatioExportList(exportList);
- BigDecimal allCount = new BigDecimal("0");
- BigDecimal allScore = new BigDecimal("0.00");
-
- for (ServiceSubtaskDetailRatioExport ssdre : exportList) {
- if (StringUtils.isNotEmpty(ssdre.getCount()))
- allCount.add(BigDecimal.valueOf(Long.valueOf(ssdre.getCount())));
- allScore.add(BigDecimal.valueOf(Double.valueOf(ssdre.getScore())));
- }
-
- if (allCount.compareTo(BigDecimal.ZERO) > 0)
- questionResultDTO.setAvgScore(allScore.divide(allCount, 2).toString());
- result.add(questionResultDTO);
- });
- }
- }
-
- return success(result);
- }
-
- @ApiOperation("鐪佺珛鍚屽痉婊℃剰搴︽暟鎹粺璁￠�氳繃绉戝鎴栫梾鍖�")
- @PostMapping("/statQuestionOptionByKsOrBq")
- public Map<String, Object> statQuestionOptionByKsOrBq(@RequestBody QuestionCountKsOrBqVO questionResultVO) {
- return success(serviceSubtaskService.statQuestionOptionByKsOrBq(questionResultVO));
- }
-
- @ApiOperation("鐪佺珛鍚屽痉鎮ｈ�呮弧鎰忓害瓒嬪娍")
- @PostMapping("/mydTrend")
- public Map<String, Object> mydTrend(@RequestBody MydTrendReqVO mydTrendReqVO) {
- return success(serviceSubtaskService.mydTrend(mydTrendReqVO));
- }
-
- @ApiOperation("鐪佺珛鍚屽痉鎮ｈ�呮弧鎰忓害缁存姢")
- @PostMapping("/sltdMydTotalByDimension")
- public Map<String, Object> sltdMydTotalByDimension(@RequestBody MydTrendReqVO mydTrendReqVO) {
- return success(serviceSubtaskService.sltdMydTotalByDimension(mydTrendReqVO));
- }
-
- @ApiOperation("闂ㄨ瘖婊℃剰搴︾患鍚堝緱鍒嗘帓鍚嶏紙鎸夌瀹ゆ垨鐥呭尯锛�")
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/mzMydScoreRank")
- public Map<String, Object> mzMydScoreRank(@RequestBody MzMydScoreRankVO mzMydScoreRankVO) {
- return success(serviceSubtaskService.mzMydScoreRank(mzMydScoreRankVO));
- }
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3