Przeglądaj źródła

字典添加排序字段

李进 2 lat temu
rodzic
commit
f3ff3ba2c6

+ 5 - 0
sys-api-service/src/main/java/com/xy/entity/SysDict.java

@@ -53,4 +53,9 @@ public class SysDict extends BaseEntity3<SysDict> {
      */
     private Boolean status;
 
+    /**
+     * 排序 正序
+     */
+    private Integer orders;
+
 }

+ 3 - 2
sys-api-service/src/main/java/com/xy/service/SysDictServiceImpl.java

@@ -112,7 +112,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                 .le(SysDict::getCreateTime, pageInfo.getEndCreateTime())
                 .like(SysDict::getMsg)
                 .build()
-                .orderByDesc(!Emptys.check(page.getOrders()), SysDict::getCreateTime)
+                .orderByAsc(!Emptys.check(page.getOrders()), SysDict::getOrders)
                 .and(StringUtils.isEmpty(pageInfo.getPaterCode()), sysDictLambdaQueryWrapper -> sysDictLambdaQueryWrapper
                         .isNull(SysDict::getPaterCode)
                         .or()
@@ -129,7 +129,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                 .in(SysDict::getId, selectList.getIds())
                 .in(SysDict::getCode, selectList.getCodes())
                 .in(SysDict::getPaterCode, selectList.getPaterCodes())
-                .build();
+                .build()
+                .orderByAsc(SysDict::getOrders);
         List<SysDict> list = list(lambdaQueryWrapper);
         return R.ok(copy(SysDictDto.Vo.class, list));
     }

+ 9 - 0
sys-api/src/main/java/com/xy/dto/SysDictDto.java

@@ -38,6 +38,9 @@ public class SysDictDto {
         @NotBlank(message = "msg不能为空")
         @ApiModelProperty("编码说明")
         private String msg;
+
+        @ApiModelProperty("排序 正序")
+        private Integer orders;
     }
 
     @Data
@@ -50,6 +53,9 @@ public class SysDictDto {
 
         @ApiModelProperty("状态")
         private Boolean status;
+
+        @ApiModelProperty("排序 正序")
+        private Integer orders;
     }
 
     @Data
@@ -166,6 +172,9 @@ public class SysDictDto {
 
         @ApiModelProperty("更新人")
         private Long updateUser;
+
+        @ApiModelProperty("排序 正序")
+        private Integer orders;
     }
 
 }