diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml index 0a69610..ca68193 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml index 0a69610..ca68193 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml index 2fccb83..5ae0310 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml index 0a69610..ca68193 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml index 2fccb83..5ae0310 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml index 5b8aac8..6f77e40 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml @@ -83,7 +83,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml index 0a69610..ca68193 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml index 2fccb83..5ae0310 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml index 5b8aac8..6f77e40 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml @@ -83,7 +83,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 4d5f50b..551a3df 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -60,7 +60,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java index 03aa216..c65a256 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityExternalAuditVO bizQualityExternalAuditVO) { QueryWrapper query = bizQualityExternalAuditVO.genQuery(); + query.orderByDesc("year","create_time"); return ReturnUtil.success(bizQualityExternalAuditService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java index 4c08904..5003257 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityInternalAuditManagementController.java @@ -57,6 +57,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityInternalAuditManagementVO bizQualityInternalAuditManagementVO) { QueryWrapper query = bizQualityInternalAuditManagementVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityInternalAuditManagementService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index c9e0b78..d31c4ef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -53,6 +53,7 @@ @GetMapping(value = "/list") public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); + query.orderByDesc("year_time","year_num","create_time"); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml index c57b62a..d24af9c 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityEffectiveAnalysisMapper.xml @@ -59,7 +59,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml index 0a69610..ca68193 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementOperationRepMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml index 2fccb83..5ae0310 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewMapper.xml @@ -64,7 +64,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml index 5b8aac8..6f77e40 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityManagementReviewPlanMapper.xml @@ -83,7 +83,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 4d5f50b..551a3df 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -60,7 +60,7 @@ ${ew.sqlSegment} - order by a.create_time desc + order by a.year_time desc,a.year_num desc, a.create_time desc diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml index a4f0651..126d2a7 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml @@ -57,7 +57,7 @@ a.file_name as fileName , a.file_code as fileCode , a.sys_code as sysCode , - a.record_status as recordStatus, + a.record_status as recordStatus, a.content from biz_quality_technical_analysis_rep a