组织架构 排序字段调整为Double

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<CompListDTO> children;
 
-    public Integer getShowOrder() {
+    public Double getShowOrder() {
-        return null == showOrder ? 0 : showOrder;
+        return null == showOrder ? 0.00 : showOrder;
     }
 
     private String orderType;

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 Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 }

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 Double showOrder;
-    private Integer showOrderOfTree;
+    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;
     }

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());

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;
 }

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;
 
 }

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

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());
 

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;
 

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;
 

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 Double orderNum;
-    private Integer showOrderOfTree;
+    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;
     }
 

src/com/engine/organization/mapper/job/JobMapper.java

@@ -130,7 +130,7 @@ public interface JobMapper {
      *
      * @return
      */
-    Integer getMaxShowOrder();
+    Double getMaxShowOrder();
 
     /**
      * 根据名字和上级查询岗位信息

src/com/engine/organization/mapper/job/JobMapper.xml

@@ -467,7 +467,7 @@
             and t.forbidden_tag = #{jobPO.forbiddenTag}
         </if>
     </select>
-    <select id="getMaxShowOrder" resultType="java.lang.Integer">
+    <select id="getMaxShowOrder" resultType="java.lang.Double">
         select max(show_order)
         from jcl_org_job
     </select>

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<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-        Integer orderNum = getJobMapper().getMaxShowOrder();
+        Double orderNum = getJobMapper().getMaxShowOrder();
-        orderNum = null == orderNum ? 0 : orderNum;
+        orderNum = null == orderNum ? 0.00 : orderNum;
         for (Long id : idList) {
             orderNum++;
             JobPO jobById = getJobMapper().getJobById(id);

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);

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -92,8 +92,8 @@ public class SearchTreeUtil {
         List<SearchTree> collect = treeList.stream().peek(e -> {
             if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) {
                 List<TreeNode> nodes = collects.get(e.getId()).stream().sorted(Comparator
-                                .comparing(SearchTree::getOrderNum)
+                                .comparingDouble(SearchTree::getOrderNum)
-                                .thenComparing(SearchTree::getShowOrderOfTree)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
                         )
                         .collect(Collectors.toList());
                 e.setSubs(nodes);
@@ -122,8 +122,8 @@ public class SearchTreeUtil {
             Set<TreeNode> treeNodes = new LinkedHashSet<>();
             if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
                 List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(
-                        Comparator.comparing(SearchTree::getOrderNum)
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
-                                .thenComparing(SearchTree::getShowOrderOfTree)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
                 ).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }