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 repTitle;
 private String repValue;
 private String reType;
 private String repTypeName;
+private String personName;
 
 
 
@@ -148,4 +149,12 @@ public void setSettingId(String settingId) {
     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 @@ 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 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>