diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java index 5d582121..c4a9dc8d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESQueryCommonDTO.java @@ -59,11 +59,21 @@ public class ESQueryCommonDTO { @ApiModelProperty(value = "评审会-评审开始日期") private Date reviewStartDate; + public String getOrder() { + if (StrUtil.isBlank(order)) { + return "desc"; + } + return order; + } + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "评审会-评审结束日期") private Date reviewEndDate; + @ApiModelProperty(value = "评审会-列表排序规则") + private String order; + // 稽查 @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index 7174dd22..935e8e2d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -75,10 +75,16 @@ GROUP BY rmr.id, rmr.create_time, rmr.review_date, esp.qualityFlag, score.avg_score_item1, score.avg_score_item2, score.avg_score_item3, score.avg_score_item4, score.avg_score_item5, score.avg_score_item6 ORDER BY - rmr.create_time DESC, - avgScore DESC, - score.avg_score_item2 DESC, - score.avg_score_item4 DESC; + + + + avgScore, + + + avgScore DESC, + + + rmr.create_time DESC