From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index 61bb70a..ddc2650 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -4,7 +4,17 @@
<select id="queryCompetitionList" resultType="com.dsh.competition.model.CompetitionListVo">
- select * from (
+ select
+ aa.id,
+ aa.name,
+ aa.coverDrawing,
+ aa.cityName,
+ aa.registerCondition,
+ aa.introduction,
+ aa.registerEndTime,
+ aa.age,
+ aa.heat
+ from (
select
a.id,
a.`name`,
@@ -12,9 +22,9 @@
a.city as cityName,
a.registerCondition,
a.introduction,
- DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
- CONCAT(a.startAge, '-', a.endAge) as `age`,
- (a.baseNumber + a.applicantsNumber) as `heat`
+ DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') registerEndTime,
+ CONCAT(a.startAge, '-', a.endAge) age,
+ (a.baseNumber + a.applicantsNumber) heat
from t_competition a
where a.auditStatus = 2 and a.`status` = 2 and a.state = 1
<if test="null != cityCode and '' != cityCode">
--
Gitblit v1.7.1