diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index 49e1a087..343dd692 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -84,6 +84,7 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getRecordId, recordId)); queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); + queryWrapper.orderByDesc(DfCheckingProblemV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index a75705ca..612f4bd3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -83,6 +83,7 @@ public class DfCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java index a18a74b3..6f1122af 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.domain.DfCheckingRecord; import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; import com.kms.yxgh.df.dto.DfCheckingDetailDto; @@ -56,6 +57,8 @@ public class DfCheckingV2Service extends BaseService queryWrapper.like(DfCheckingV2ProjectManage::getName, name)); } + queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime); + // 查询分页数据 Page queryPage = page(page, queryWrapper); if (queryPage == null) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index c5bccff8..62267919 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -19,6 +19,7 @@ import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.domain.DfCheckingRecord; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; import com.kms.yxgh.df.domain.DfYhV2; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhApproveDto; @@ -103,6 +104,8 @@ public class DfYhV2Service extends DefaultApprovalBusinessService queryPage = page(page, queryWrapper); if (queryPage == null) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java index aeb0b289..a0095921 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.dw.dto.DwProblemV2Dto; @@ -85,6 +86,7 @@ public class DwCheckingProblemV2Service extends BaseService queryWrapper.eq(DwCheckingProblemV2::getRecordId, recordId)); queryWrapper.ne(DwCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); + queryWrapper.orderByDesc(DwCheckingProblemV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java index 146e0a43..ef4f873b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java @@ -81,7 +81,7 @@ public class DwCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); if (queryPage == null) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java index 29eac420..5df52001 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.service.DfCheckingV2Service; +import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; @@ -57,6 +58,7 @@ public class DwCheckingV2Service extends BaseService queryWrapper.like(DwCheckingV2ProjectManage::getName, name)); } + queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java index 70209b89..c2d2ccde 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java @@ -18,6 +18,7 @@ import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwCheckingRecord; +import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto; import com.kms.yxgh.dw.dto.DwYhApproveDto; @@ -99,6 +100,7 @@ public class DwYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(DwYhV2::getRecordId, recordId)); } + queryWrapper.orderByDesc(DwYhV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java index 4b6343fd..b40cf312 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzYhV2; import com.kms.yxgh.sz.dto.v2.SzProblemV2Dto; @@ -86,6 +87,7 @@ public class SzCheckingProblemV2Service extends BaseService queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, recordId)); queryWrapper.ne(SzCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); + queryWrapper.orderByDesc(SzCheckingProblemV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java index 173d125f..90b64816 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java @@ -83,6 +83,7 @@ public class SzCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); if (queryPage == null) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java index e62ca804..927352df 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.service.DfCheckingV2Service; +import com.kms.yxgh.sz.domain.SzCheckingRecord; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage; import com.kms.yxgh.sz.dto.v2.SzCheckingDetailDto; @@ -52,7 +53,7 @@ public class SzCheckingV2Service extends BaseService queryWrapper.like(SzCheckingV2ProjectManage::getName, name)); } - + queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); if (queryPage == null) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java index aa4b6893..f2fcba2b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java @@ -19,6 +19,7 @@ import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzCheckingRecord; +import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage; import com.kms.yxgh.sz.domain.SzYhV2; import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; import com.kms.yxgh.sz.dto.v2.SzYhApproveDto; @@ -102,7 +103,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(SzYhV2::getRecordId, recordId)); } - + queryWrapper.orderByDesc(SzYhV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); if (queryPage == null) {