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

java110

2021-08-26 cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d

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

 java110-bean/src/main/java/com/java110/dto/reportInfoAnswerValue/ReportInfoAnswerValueDto.java

@@ -33,6 +33,7 @@
private String repValue;
private String reType;
private String repTypeName;
private String personName;



@@ -148,4 +149,12 @@
    public void setRepTypeName(String repTypeName) {
        this.repTypeName = repTypeName;
    }

    public String getPersonName() {
        return personName;
    }

    public void setPersonName(String personName) {
        this.personName = personName;
    }
}

 java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml

@@ -68,7 +68,7 @@
<if test="settingId !=null and settingId != ''">
   and av.setting_id= #{settingId}
</if> 
order by tt.title,av.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>