|
|
@@ -21,13 +21,12 @@ value_id,user_an_id,title_id,an_value_id,value_content,community_id,setting_id
|
|
|
|
|
|
<!-- 查询批量操作日志详情信息 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 @@ value_id,user_an_id,title_id,an_value_id,value_content,community_id,setting_id
|
|
|
<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 @@ and t.an_value_id= #{anValueId}
|
|
|
<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 != ''">
|