乐团档案

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

@@ -12,16 +12,24 @@ public class MusicGroupPerformance {
 	
 	/** 乐团编号 */
 	private String musicGroupId;
+
+	/** 乐团编号 */
+	private String musicGroupName;
 	
 	/** 名称 */
 	private String name;
-	
+
+	private String organName;
+
 	/** 展演曲目名称,逗号分隔 */
 	private String musicScoreName;
 	
 	/** 添加人 */
 	private Integer operator;
 
+	//剩余天数
+	private Integer subDay;
+
 	/** 添加人 */
 	private String operatorName;
 	
@@ -37,6 +45,30 @@ public class MusicGroupPerformance {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getMusicGroupName() {
+		return musicGroupName;
+	}
+
+	public void setMusicGroupName(String musicGroupName) {
+		this.musicGroupName = musicGroupName;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public Integer getSubDay() {
+		return subDay;
+	}
+
+	public void setSubDay(Integer subDay) {
+		this.subDay = subDay;
+	}
+
 	public String getOperatorName() {
 		return operatorName;
 	}

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

@@ -941,7 +941,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		infoDto1.setNum(musicGroupPerformances.stream().map(e -> e.getMusicGroupId()).collect(Collectors.toSet()).size());
 		infoDto1.setNum2(musicGroupPerformances.stream().map(e -> e.getId()).collect(Collectors.toSet()).size());
 		infoDto1.setDesc(IndexErrorType.MUSIC_GROUP_PERFORMANCE.getMsg());
-		result.add(infoDto);
+		result.add(infoDto1);
 		return result;
 	}
 

mec-biz/src/main/resources/config/mybatis/MusicGroupPerformanceMapper.xml

@@ -15,6 +15,9 @@
 		<result column="operator_name_" property="operatorName" />
 		<result column="order_" property="order" />
 		<result column="start_time_" property="startTime" />
+		<result column="sub_day_" property="subDay" />
+		<result column="music_group_name_" property="musicGroupName" />
+		<result column="organ_name_" property="organName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -99,9 +102,11 @@
 		</if>
 	</select>
 	<select id="queryNoStart" resultMap="MusicGroupPerformance">
-		SELECT mgp.* FROM music_group_performance mgp
+		SELECT mgp.*,mg.name_ music_group_name_,o.name_ organ_name_,DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) sub_day_
+		FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
-		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+		LEFT JOIN organization o ON o.id_ = mg.organ_id_
+		WHERE DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupNewsController.java

@@ -0,0 +1,61 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MusicGroupNews;
+import com.ym.mec.biz.service.MusicGroupNewsService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.QueryInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("eduMusicGroupNews")
+@Api(tags = "乐团资讯服务")
+@RestController
+public class EduMusicGroupNewsController extends BaseController {
+
+    @Autowired
+    private MusicGroupNewsService musicGroupNewsService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @AuditLogAnnotation(operateName = "新增")
+    public Object add(MusicGroupNews musicGroupNews) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        musicGroupNews.setOperatorId(sysUser.getId());
+        return succeed(musicGroupNewsService.insert(musicGroupNews));
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    public Object del(Long id) {
+        musicGroupNewsService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(MusicGroupNews musicGroupNews) {
+        musicGroupNewsService.update(musicGroupNews);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(musicGroupNewsService.queryPage(queryInfo));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupPerformanceController.java

@@ -0,0 +1,68 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MusicGroupPerformance;
+import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
+import com.ym.mec.biz.service.MusicGroupPerformanceService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("eduMusicGroupPerformance")
+@Api(tags = "乐团展演信息")
+@RestController
+public class EduMusicGroupPerformanceController extends BaseController {
+
+	@Autowired
+	private MusicGroupPerformanceService musicGroupPerformanceService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("新增")
+	@PostMapping(value = "add")
+	public Object add(MusicGroupPerformance musicGroupPerformance) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null){
+			throw new BizException("请登录");
+		}
+		musicGroupPerformance.setOperator(sysUser.getId());
+		if(StringUtils.isNotEmpty(musicGroupPerformance.getMusicScoreName())){
+			if(musicGroupPerformance.getMusicScoreName().contains(",")){
+				throw new BizException("请勿录入特殊字符");
+			}
+		}
+		return succeed(musicGroupPerformanceService.insert(musicGroupPerformance));
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "update")
+	public Object update(MusicGroupPerformance musicGroupPerformance) {
+		return succeed(musicGroupPerformanceService.update(musicGroupPerformance));
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "del")
+	public Object del(Integer id) {
+		return succeed(musicGroupPerformanceService.delete(id));
+	}
+
+	@ApiOperation("分页查询")
+	@PostMapping(value = "queryPage")
+	public Object queryPage(MusicGroupPerformanceQueryInfo queryInfo) {
+		return succeed(musicGroupPerformanceService.queryPage(queryInfo));
+	}
+
+	@ApiOperation("分页查询首页乐团展演列表")
+	@PostMapping(value = "queryNoStartPage")
+	public Object queryNoStartPage(MusicGroupPerformanceQueryInfo queryInfo) {
+		return succeed(musicGroupPerformanceService.queryNoStartPage(queryInfo));
+	}
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupTrainPlanController.java

@@ -0,0 +1,70 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
+import com.ym.mec.biz.service.MusicGroupTrainPlanService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("eduMusicGroupTrainPlan")
+@Api(tags = "乐团训练规划")
+@RestController
+public class EduMusicGroupTrainPlanController extends BaseController {
+
+	@Autowired
+	private MusicGroupTrainPlanService musicGroupTrainPlanService;
+
+	@ApiOperation("新增乐团训练规划")
+	@PostMapping(value = "add")
+	public Object add(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.add(musicGroupTrainPlanSaveDto));
+	}
+
+	@ApiOperation("删除乐团训练规划")
+	@PostMapping(value = "del")
+	public Object del(Integer id) {
+		return succeed(musicGroupTrainPlanService.delete(id));
+	}
+
+	@ApiOperation("修改乐团训练规划")
+	@PostMapping(value = "update")
+	public Object update(String plan,Integer planId) {
+		MusicGroupTrainPlan musicGroupTrainPlan = musicGroupTrainPlanService.get(planId);
+		if(musicGroupTrainPlan == null){
+			throw new BizException("课程规划不存在");
+		}
+		musicGroupTrainPlan.setPlan(plan);
+		return succeed(musicGroupTrainPlanService.update(musicGroupTrainPlan));
+	}
+
+	@ApiOperation("获取乐团训练规划")
+	@PostMapping(value = "queryPlanPage")
+	public Object queryPlanPage(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryPlanPage(musicGroupTrainPlanSaveDto));
+	}
+
+	@ApiOperation("获取乐团训练规划异常规划")
+	@PostMapping(value = "queryExceptionPlan")
+	public Object queryExceptionPlan(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryExceptionPlan(musicGroupTrainPlanSaveDto));
+	}
+
+	@ApiOperation("获取乐团训练规划课时")
+	@PostMapping(value = "queryPlanCourseNum")
+	public Object queryPlanCourseNum(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryPlanCourseNum(musicGroupTrainPlanSaveDto));
+	}
+
+	@ApiOperation("获取乐团训练规划课程类型")
+	@PostMapping(value = "queryCourseType")
+	public Object queryCourseType(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.queryCourseType(musicGroupTrainPlanSaveDto));
+	}
+}