From 8a843480b698be76bc5953ab6d0b322de4cad44f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Oct 2024 17:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?Double?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/dto/CompListDTO.java | 6 +++--- .../entity/company/param/CompParam.java | 4 ++-- .../organization/entity/company/po/CompPO.java | 12 ++++++------ .../entity/department/bo/DepartmentBO.java | 2 +- .../entity/department/param/DeptSearchParam.java | 2 +- .../entity/department/po/DepartmentPO.java | 2 +- .../entity/hrmresource/po/ResourcePO.java | 2 +- .../engine/organization/entity/job/bo/JobBO.java | 2 +- .../entity/job/param/JobSearchParam.java | 2 +- .../engine/organization/entity/job/po/JobPO.java | 2 +- .../entity/searchtree/SearchTree.java | 16 ++++++++-------- .../organization/mapper/job/JobMapper.java | 2 +- .../engine/organization/mapper/job/JobMapper.xml | 2 +- .../service/impl/JobServiceImpl.java | 8 ++++---- .../service/impl/PersonnelResumeServiceImpl.java | 2 +- .../organization/util/tree/SearchTreeUtil.java | 8 ++++---- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index c3bae817..36e3b484 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -59,7 +59,7 @@ public class CompListDTO { @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true) - private Integer showOrder; + private Double showOrder; /** * 禁用标记 @@ -78,8 +78,8 @@ public class CompListDTO { */ private List children; - public Integer getShowOrder() { - return null == showOrder ? 0 : showOrder; + public Double getShowOrder() { + return null == showOrder ? 0.00 : showOrder; } private String orderType; diff --git a/src/com/engine/organization/entity/company/param/CompParam.java b/src/com/engine/organization/entity/company/param/CompParam.java index 37f40917..c44fe39d 100644 --- a/src/com/engine/organization/entity/company/param/CompParam.java +++ b/src/com/engine/organization/entity/company/param/CompParam.java @@ -25,6 +25,6 @@ public class CompParam extends BaseQueryParam { private String outKey; private Integer limitUsers; private String uuid; - private Integer showOrder; - private Integer showOrderOfTree; + private Double showOrder; + private Double showOrderOfTree; } diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index e88eb539..341c7d0a 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -32,19 +32,19 @@ public class CompPO { private Date modified; private Integer modifier; private String uuid; - private Integer showOrder; - private Integer showOrderOfTree; + private Double showOrder; + private Double showOrderOfTree; - public Integer getShowOrder() { + public Double getShowOrder() { if (null == showOrder) { - return 0; + return 0.00; } return showOrder; } - public Integer getShowOrderOfTree() { + public Double getShowOrderOfTree() { if (null == showOrderOfTree) { - return 0; + return 0.00; } return showOrderOfTree; } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index dd2127e2..f3826341 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -172,7 +172,7 @@ public class DepartmentBO { tree.setSelected(false); tree.setType("2"); tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); - tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue()); + tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue()); tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree()); return tree; }).collect(Collectors.toList()); diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 76736320..7cdefeb1 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -28,5 +28,5 @@ public class DeptSearchParam extends BaseQueryParam { private String uuid; private Double showOrder; - private Integer showOrderOfTree; + private Double showOrderOfTree; } diff --git a/src/com/engine/organization/entity/department/po/DepartmentPO.java b/src/com/engine/organization/entity/department/po/DepartmentPO.java index ba80e5e7..0411d786 100644 --- a/src/com/engine/organization/entity/department/po/DepartmentPO.java +++ b/src/com/engine/organization/entity/department/po/DepartmentPO.java @@ -35,6 +35,6 @@ public class DepartmentPO { private Integer modifier; private String uuid; private Double showOrder; - private Integer showOrderOfTree; + private Double showOrderOfTree; } diff --git a/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java b/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java index c7faae1b..76d7de30 100644 --- a/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java +++ b/src/com/engine/organization/entity/hrmresource/po/ResourcePO.java @@ -27,7 +27,7 @@ public class ResourcePO { private Integer jobtitle; private String lastName; - private Integer dspOrder; + private Double dspOrder; /** * 临时关联聚才林岗位ID diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index d10ac66e..e9b5c209 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -156,7 +156,7 @@ public class JobBO { tree.setSelected(false); tree.setType("3"); tree.setParentComp(null == item.getEcDepartment() ? "0" : item.getEcDepartment().toString()); - tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder()); + tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder()); return tree; }).collect(Collectors.toList()); diff --git a/src/com/engine/organization/entity/job/param/JobSearchParam.java b/src/com/engine/organization/entity/job/param/JobSearchParam.java index fd1871f4..3d6b96a2 100644 --- a/src/com/engine/organization/entity/job/param/JobSearchParam.java +++ b/src/com/engine/organization/entity/job/param/JobSearchParam.java @@ -75,7 +75,7 @@ public class JobSearchParam extends BaseQueryParam { /** * 显示顺序 */ - private Integer showOrder; + private Double showOrder; private Integer subcompanyid1; diff --git a/src/com/engine/organization/entity/job/po/JobPO.java b/src/com/engine/organization/entity/job/po/JobPO.java index c7cb358a..8636f7c8 100644 --- a/src/com/engine/organization/entity/job/po/JobPO.java +++ b/src/com/engine/organization/entity/job/po/JobPO.java @@ -87,7 +87,7 @@ public class JobPO { /** * 显示顺序 */ - private Integer showOrder; + private Double showOrder; private String gradeId; diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index 6c3b000f..68f9cf0c 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -18,8 +18,8 @@ public class SearchTree extends TreeNode { private boolean isCanceled; private String requestParams; private String parentComp; - private Integer orderNum; - private Integer showOrderOfTree; + private Double orderNum; + private Double showOrderOfTree; public String getCompanyid() { return companyid; @@ -77,25 +77,25 @@ public class SearchTree extends TreeNode { this.parentComp = parentComp; } - public Integer getOrderNum() { + public Double getOrderNum() { if(null==orderNum){ - return 0; + return 0.00; } return orderNum; } - public void setOrderNum(Integer orderNum) { + public void setOrderNum(Double orderNum) { this.orderNum = orderNum; } - public Integer getShowOrderOfTree() { + public Double getShowOrderOfTree() { if(null==showOrderOfTree){ - return 0; + return 0.00; } return showOrderOfTree; } - public void setShowOrderOfTree(Integer showOrderOfTree) { + public void setShowOrderOfTree(Double showOrderOfTree) { this.showOrderOfTree = showOrderOfTree; } diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 275db287..2fc9c2ec 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -130,7 +130,7 @@ public interface JobMapper { * * @return */ - Integer getMaxShowOrder(); + Double getMaxShowOrder(); /** * 根据名字和上级查询岗位信息 diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 2580bdb5..a9cce49b 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -467,7 +467,7 @@ and t.forbidden_tag = #{jobPO.forbiddenTag} - select max(show_order) from jcl_org_job diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a8efd3bd..3735116a 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -367,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService { } if (StringUtils.isBlank(params.get("show_order").toString())) { - Integer maxShowOrder = getJobMapper().getMaxShowOrder(); + Double maxShowOrder = getJobMapper().getMaxShowOrder(); if (null == maxShowOrder) { - maxShowOrder = 0; + maxShowOrder = 0.00; } params.put("show_order", maxShowOrder + 1); } @@ -433,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService { OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage())); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); - Integer orderNum = getJobMapper().getMaxShowOrder(); - orderNum = null == orderNum ? 0 : orderNum; + Double orderNum = getJobMapper().getMaxShowOrder(); + orderNum = null == orderNum ? 0.00 : orderNum; for (Long id : idList) { orderNum++; JobPO jobById = getJobMapper().getJobById(id); diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index c25bc783..632b991c 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu jobPO.setDescription(description); jobPO.setWorkDuty(work_duty); jobPO.setWorkAuthority(work_authority); - jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order)); + jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order)); jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag)); jobPO.setGradeId(grade_id); jobPO.setLevelId(level_id); diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 2ba24e24..0b5a30b9 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -92,8 +92,8 @@ public class SearchTreeUtil { List collect = treeList.stream().peek(e -> { if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { List nodes = collects.get(e.getId()).stream().sorted(Comparator - .comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + .comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ) .collect(Collectors.toList()); e.setSubs(nodes); @@ -122,8 +122,8 @@ public class SearchTreeUtil { Set treeNodes = new LinkedHashSet<>(); if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { List searchTrees = childMap.get(e.getId()).stream().sorted( - Comparator.comparing(SearchTree::getOrderNum) - .thenComparing(SearchTree::getShowOrderOfTree) + Comparator.comparingDouble(SearchTree::getOrderNum) + .thenComparingDouble(SearchTree::getShowOrderOfTree) ).collect(Collectors.toList()); treeNodes.addAll(searchTrees); }