WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办中心-表头排序。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-14 09:37:00 +08:00
parent d64b3e0f44
commit 532715fc30
3 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+2 -2
View File
@@ -115,7 +115,7 @@
<select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO"> <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select select
temp.*, 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 ( from (
SELECT SELECT
pi.id, pi.id,
@@ -255,7 +255,7 @@
temp.project_name, temp.project_name,
standard_info IS NULL, standard_info IS NULL,
standard_info, standard_info,
flowTypeShowOrderBy flow_type_show_order_by
ASC ASC
</select> </select>
<select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO"> <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+16 -26
View File
@@ -261,17 +261,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
if("flow_type".equals(orderByField)){ if("flow_type".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{ Collections.sort(result,(e1, e2)->{
if(e1.getFlowTypeShow() != null && e2.getFlowTypeShow() != null){ String e1FlowTypeShowOrderBy = StringUtils.isNotEmpty(e1.getFlowTypeShowOrderBy()) ? e1.getFlowTypeShowOrderBy() : "";
return comparator.compare(e1.getFlowTypeShow(),e2.getFlowTypeShow()); String e2FlowTypeShowOrderBy = StringUtils.isNotEmpty(e2.getFlowTypeShowOrderBy()) ? e2.getFlowTypeShowOrderBy() : "";
} return comparator.compare(e1FlowTypeShowOrderBy,e2FlowTypeShowOrderBy);
return -1;
}); });
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{ Collections.sort(result,(e1,e2)->{
if(e1.getFlowTypeShow() != null && e2.getFlowTypeShow() != null){ String e1FlowTypeShowOrderBy = StringUtils.isNotEmpty(e1.getFlowTypeShowOrderBy()) ? e1.getFlowTypeShowOrderBy() : "";
return comparator.compare(e2.getFlowTypeShow(),e1.getFlowTypeShow()); String e2FlowTypeShowOrderBy = StringUtils.isNotEmpty(e2.getFlowTypeShowOrderBy()) ? e2.getFlowTypeShowOrderBy() : "";
} return comparator.compare(e2FlowTypeShowOrderBy,e1FlowTypeShowOrderBy);
return -1;
}); });
} }
} }
@@ -280,17 +278,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
if("task_definition_key".equals(orderByField)){ if("task_definition_key".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{ Collections.sort(result,(e1, e2)->{
if(e1.getTaskDefinitionKeyName() != null && e2.getTaskDefinitionKeyName() != null){ String e1TaskDefinitionKeyName = StringUtils.isNotEmpty(e1.getTaskDefinitionKeyName()) ? e1.getTaskDefinitionKeyName() : "";
return comparator.compare(e1.getTaskDefinitionKeyName(),e2.getTaskDefinitionKeyName()); String e2TaskDefinitionKeyName = StringUtils.isNotEmpty(e2.getTaskDefinitionKeyName()) ? e2.getTaskDefinitionKeyName() : "";
} return comparator.compare(e1TaskDefinitionKeyName,e2TaskDefinitionKeyName);
return -1;
}); });
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{ Collections.sort(result,(e1,e2)->{
if(e1.getTaskDefinitionKeyName() != null && e2.getTaskDefinitionKeyName() != null){ String e1TaskDefinitionKeyName = StringUtils.isNotEmpty(e1.getTaskDefinitionKeyName()) ? e1.getTaskDefinitionKeyName() : "";
return comparator.compare(e2.getTaskDefinitionKeyName(),e1.getTaskDefinitionKeyName()); String e2TaskDefinitionKeyName = StringUtils.isNotEmpty(e2.getTaskDefinitionKeyName()) ? e2.getTaskDefinitionKeyName() : "";
} return comparator.compare(e2TaskDefinitionKeyName,e1TaskDefinitionKeyName);
return -1;
}); });
} }
} }
@@ -299,21 +295,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
if("endTime".equals(orderByField)){ if("endTime".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{ Collections.sort(result,(e1, e2)->{
if(e1.getEndTime() != null && e2.getEndTime() != null){ String e1EndTime = e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "";
String e1EndTime = DateUtils.formatDate(e1.getEndTime()); String e2EndTime = e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "";
String e2EndTime = DateUtils.formatDate(e2.getEndTime());
return comparator.compare(e1EndTime,e2EndTime); return comparator.compare(e1EndTime,e2EndTime);
}
return -1;
}); });
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{ Collections.sort(result,(e1,e2)->{
if(e1.getEndTime() != null && e2.getEndTime() != null){ String e1EndTime = e1.getEndTime() != null ? DateUtils.formatDate(e1.getEndTime()) : "";
String e1EndTime = DateUtils.formatDate(e1.getEndTime()); String e2EndTime = e2.getEndTime() != null ? DateUtils.formatDate(e2.getEndTime()) : "";
String e2EndTime = DateUtils.formatDate(e2.getEndTime());
return comparator.compare(e2EndTime,e1EndTime); return comparator.compare(e2EndTime,e1EndTime);
}
return -1;
}); });
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+2
View File
@@ -118,4 +118,6 @@ public class ProcessInfoVO implements Serializable {
private String deliverableTypeName; private String deliverableTypeName;
/**责任领域展示抿成**/ /**责任领域展示抿成**/
private String dutyTerritoryName; private String dutyTerritoryName;
/**流程类型排序字段*/
private String flowTypeShowOrderBy;
} }