From 532715fc30070ec8902dea72ecd0f32644600072 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 14 Apr 2023 09:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        |  4 +-
 .../impl/ProcessInfoEOServiceImpl.java        | 46 ++++++++-----------
 .../modules/todoCenter/vo/ProcessInfoVO.java  |  2 +
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index 24f7d0ea7..0a92b391d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -115,7 +115,7 @@
     <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
         select
                temp.*,
-               (case temp.flow_type when '10' THEN '1'  when '21' THEN '2'  when '2' THEN '3' when '4' THEN '4' END) as "flowTypeShowOrderBy"
+               (case temp.flow_type when '10' THEN '1'  when '21' THEN '2'  when '2' THEN '3' when '4' THEN '4' END) as flow_type_show_order_by
             from (
                SELECT
                    pi.id,
@@ -255,7 +255,7 @@
             temp.project_name,
             standard_info IS NULL,
             standard_info,
-            flowTypeShowOrderBy
+            flow_type_show_order_by
         ASC
     </select>
     <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 7fef4fd26..f6f5758c9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -261,17 +261,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 			if("flow_type".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1, e2)->{
-						if(e1.getFlowTypeShow() != null && e2.getFlowTypeShow() != null){
-							return comparator.compare(e1.getFlowTypeShow(),e2.getFlowTypeShow());
-						}
-						return -1;
+						String e1FlowTypeShowOrderBy = StringUtils.isNotEmpty(e1.getFlowTypeShowOrderBy()) ? e1.getFlowTypeShowOrderBy() : "";
+						String e2FlowTypeShowOrderBy = StringUtils.isNotEmpty(e2.getFlowTypeShowOrderBy()) ? e2.getFlowTypeShowOrderBy() : "";
+						return comparator.compare(e1FlowTypeShowOrderBy,e2FlowTypeShowOrderBy);
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1,e2)->{
-						if(e1.getFlowTypeShow() != null && e2.getFlowTypeShow() != null){
-							return comparator.compare(e2.getFlowTypeShow(),e1.getFlowTypeShow());
-						}
-						return -1;
+						String e1FlowTypeShowOrderBy = StringUtils.isNotEmpty(e1.getFlowTypeShowOrderBy()) ? e1.getFlowTypeShowOrderBy() : "";
+						String e2FlowTypeShowOrderBy = StringUtils.isNotEmpty(e2.getFlowTypeShowOrderBy()) ? e2.getFlowTypeShowOrderBy() : "";
+						return comparator.compare(e2FlowTypeShowOrderBy,e1FlowTypeShowOrderBy);
 					});
 				}
 			}
@@ -280,17 +278,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 			if("task_definition_key".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1, e2)->{
-						if(e1.getTaskDefinitionKeyName() != null && e2.getTaskDefinitionKeyName() != null){
-							return comparator.compare(e1.getTaskDefinitionKeyName(),e2.getTaskDefinitionKeyName());
-						}
-						return -1;
+						String e1TaskDefinitionKeyName = StringUtils.isNotEmpty(e1.getTaskDefinitionKeyName()) ? e1.getTaskDefinitionKeyName() : "";
+						String e2TaskDefinitionKeyName = StringUtils.isNotEmpty(e2.getTaskDefinitionKeyName()) ? e2.getTaskDefinitionKeyName() : "";
+						return comparator.compare(e1TaskDefinitionKeyName,e2TaskDefinitionKeyName);
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1,e2)->{
-						if(e1.getTaskDefinitionKeyName() != null && e2.getTaskDefinitionKeyName() != null){
-							return comparator.compare(e2.getTaskDefinitionKeyName(),e1.getTaskDefinitionKeyName());
-						}
-						return -1;
+						String e1TaskDefinitionKeyName = StringUtils.isNotEmpty(e1.getTaskDefinitionKeyName()) ? e1.getTaskDefinitionKeyName() : "";
+						String e2TaskDefinitionKeyName = StringUtils.isNotEmpty(e2.getTaskDefinitionKeyName()) ? e2.getTaskDefinitionKeyName() : "";
+						return comparator.compare(e2TaskDefinitionKeyName,e1TaskDefinitionKeyName);
 					});
 				}
 			}
@@ -299,21 +295,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 			if("endTime".equals(orderByField)){
 				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1, e2)->{
-						if(e1.getEndTime() != null && e2.getEndTime() != null){
-							String e1EndTime = DateUtils.formatDate(e1.getEndTime());
-							String e2EndTime = DateUtils.formatDate(e2.getEndTime());
-							return comparator.compare(e1EndTime,e2EndTime);
-						}
-						return -1;
+						String e1EndTime = e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "";
+						String e2EndTime = e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "";
+						return comparator.compare(e1EndTime,e2EndTime);
 					});
 				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
 					Collections.sort(result,(e1,e2)->{
-						if(e1.getEndTime() != null && e2.getEndTime() != null){
-							String e1EndTime = DateUtils.formatDate(e1.getEndTime());
-							String e2EndTime = DateUtils.formatDate(e2.getEndTime());
-							return comparator.compare(e2EndTime,e1EndTime);
-						}
-						return -1;
+						String e1EndTime = e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "";
+						String e2EndTime = e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "";
+						return comparator.compare(e2EndTime,e1EndTime);
 					});
 				}
 			}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
index beae3265d..65b62c02f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
@@ -118,4 +118,6 @@ public class ProcessInfoVO implements Serializable {
     private String deliverableTypeName;
     /**责任领域展示抿成**/
     private String dutyTerritoryName;
+    /**流程类型排序字段*/
+    private String flowTypeShowOrderBy;
 }