ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 体系支持小数排序

Browse Source
This commit is contained in:
mzaxd
2024-08-23 14:13:30 +08:00
parent 9ec3fe9ab8
commit becbbb1340
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java
+1 -2
View File
@@ -1,7 +1,6 @@
package com.jero.modules.laws.enterprise.entity.vo; package com.jero.modules.laws.enterprise.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.system.vo.SysDepartTreeModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@@ -76,7 +75,7 @@ public class LawsTreeNodeModel {
private java.lang.Integer nodeType; private java.lang.Integer nodeType;
/**排序*/ /**排序*/
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.Integer nodeOrder; private java.lang.Double nodeOrder;
private List<LawsTreeNodeModel> children = new ArrayList<>(); private List<LawsTreeNodeModel> children = new ArrayList<>();
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java
+1 -1
View File
@@ -75,5 +75,5 @@ public class LawsTreeNode implements Serializable {
private java.lang.Integer nodeType; private java.lang.Integer nodeType;
/**排序*/ /**排序*/
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.String nodeOrder; private java.lang.Double nodeOrder;
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java
+2 -2
View File
@@ -93,7 +93,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
} }
// 对当前层级的节点按 nodeOrder 排序，将 null 视为 0 // 对当前层级的节点按 nodeOrder 排序，将 null 视为 0
nodes.sort(Comparator.comparingInt(node -> nodes.sort(Comparator.comparingDouble(node ->
node.getNodeOrder() != null ? node.getNodeOrder() : 0)); node.getNodeOrder() != null ? node.getNodeOrder() : 0));
// 递归对每个节点的子节点进行排序 // 递归对每个节点的子节点进行排序
@@ -236,7 +236,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
for (LawsTreeNode node : list) { for (LawsTreeNode node : list) {
String nodeCode = node.getNodeCode(); String nodeCode = node.getNodeCode();
String order = nodeCode.substring(nodeCode.length() - 1); String order = nodeCode.substring(nodeCode.length() - 1);
node.setNodeOrder(order); node.setNodeOrder(Double.valueOf(order));
this.updateById(node); this.updateById(node);
} }
} }