Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-26 35fb8082fde72fe5c6ed2b5fbd20b582949acbfe

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

 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 != ''">

 service-report/src/main/java/com/java110/report/bmo/reportInfoAnswerValue/impl/SaveReportInfoAnswerValueBMOImpl.java

@@ -63,8 +63,8 @@
        ReportInfoAnswerPo reportInfoAnswerPo = new ReportInfoAnswerPo();
        reportInfoAnswerPo.setUserAnId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId));
        reportInfoAnswerPo.setSettingId(reqJson.getString("settingId"));
        reportInfoAnswerPo.setPersonId("-1");
        reportInfoAnswerPo.setPersonName("未知");
        reportInfoAnswerPo.setPersonId(StringUtil.isNullOrNone(reqJson.getString("personId")) == true?"-1":reqJson.getString("personId"));
        reportInfoAnswerPo.setPersonName(StringUtil.isNullOrNone(reqJson.getString("personName")) == true?"未知":reqJson.getString("personName"));
        reportInfoAnswerPo.setCommunityId(reqJson.getString("communityId"));
        int flag = reportInfoAnswerInnerServiceSMOImpl.saveReportInfoAnswer(reportInfoAnswerPo);
        if (flag < 1) {