From 432bc99cd9375eb330ae04c406692e7218f5a6c5 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 26 Oct 2022 09:41:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9B=B4=E5=B1=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScreenDeptEventEfficiencyServiceImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
index 9aa781f2b..4adfdb976 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
@@ -348,7 +348,10 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
                 //默认排序
                 if (NumConstant.TWO_STR.equals(formDTO.getType())) {
                     //直属部门
-                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()).collect(Collectors.toList());
+                    list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()
+                            .thenComparing(EfficiencyEvaluationResultDTO::getClosedCount, Comparator.reverseOrder())
+                            .thenComparing(EfficiencyEvaluationResultDTO::getEventCount, Comparator.reverseOrder())
+                    ).collect(Collectors.toList());
                 } else {
                     //下级组织
                     list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed()

From d692b4fb124d99912304353ed2affcca9fe9821a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 26 Oct 2022 10:20:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9B=B4=E5=B1=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenDeptEventEfficiencyServiceImpl.java | 60 +++++++++++++++----
 .../screen/ScreenDeptEventEfficiencyDao.xml   | 14 ++---
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
index 4adfdb976..353ddf754 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
@@ -295,25 +295,43 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
                         //升序
                         if (NumConstant.ONE_STR.equals(formDTO.getSort())) {
                             //事件数
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getEventCount)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getEventCount)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedCount)).collect(Collectors.toList());
+
                         } else if (NumConstant.TWO_STR.equals(formDTO.getSort())) {
                             //结案数
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedCount)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedCount)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getEventCount)
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.THREE_STR.equals(formDTO.getSort())) {
                             //办结率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedCount)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getEventCount)
+                            ).collect(Collectors.toList());
                         }
                     } else {
                         //降序
                         if (NumConstant.ONE_STR.equals(formDTO.getSort())) {
                             //事件数
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getEventCount).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getEventCount).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedCount, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.TWO_STR.equals(formDTO.getSort())) {
                             //结案数
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedCount).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedCount).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getEventCount, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.THREE_STR.equals(formDTO.getSort())) {
                             //办结率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedCount, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getEventCount, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         }
                     }
                 } else {
@@ -322,25 +340,43 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
                         //升序
                         if (NumConstant.ONE_STR.equals(formDTO.getSort())) {
                             //响应率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getResponseRatio)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getResponseRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.TWO_STR.equals(formDTO.getSort())) {
                             //办结率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getResponseRatio)
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.THREE_STR.equals(formDTO.getSort())) {
                             //满意率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio)).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio)
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getResponseRatio)
+                            ).collect(Collectors.toList());
                         }
                     } else {
                         //降序
                         if (NumConstant.ONE_STR.equals(formDTO.getSort())) {
                             //响应率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getResponseRatio).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getResponseRatio).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.TWO_STR.equals(formDTO.getSort())) {
                             //办结率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getClosedRatio).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getResponseRatio, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         } else if (NumConstant.THREE_STR.equals(formDTO.getSort())) {
                             //满意率
-                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed()).collect(Collectors.toList());
+                            list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed()
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getClosedRatio, Comparator.reverseOrder())
+                                    .thenComparing(EfficiencyEvaluationResultDTO::getResponseRatio, Comparator.reverseOrder())
+                            ).collect(Collectors.toList());
                         }
                     }
                 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
index 1bd85d98c..e6b5ac34c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
@@ -446,7 +446,7 @@
             <when test='type == "2"'>
                 <choose>
                     <when test='"1" == sort'>
-                        ORDER BY EVENT_COUNT
+                        ORDER BY EVENT_COUNT, CLOSED_RATIO+0, CLOSED_COUNT
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC
@@ -457,7 +457,7 @@
                         </choose>
                     </when>
                     <when test='"2" == sort'>
-                        ORDER BY CLOSED_COUNT
+                        ORDER BY CLOSED_COUNT, CLOSED_RATIO+0, EVENT_COUNT
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC
@@ -468,7 +468,7 @@
                         </choose>
                     </when>
                     <when test='"3" == sort'>
-                        ORDER BY CLOSED_RATIO+0
+                        ORDER BY CLOSED_RATIO+0, CLOSED_COUNT, EVENT_COUNT
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC
@@ -479,14 +479,14 @@
                         </choose>
                     </when>
                     <otherwise>
-                        ORDER BY CLOSED_RATIO+0 DESC
+                        ORDER BY CLOSED_RATIO+0 DESC, CLOSED_COUNT DESC, EVENT_COUNT DESC
                     </otherwise>
                 </choose>
             </when>
             <otherwise>
                 <choose>
                     <when test='"1" == sort'>
-                        ORDER BY RESPONSE_RATIO+0
+                        ORDER BY RESPONSE_RATIO+0, SATISFIED_RATIO+0, CLOSED_RATIO+0
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC
@@ -497,7 +497,7 @@
                         </choose>
                     </when>
                     <when test='"2" == sort'>
-                        ORDER BY CLOSED_RATIO+0
+                        ORDER BY CLOSED_RATIO+0, SATISFIED_RATIO+0, RESPONSE_RATIO+0
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC
@@ -508,7 +508,7 @@
                         </choose>
                     </when>
                     <when test='"3" == sort'>
-                        ORDER BY SATISFIED_RATIO+0
+                        ORDER BY SATISFIED_RATIO+0, CLOSED_RATIO+0, RESPONSE_RATIO+0
                         <choose>
                             <when test="'asc' == sortType">
                                 ASC