From 35fb8082fde72fe5c6ed2b5fbd20b582949acbfe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 15:41:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
index c39ed33..c369f1a 100644
--- a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
@@ -21,13 +21,12 @@
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織璇︽儏淇℃伅 add by wuxw 2018-07-03 -->
<select id="getReportInfoAnswerValueInfo" parameterType="Map" resultType="Map">
- select ra.person_name userName,st.name repName,tt.title repTitle,tv.qa_value repValue,av.value_content valueContent,
+ select st.name repName,an.person_name personName,tt.title repTitle,av.value_content valueContent,
av.create_time createTime,st.report_type reType,td.`name` repTypeName from
report_info_answer_value av
- LEFT JOIN report_info_answer ra on av.user_an_id = ra.user_an_id and ra.status_cd=0
- LEFT JOIN report_info_setting_title_value tv on av.value_id = tv.value_id and tv.status_cd=0
- LEFT JOIN report_info_setting_title tt on av.title_id = av.title_id and tt.status_cd=0
+ LEFT JOIN report_info_answer an on an.user_an_id = av.user_an_id and an.status_cd=0
LEFT JOIN report_info_setting st on av.setting_id = st.setting_id and st.status_cd=0
+ LEFT JOIN report_info_setting_title tt on tt.title_id = av.title_id and tt.status_cd=0
LEFT JOIN t_dict td on st.report_type = td.status_cd and td.table_name = 'report_info_setting' and td.table_columns = 'report_type'
where 1=1
<if test="valueId !=null and valueId != ''">
@@ -69,7 +68,7 @@
<if test="settingId !=null and settingId != ''">
and av.setting_id= #{settingId}
</if>
-order by ra.person_name,tt.title,av.create_time desc
+order by tt.title,av.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -116,10 +115,9 @@
<select id="queryReportInfoAnswerValuesCount" parameterType="Map" resultType="Map">
select count(1) count from
report_info_answer_value av
- LEFT JOIN report_info_answer ra on av.user_an_id = ra.user_an_id and ra.status_cd=0
- LEFT JOIN report_info_setting_title_value tv on av.value_id = tv.value_id and tv.status_cd=0
- LEFT JOIN report_info_setting_title tt on av.title_id = av.title_id and tt.status_cd=0
+ LEFT JOIN report_info_answer an on an.user_an_id = av.user_an_id and an.status_cd=0
LEFT JOIN report_info_setting st on av.setting_id = st.setting_id and st.status_cd=0
+ LEFT JOIN report_info_setting_title tt on tt.title_id = av.title_id and tt.status_cd=0
LEFT JOIN t_dict td on st.report_type = td.status_cd and td.table_name = 'report_info_setting' and td.table_columns = 'report_type'
where 1=1
<if test="valueId !=null and valueId != ''">
--
Gitblit v1.8.0