From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml b/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
index 2beef0a..3302613 100644
--- a/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
+++ b/cnas-server/src/main/resources/mapper/CnasSatisfactionSurveyMapper.xml
@@ -9,7 +9,6 @@
css.project_name projectName,
css.survey_date surveyDate,
css.user_unit userUnit,
- css.date_info dateInfo,
css.`fill_name` fillName,
css.post post,
css.telephone telephone,
@@ -18,7 +17,9 @@
css.service_attitude serviceAttitude,
css.technical_power technicalPower,
css.test_job testJob,
- css.improvement_requirements improvementRequirements
+ css.reasonable_charge reasonableCharge,
+ css.improvement_requirements improvementRequirements,
+ css.other_supplements otherSupplements
FROM
cnas_satisfaction_survey css,
`user` u
@@ -26,11 +27,12 @@
1 = 1
AND css.user_id = u.id
and css.state=1
- <if test="dto.surveyDate!=null">
- and css.survey_date = ${dto.surveyDate}
+ <if test="surveyDate!=null">
+ and date_format(css.survey_date,'%Y%m%d') = ${surveyDate}
</if>
- <if test="dto.entryDate!=null">
- and css.entry_date = ${dto.entryDate}
+ <if test="entryDate!=null">
+ and date_format(css.entry_date,'%Y%m%d') = ${entryDate}
</if>
+ order by css.id Desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3