From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/controller/SltdSatisfactionController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/controller/SltdSatisfactionController.java b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/controller/SltdSatisfactionController.java
index 88e3810..c89ab48 100644
--- a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/controller/SltdSatisfactionController.java
+++ b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/controller/SltdSatisfactionController.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.satisfaction.config.SatisfactionSwitch;
import com.ruoyi.satisfaction.domain.ServiceSubtaskDetailRatioExport;
import com.ruoyi.satisfaction.domain.dto.QuestionResultDTO;
import com.ruoyi.satisfaction.domain.row.SatisfactionSubtaskQuery;
@@ -12,7 +13,6 @@
import com.ruoyi.satisfaction.domain.vo.SltdMydTotalVO;
import com.ruoyi.satisfaction.service.SatisfactionSubtaskService;
import com.ruoyi.satisfaction.service.strategy.SatisfactionScoreStrategyResolver;
-import com.ruoyi.satisfaction.service.strategy.SatisfactionSites;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -53,11 +53,22 @@
public class SltdSatisfactionController extends BaseController {
/**
- * 绔欑偣鍙ｅ緞绛栫暐瑙ｆ瀽鍣細缁煎悎婊℃剰搴﹀緱鍒嗘寜绔欑偣锛堢渷绔嬪悓寰凤級鍙栫瓥鐣ヨ绠楋紝
+ * 绔欑偣鍙ｅ緞绛栫暐瑙ｆ瀽鍣細缁煎悎婊℃剰搴﹀緱鍒嗘寜绔欑偣鍙栫瓥鐣ヨ绠楋紝
* 涓嶅啀鎶婄畻娉曚笌甯搁噺鍐欏湪 Controller 閲屻��
+ * <p>
+ * 绔欑偣鏉ヨ嚜 {@code sys_config: satisfaction.site}锛堣 {@link SatisfactionSwitch#site()}锛夛細
+ * 鍚屽痉鐢� {@code sltd}锛堜簲妗ｆ枃妗堝姞鏉冿級锛屽崡鍗庣敤 {@code common}锛堟寜鏄庣粏 score 姹傚钩鍧囷級銆�
*/
@Autowired
private SatisfactionScoreStrategyResolver satisfactionScoreStrategyResolver;
+
+ /**
+ * 杩愯鏃堕厤缃紙绔欑偣鍙ｅ緞锛夈��2026-10-21 鏂板锛�
+ * 鍘熸潵杩欓噷鎶婂彛寰勫啓姝绘垚 {@code SatisfactionSites.SLTD}锛屽崡鍗庣殑鏁版嵁锛堟病鏈�"寰堟弧鎰�/婊℃剰/鈥�"浜旀。鏂囨锛�
+ * 涓�鏉￠�夐」閮藉尮閰嶄笉涓� 鈫� 缁煎悎寰楀垎鎭掍负 0.00銆�
+ */
+ @Autowired
+ private SatisfactionSwitch satisfactionSwitch;
@Autowired
private SatisfactionSubtaskService satisfactionSubtaskService;
@@ -83,8 +94,22 @@
query.setServiceType(st);
query.setEndOutHospTime(sltdMydTotalVO.getEndOutHospTime());
query.setStartOutHospTime(sltdMydTotalVO.getStartOutHospTime());
+ //瀹屾垚鏃堕棿锛氶〉闈㈡彁浜ょ殑鏄� startFinishTime / endFinishTime銆�
+ //鍘熸潵杩欎袱涓潯浠舵病鏈夊悜涓嬩紶锛屽彇瀛愪换鍔＄殑 SQL 瀹屽叏娌℃湁鏃堕棿鏉′欢
+ //鈫� 鍙ｅ緞鍋忓ぇ锛堢粺璁′簡鍏ㄩ儴鍘嗗彶锛変笖 service_subtask 琚暣琛ㄦ壂鎻�
+ query.setStartFinishTime(sltdMydTotalVO.getStartFinishTime());
+ query.setEndFinishTime(sltdMydTotalVO.getEndFinishTime());
query.setDeptOrDistrict(sltdMydTotalVO.getDeptOrDistrict());
+ //鐥呭尯 / 绉戝锛氭寜銆屼紶杩涙潵鐨勬槸鍝竴缁勫弬鏁般�嶅喅瀹氳繃婊ゅ摢涓�鍒楋紝涓嶅啀涓�寰嬫寜绂婚櫌鐥呭尯杩囨护
+ // hospitaldistrictcodes 鈫� hospitaldistrictcode 鍦ㄩ櫌/褰撳墠鐥呭尯
+ // leavehospitaldistrictcodes 鈫� leavehospitaldistrictcode 绂婚櫌鐥呭尯
+ // deptcodes 鈫� deptcode 鍦ㄩ櫌/褰撳墠绉戝
+ // leaveldeptcodes 鈫� leaveldeptcode 绂婚櫌绉戝
+ //鍘熸潵 hospitaldistrictcodes 杩欎釜瀛楁鍦� VO 涓婃牴鏈笉瀛樺湪锛岃 Jackson 闈欓粯涓㈠純锛�
+ //瀵艰嚧鐥呭尯鏉′欢浠庢湭鎷艰繘 SQL锛堟煡 40003514 鐥呭尯鍗存妸楠ㄧ绛夊叾瀹冪梾鍖虹殑鏁版嵁涓�璧风粺璁′簡锛�
+ query.setHospitaldistrictcodes(sltdMydTotalVO.getHospitaldistrictcodes());
query.setLeavehospitaldistrictcodes(sltdMydTotalVO.getLeavehospitaldistrictcodes());
+ query.setDeptcodes(sltdMydTotalVO.getDeptcodes());
query.setLeaveldeptcodes(sltdMydTotalVO.getLeaveldeptcodes());
//鏈烘瀯/闄㈠尯鐢� @AddOrgId 娉ㄥ叆锛岃惤鍒版煡璇㈡潯浠朵笂锛岄伩鍏嶈法鏈烘瀯鍙栨暟
query.setOrgid(sltdMydTotalVO.getOrgid());
@@ -165,7 +190,7 @@
*/
private String calcMydScore(List<ServiceSubtaskDetailRatioExport> exportList) {
BigDecimal score = satisfactionScoreStrategyResolver
- .resolve(SatisfactionSites.SLTD)
+ .resolve(satisfactionSwitch.site())
.comprehensiveScore(exportList);
return score == null ? "0.00" : score.toPlainString();
}
--
Gitblit v1.9.3