From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
index 49eb231..6bfc5dd 100644
--- a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
@@ -21,37 +21,54 @@
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織璇︽儏淇℃伅 add by wuxw 2018-07-03 -->
<select id="getReportInfoAnswerValueInfo" parameterType="Map" resultType="Map">
- select t.value_id,t.value_id valueId,t.create_time,t.create_time createTime,t.user_an_id,t.user_an_id userAnId,t.title_id,t.title_id titleId,t.an_value_id,t.an_value_id anValueId,t.value_content,t.value_content valueContent,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.setting_id,t.setting_id settingId
-from report_info_answer_value t
-where 1 =1
+ 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 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 != ''">
- and t.value_id= #{valueId}
+ and av.value_id= #{valueId}
</if>
+<if test="userName !=null and userName != ''">
+ and ra.person_name= #{userName}
+</if>
+<if test="repName !=null and repName != ''">
+ and st.name= #{repName}
+</if>
+<if test="repTitle !=null and repTitle != ''">
+ and tt.title like concat('%',#{repTitle},'%')
+</if>
+<if test="valueContent !=null and valueContent != ''">
+ and av.value_content like concat('%',#{valueContent},'%')
+</if>
<if test="createTime !=null and createTime != ''">
- and t.create_time= #{createTime}
+ and av.create_time= #{createTime}
</if>
<if test="userAnId !=null and userAnId != ''">
- and t.user_an_id= #{userAnId}
+ and av.user_an_id= #{userAnId}
</if>
<if test="titleId !=null and titleId != ''">
- and t.title_id= #{titleId}
+ and av.title_id= #{titleId}
</if>
<if test="anValueId !=null and anValueId != ''">
- and t.an_value_id= #{anValueId}
+ and av.an_value_id= #{anValueId}
</if>
<if test="valueContent !=null and valueContent != ''">
- and t.value_content= #{valueContent}
+ and av.value_content= #{valueContent}
</if>
<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
+ and av.status_cd= #{statusCd}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and av.community_id= #{communityId}
</if>
<if test="settingId !=null and settingId != ''">
- and t.setting_id= #{settingId}
+ and av.setting_id= #{settingId}
</if>
-order by t.create_time desc
+order by an.person_name,tt.title,av.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -96,35 +113,39 @@
<!-- 鏌ヨ鎵归噺鎿嶄綔鏃ュ織璇︽儏鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryReportInfoAnswerValuesCount" parameterType="Map" resultType="Map">
- select count(1) count
-from report_info_answer_value t
-where 1 =1
+ select count(1) count from
+ report_info_answer_value av
+ 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 != ''">
- and t.value_id= #{valueId}
+ and av.value_id= #{valueId}
</if>
<if test="createTime !=null and createTime != ''">
- and t.create_time= #{createTime}
+ and av.create_time= #{createTime}
</if>
<if test="userAnId !=null and userAnId != ''">
- and t.user_an_id= #{userAnId}
+ and av.user_an_id= #{userAnId}
</if>
<if test="titleId !=null and titleId != ''">
- and t.title_id= #{titleId}
+ and av.title_id= #{titleId}
</if>
<if test="anValueId !=null and anValueId != ''">
- and t.an_value_id= #{anValueId}
+ and av.an_value_id= #{anValueId}
</if>
<if test="valueContent !=null and valueContent != ''">
- and t.value_content= #{valueContent}
+ and av.value_content= #{valueContent}
</if>
<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
+ and av.status_cd= #{statusCd}
</if>
<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
+ and av.community_id= #{communityId}
</if>
<if test="settingId !=null and settingId != ''">
- and t.setting_id= #{settingId}
+ and av.setting_id= #{settingId}
</if>
--
Gitblit v1.8.0