Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/baseservers into stat

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java

@@ -351,4 +351,21 @@ public class Course extends BaseEntity {
         this.favorites=favorites;
     }
 
+    public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites,Float score){
+        super.setId(id);
+        this.name=name;
+        this.summary=summary;
+        this.coverImg=coverImg;
+        super.setSysCreateAid(sysCreateAid);
+        super.setSysCreateBy(sysCreateBy);
+        this.type=type;
+        this.publishTime=publishTime;
+        this.views=views;
+        this.comments=comments;
+        this.praises=praises;
+        this.shares=shares;
+        this.favorites=favorites;
+        this.score=score;
+    }
+	
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -370,8 +370,9 @@ public class CourseServiceImpl implements ICourseService {
 		if(rs.isEmpty()) {
 			log.error("未能查询出数据");
 		}
-		courses.addAll(rs);
+//		courses.addAll(rs);
-		return courses;
+		rs.addAll(courses);
+		return rs;
 	}
 
 	@Override
@@ -1040,6 +1041,7 @@ public class CourseServiceImpl implements ICourseService {
 			QueryBuilder builder = QueryBuilder.from(Course.class);
 			builder.addFilter(FieldFilters.eq("deleted",false));
 			builder.addFilter(FieldFilters.eq("enabled",true));
+			builder.addFilter(FieldFilters.gt("score",4.0f));
 			builder.setPageSize(3);
 			List<IFieldFilter> iFieldFilters = new ArrayList<>();
 			iFieldFilters.add(FieldFilters.in("sysType1",strings));

servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java

@@ -70,5 +70,10 @@ public class FavoriteDto {
 	 * */
 	private Float progress;
 
+	/**
+	 * 课程评分
+	 * */
+	private Float score;
+
 	
 }

servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java

@@ -91,6 +91,11 @@ public class FavoriteTotalDto {
      * */
     private String qid;
 
+    /**
+     * score
+     * */
+    private Float score;
+
 
     public FavoriteTotalDto() {
     }

servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java

@@ -189,7 +189,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
 		if(!courseList.isEmpty()) {
 			QueryBuilder from = QueryBuilder.from(Course.class);
 			from.addFilter(FieldFilters.in("id",courseList));
-			from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites)");
+			from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites,score)");
 			List<Course> courses = courseDao.findList(from.builder());
 			if(!courses.isEmpty()){
 				for (Course c : courses) {
@@ -208,6 +208,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
 							favoriteTotalDto.setPraises(c.getPraises());
 							favoriteTotalDto.setShares(c.getShares());
 							favoriteTotalDto.setFavorites(c.getFavorites());
+							favoriteTotalDto.setScore(c.getScore());
 						}
 					}
 				}
@@ -438,7 +439,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
 		String from=Favorites.class.getSimpleName()+" f,"+Course.class.getSimpleName()+" c";
 		QueryBuilder query=QueryBuilder.from(from);
 		query.addFields("f.id","f.sysCreateTime","f.objId","c.name","c.summary","c.type","c.coverImg","c.sysCreateAid","c.sysCreateBy");
-		query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType");
+		query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType","c.score");
 		query.setPageIndex(pageIndex);
 		query.setPageSize(pageSize);
 		query.addOrder(OrderCondition.desc("f.id"));
@@ -478,6 +479,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
 				dto.setShares(ConvertUtil.toInt(objs[13]));
 				dto.setFavorites(ConvertUtil.toInt(objs[14]));
 				dto.setObjType((Integer) objs[15]);
+				dto.setScore((Float) objs[16]);
 				result.getList().add(dto);
 				
 			}

servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java

@@ -150,11 +150,11 @@ public class AnswerServiceImpl implements IAnswerService {
         if(StringUtil.isNoneBlank(qid)){
             builder.addFilter(FieldFilters.eq("qid",qid));
         }
-//        if(StringUtil.isNoneBlank(orderType)){
+        if(StringUtil.isNoneBlank(orderType)){
-//            builder.addOrder(OrderCondition.desc(orderType));
+            builder.addOrder(OrderCondition.desc(orderType));
-//        }else{
+        }else{
-//            builder.addOrder(OrderCondition.desc("id"));
+            builder.addOrder(OrderCondition.asc("sysCreateTime"));
-//        }
+        }
         if(StringUtil.isNoneBlank(keyword)){
             builder.addFilter(FieldFilters.like("content",keyword));
         }