update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupOrganizationCourseSettings.java

@@ -45,7 +45,8 @@ public class MusicGroupOrganizationCourseSettings extends BaseEntity {
 
     @ApiModelProperty(value="")
     private Date updateTime;
-
+    
+    private String organName;
 
     private List<MusicGroupOrganizationCourseSettingsDetail> details;
 
@@ -113,7 +114,15 @@ public class MusicGroupOrganizationCourseSettings extends BaseEntity {
         this.updateTime = updateTime;
     }
 
-    public List<MusicGroupOrganizationCourseSettingsDetail> getDetails() {
+    public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public List<MusicGroupOrganizationCourseSettingsDetail> getDetails() {
         return details;
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupOrganizationCourseSettingsController.java

@@ -1,9 +1,12 @@
 package com.ym.mec.web.controller;
 
-import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,11 +16,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings;
+import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.CourseSettingQueryInfo;
 import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import com.yonge.log.model.AuditLogAnnotation;
 
 @RequestMapping("musicGroupOrganizationCourseSettings")
 @Api(tags = "收费方式设置")
@@ -25,12 +31,27 @@ import com.ym.mec.common.page.PageInfo;
 public class MusicGroupOrganizationCourseSettingsController extends BaseController {
     @Autowired
     private MusicGroupOrganizationCourseSettingsService musicGroupOrganizationCourseSettingsService;
+    
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "获取收费方式设置列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupOrganizationCourseSettings/queryPage')")
     public HttpResponseResult<PageInfo<MusicGroupOrganizationCourseSettings>> queryPage(CourseSettingQueryInfo queryInfo) {
-        return succeed(musicGroupOrganizationCourseSettingsService.queryPage(queryInfo));
+    	
+    	PageInfo<MusicGroupOrganizationCourseSettings> pageInfo = musicGroupOrganizationCourseSettingsService.queryPage(queryInfo);
+    	
+    	List<Organization> organizationList = organizationService.findAllOrgans(queryInfo.getTenantId());
+    	if(organizationList != null){
+    		Map<Integer, String> organMap = organizationList.stream().collect(Collectors.toMap(Organization :: getId, Organization :: getName));
+    		
+    		for(MusicGroupOrganizationCourseSettings cs : pageInfo.getRows()){
+    			cs.setOrganName(organMap.get(cs.getOrganId()));
+    		}
+    	}
+    	
+        return succeed(pageInfo);
     }
 
     @ApiOperation(value = "收费方式添加")