zouxuan 4 år sedan
förälder
incheckning
c59b92e3f7

+ 5 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupTrainPlanDao.java

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 public interface MusicGroupTrainPlanDao extends BaseDAO<Integer, MusicGroupTrainPlan> {
 
-	
+
+    int add(@Param("dto") MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 }

+ 97 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupTrainPlanSaveDto.java

@@ -0,0 +1,97 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import java.util.List;
+
+public class MusicGroupTrainPlanSaveDto {
+	@ApiModelProperty(value = "年份",required = false)
+	private String year;
+
+	@ApiModelProperty(value = "学期0上学期1下学期",required = false)
+	private Integer term;
+
+	@ApiModelProperty(value = "班级",required = false)
+	private Integer classGroupId;
+
+	@ApiModelProperty(value = "课程类型",required = false)
+	private String courseScheduleType;
+
+	@ApiModelProperty(value = "学期开始时间",required = false)
+	private Date startSchoolTerm;
+
+	@ApiModelProperty(value = "学期截止时间",required = false)
+	private Date endSchoolTerm;
+
+	@ApiModelProperty(value = "规划列表",required = false)
+	private List<String> plans;
+
+	@ApiModelProperty(value = "课程组编号",required = false)
+	private String musicGroupId;
+
+	public String getYear() {
+		return year;
+	}
+
+	public void setYear(String year) {
+		this.year = year;
+	}
+
+	public Integer getTerm() {
+		return term;
+	}
+
+	public void setTerm(Integer term) {
+		this.term = term;
+	}
+
+	public Integer getClassGroupId() {
+		return classGroupId;
+	}
+
+	public void setClassGroupId(Integer classGroupId) {
+		this.classGroupId = classGroupId;
+	}
+
+	public String getCourseScheduleType() {
+		return courseScheduleType;
+	}
+
+	public void setCourseScheduleType(String courseScheduleType) {
+		this.courseScheduleType = courseScheduleType;
+	}
+
+	public Date getStartSchoolTerm() {
+		return startSchoolTerm;
+	}
+
+	public void setStartSchoolTerm(Date startSchoolTerm) {
+		this.startSchoolTerm = startSchoolTerm;
+	}
+
+	public Date getEndSchoolTerm() {
+		return endSchoolTerm;
+	}
+
+	public void setEndSchoolTerm(Date endSchoolTerm) {
+		this.endSchoolTerm = endSchoolTerm;
+	}
+
+	public List<String> getPlans() {
+		return plans;
+	}
+
+	public void setPlans(List<String> plans) {
+		this.plans = plans;
+	}
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+}

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupTrainPlanService.java

@@ -1,11 +1,12 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
 
 public interface MusicGroupTrainPlanService extends BaseService<Integer, MusicGroupTrainPlan> {
 
-    Object add(List<MusicGroupTrainPlan> musicGroupTrainPlans);
+    int add(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto);
 }

+ 5 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupTrainPlanServiceImpl.java

@@ -2,14 +2,13 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.MusicGroupTrainPlanDao;
 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.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, MusicGroupTrainPlan>  implements MusicGroupTrainPlanService {
 	
@@ -22,7 +21,9 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 	}
 
 	@Override
-	public Object add(List<MusicGroupTrainPlan> musicGroupTrainPlans) {
-		return null;
+	public int add(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		//获取学期时间
+
+		return musicGroupTrainPlanDao.add(musicGroupTrainPlanSaveDto);
 	}
 }

+ 9 - 2
mec-biz/src/main/resources/config/mybatis/MusicGroupTrainPlanMapper.xml

@@ -33,8 +33,15 @@
 		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
 		VALUES(#{musicGroupId},#{classGroupId},#{courseType},#{plan},#{startSchoolTerm},#{endSchoolTerm},NOW(),NOW())
 	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
+    <insert id="add">
+		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
+		VALUES
+		<foreach collection="dto.plans" separator="," item="plan">
+			(#{dto.musicGroupId},#{dto.classGroupId},#{dto.courseType},#{plan},#{dto.startSchoolTerm},#{dto.endSchoolTerm},NOW(),NOW())
+		</foreach>
+	</insert>
+
+    <!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupTrainPlan">
 		UPDATE music_group_train_plan <set>
 		<if test="endSchoolTerm != null">

+ 3 - 5
mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupTrainPlanController.java

@@ -1,6 +1,6 @@
 package com.ym.mec.web.controller;
 
-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 io.swagger.annotations.Api;
@@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RequestMapping("musicGroupTrainPlan")
 @Api(tags = "乐团训练规划")
 @RestController
@@ -22,7 +20,7 @@ public class MusicGroupTrainPlanController extends BaseController {
 
 	@ApiOperation("新增乐团训练规划")
 	@GetMapping(value = "add")
-	public Object add(List<MusicGroupTrainPlan> musicGroupTrainPlans) {
-		return succeed(musicGroupTrainPlanService.add(musicGroupTrainPlans));
+	public Object add(MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
+		return succeed(musicGroupTrainPlanService.add(musicGroupTrainPlanSaveDto));
 	}
 }