fix: 80504 企标评审会记录--列表--平均总分排序未生效
This commit is contained in:
+10
@@ -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")
|
||||
|
||||
+10
-4
@@ -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;
|
||||
<!--排序规则-->
|
||||
<if test="param.order != null and param.order != ''">
|
||||
<if test="param.order == 'asc'">
|
||||
avgScore,
|
||||
</if>
|
||||
<if test="param.order == 'desc'">
|
||||
avgScore DESC,
|
||||
</if>
|
||||
</if>
|
||||
rmr.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="getAvgScore" resultType="java.lang.String">
|
||||
|
||||
Reference in New Issue
Block a user