酷乐秀曲目来源改为内容平台

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -50,11 +50,30 @@ public class SubjectController extends BaseController {
 	}
 
 	@ApiOperation(value = "分页查询声部列表")
-	@PostMapping("/queryPage")
-	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
-	public HttpResponseResult<PageInfo<SubjectWrapper.Subject>> queryPage(@RequestBody SubjectWrapper.SubjectQuery query) {
+	@PostMapping("/queryPage1")
+	@PreAuthorize("@pcs.hasPermissions('subject/queryPage1')")
+	public HttpResponseResult<PageInfo<SubjectWrapper.Subject>> queryPage1(@RequestBody SubjectWrapper.SubjectQuery query) {
 		return succeed(subjectService.selectPage(query));
 	}
+	
+	@ApiOperation(value = "分页查询声部列表")
+	@GetMapping("/queryPage")
+	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
+	public HttpResponseResult<PageInfo<SubjectWrapper.Subject>> queryPage(SubjectQueryInfo queryInfo) {
+		PageInfo<SubjectWrapper.Subject> pageInfo = subjectService.queryPage1(queryInfo);
+
+		if(pageInfo.getRows().size() == 0){
+			return succeed(pageInfo);
+		}
+		Map<Long, Subject> map = subjectService.findBySubjectByIdList(pageInfo.getRows().stream().map(t -> t.getParentSubjectId()).collect(Collectors.toList())).stream()
+				.collect(Collectors.toMap(Subject::getId, t -> t));
+		pageInfo.getRows().forEach(row -> {
+			if(row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
+				row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
+			}
+		});
+		return succeed(pageInfo);
+	}
 
 	@ApiOperation(value = "分页查询声部树状列表")
 	@GetMapping("/queryPageTree")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -70,4 +70,6 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	PageInfo<SubjectWrapper.Subject> selectPage(SubjectWrapper.SubjectQuery query);
 
 	List<SubjectWrapper.Subject> list(SubjectWrapper.SubjectQuery query1);
+
+	PageInfo<SubjectWrapper.Subject> queryPage1(SubjectQueryInfo queryInfo);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -392,6 +392,26 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         return records;
     }
 
+    @Override
+    public PageInfo<SubjectWrapper.Subject> queryPage1(SubjectQueryInfo query) {
+        PageInfo<SubjectWrapper.Subject> pageInfo = new PageInfo<>(query.getPage(), query.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, query);
+
+        List<SubjectWrapper.Subject> dataList = null;
+        int count = subjectDao.findCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = subjectDao.findPage(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+
     /***
      * 查询声部树
      * @param: sub