From e4872d9fdd9f277eacc518459418cb406570b99a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 九月 2026 10:57:28 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
index 467b46c..544bf9d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatSatisfactionController.java
@@ -121,14 +121,8 @@
@Log(title = "鎮h�呮弧鎰忓害", businessType = BusinessType.INSERT)
@PostMapping("/batchinsert")
public AjaxResult batchinsert(@RequestBody List<PatSatisfaction> patSatisfaction) {
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- for (PatSatisfaction patSatisfaction1 : patSatisfaction) {
- patSatisfaction1.setCreateBy(user.getNickName());
- patSatisfaction1.setOrgid(user.getOrgid());
- patSatisfactionService.insertPatSatisfaction(patSatisfaction1);
- }
- return toAjax(1);
+ Integer row = patSatisfactionService.batchInsert(patSatisfaction);
+ return toAjax(row);
}
/**
@@ -167,15 +161,37 @@
PatSatisfactionResVO statistics = patSatisfactionService.statistics(patSatisfactionReqVO);
return getDataTable3(CollectionUtils.isNotEmpty(statistics.getPatSatisfactionDetailEntities()) ? statistics.getPatSatisfactionDetailEntities().size() : 0, statistics);
}
+
+ /**
+ /**
+ * 鎮h�呮弧鎰忓害缁熻锛堢淮搴︼級
+ */
+ @ApiOperation("鎮h�呮弧鎰忓害缁熻锛堢淮搴︼級")
+ @PostMapping("/statisticsByDimension")
+ public Map<String, Object> statisticsByDimension(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
+ //鍚庣涓嶅仛鍒嗛〉浜嗭紝鐢卞墠绔仛
+ PatSatisfactionResVO statistics = patSatisfactionService.statisticsByDimension(patSatisfactionReqVO);
+ return getDataTable3(CollectionUtils.isNotEmpty(statistics.getPatSatisfactionDetailEntities()) ? statistics.getPatSatisfactionDetailEntities().size() : 0, statistics);
+ }
/**
* 鎮h�呮弧鎰忓害鏌辩姸鍥句俊鎭�
*/
- @ApiOperation("鎮h�呮弧鎰忓害鏌辩姸鍥句俊鎭�")
+ @ApiOperation("鎮h�呮弧鎰忓害鏌辩姸鍥句俊鎭紙鍒嗙被)")
@PostMapping("/satisfactionGraph")
public Map<String, Object> satisfactionGraph(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
Map<String, Object> patSatisfactionGraphResVOS = patSatisfactionService.satisfactionGraph(patSatisfactionReqVO);
return getDataTable3(0, patSatisfactionGraphResVOS);
}
+ /**
+ * 鎮h�呮弧鎰忓害鏌辩姸鍥句俊鎭�
+ */
+ @ApiOperation("鎮h�呮弧鎰忓害鏌辩姸鍥句俊鎭�(缁村害)")
+ @PostMapping("/satisfactionGraphDimension")
+ public Map<String, Object> satisfactionGraphDimension(@RequestBody PatSatisfactionReqVO patSatisfactionReqVO) {
+ Map<String, Object> patSatisfactionGraphResVOS = patSatisfactionService.satisfactionGraphDimension(patSatisfactionReqVO);
+ return getDataTable3(0, patSatisfactionGraphResVOS);
+ }
+
}
--
Gitblit v1.9.3