乐团档案

mec-biz/src/main/java/com/ym/mec/biz/dal/page/PhotoQueryInfo.java

@@ -8,8 +8,6 @@ public class PhotoQueryInfo extends QueryInfo {
 
 	private YesOrNoEnum clientShow;
 
-	private YesOrNoEnum clientShowNum;
-
 	private Integer photoAlbumId;
 
 	private String musicGroupId;
@@ -36,14 +34,6 @@ public class PhotoQueryInfo extends QueryInfo {
 		this.timeLine = timeLine;
 	}
 
-	public YesOrNoEnum getClientShowNum() {
-		return clientShowNum;
-	}
-
-	public void setClientShowNum(YesOrNoEnum clientShowNum) {
-		this.clientShowNum = clientShowNum;
-	}
-
 	public String getType() {
 		return type;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PhotoAlbumServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.PhotoAlbumDao;
 import com.ym.mec.biz.dal.dao.PhotoDao;
 import com.ym.mec.biz.dal.entity.PhotoAlbum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.PhotoQueryInfo;
 import com.ym.mec.biz.service.PhotoAlbumService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -36,7 +37,7 @@ public class PhotoAlbumServiceImpl extends BaseServiceImpl<Integer, PhotoAlbum>
 		List<PhotoAlbum> rows = photoAlbumPageInfo.getRows();
 		if(rows.size() > 0){
 			List<Integer> albumIds = rows.stream().map(e -> e.getId()).collect(Collectors.toList());
-			Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(photoAlbumDao.countTotalNumByAlbumIds(albumIds,queryInfo.getClientShowNum()));
+			Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(photoAlbumDao.countTotalNumByAlbumIds(albumIds,queryInfo.getClientShow()));
 			for (PhotoAlbum photoAlbum : rows) {
 				photoAlbum.setPhotoNum(totalNumMap.get(photoAlbum.getId()));
 			}

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupDetailController.java

@@ -1,10 +1,5 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dto.Mapper;
-import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
@@ -12,17 +7,11 @@ import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
 import com.ym.mec.biz.dal.page.PhotoQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RequestMapping("musicGroupDetail")
 @Api(tags = "乐团档案服务")
 @RestController