diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/TimersParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/TimersParam.java index 2e983b1fa..5a92fc4be 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/TimersParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/TimersParam.java @@ -53,4 +53,9 @@ public class TimersParam extends BaseParam { */ private String remark; + /** + * 排序 + */ + private Integer sort; + } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Timers.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Timers.java index 23c8f05fc..85bf2061b 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Timers.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Timers.java @@ -55,6 +55,11 @@ public class Timers extends BaseEntity { */ private String remark; + /** + * 排序 + */ + private Integer sort; + /** * 状态:0-删除 1-正常 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/TimersVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/TimersVO.java index 173493b3f..6a274d56e 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/TimersVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/TimersVO.java @@ -50,4 +50,9 @@ public class TimersVO implements Serializable { */ private String remark; + /** + * 排序 + */ + private Integer sort; + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java index 8bd488fdf..d82acb990 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/TimersServiceImpl.java @@ -67,7 +67,7 @@ public class TimersServiceImpl extends ServiceImpl impleme if (!Objects.isNull(queryParam.getSearchState())){ queryWrapper.eq("job_status", queryParam.getSearchState()); } - queryWrapper.orderBy(true, true, "sys_timers.create_time"); + queryWrapper.orderBy(true, true, "sys_timers.sort"); queryWrapper.ne("sys_timers.state", DataStateEnum.DELETED.getCode()); //初始化分页数据 return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);