elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'feature/bssb_screen' into feature/shenyan_shangbao

feature/dangjian
zhangyuan 3 years ago
parent
f1e4c3d434 d692b4fb12
commit
9cfa26fb8e
2 changed files with 59 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
  2. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml

65
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
View File

@ -295,25 +295,43 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
//升序 //升序
if (NumConstant.ONE_STR.equals(formDTO.getSort())) { 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())) { } 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())) { } 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 { } else {
//降序 //降序
if (NumConstant.ONE_STR.equals(formDTO.getSort())) { 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())) { } 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())) { } 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 { } else {
@ -322,25 +340,43 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
//升序 //升序
if (NumConstant.ONE_STR.equals(formDTO.getSort())) { 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())) { } 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())) { } 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 { } else {
//降序 //降序
if (NumConstant.ONE_STR.equals(formDTO.getSort())) { 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())) { } 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())) { } 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());
} }
} }
} }
@ -348,7 +384,10 @@ public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<Screen
//默认排序 //默认排序
if (NumConstant.TWO_STR.equals(formDTO.getType())) { 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 { } else {
//下级组织 //下级组织
list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed() list = list.stream().sorted(Comparator.comparing(EfficiencyEvaluationResultDTO::getSatisfiedRatio).reversed()

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
View File

@ -446,7 +446,7 @@
<when test='type == "2"'> <when test='type == "2"'>
<choose> <choose>
<when test='"1" == sort'> <when test='"1" == sort'>
ORDER BY EVENT_COUNT ORDER BY EVENT_COUNT, CLOSED_RATIO+0, CLOSED_COUNT
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC
@ -457,7 +457,7 @@
</choose> </choose>
</when> </when>
<when test='"2" == sort'> <when test='"2" == sort'>
ORDER BY CLOSED_COUNT ORDER BY CLOSED_COUNT, CLOSED_RATIO+0, EVENT_COUNT
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC
@ -468,7 +468,7 @@
</choose> </choose>
</when> </when>
<when test='"3" == sort'> <when test='"3" == sort'>
ORDER BY CLOSED_RATIO+0 ORDER BY CLOSED_RATIO+0, CLOSED_COUNT, EVENT_COUNT
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC
@ -479,14 +479,14 @@
</choose> </choose>
</when> </when>
<otherwise> <otherwise>
ORDER BY CLOSED_RATIO+0 DESC ORDER BY CLOSED_RATIO+0 DESC, CLOSED_COUNT DESC, EVENT_COUNT DESC
</otherwise> </otherwise>
</choose> </choose>
</when> </when>
<otherwise> <otherwise>
<choose> <choose>
<when test='"1" == sort'> <when test='"1" == sort'>
ORDER BY RESPONSE_RATIO+0 ORDER BY RESPONSE_RATIO+0, SATISFIED_RATIO+0, CLOSED_RATIO+0
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC
@ -497,7 +497,7 @@
</choose> </choose>
</when> </when>
<when test='"2" == sort'> <when test='"2" == sort'>
ORDER BY CLOSED_RATIO+0 ORDER BY CLOSED_RATIO+0, SATISFIED_RATIO+0, RESPONSE_RATIO+0
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC
@ -508,7 +508,7 @@
</choose> </choose>
</when> </when>
<when test='"3" == sort'> <when test='"3" == sort'>
ORDER BY SATISFIED_RATIO+0 ORDER BY SATISFIED_RATIO+0, CLOSED_RATIO+0, RESPONSE_RATIO+0
<choose> <choose>
<when test="'asc' == sortType"> <when test="'asc' == sortType">
ASC ASC

Write Preview
Loading…
Cancel
Save