Merge branch 'master' of https://gitee.com/zouxuan/mec

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 @RequestMapping("courseGroupDetail")
 @Api(tags = "课程组详情服务")
@@ -32,8 +33,8 @@ public class CourseGroupDetailController extends BaseController {
 
     @ApiOperation(value = "批量新增课程组详情")
     @PostMapping("/batchAdd")
-    public Object batchAdd(Integer courseGroupId,CourseGroupDetail courseGroupDetail){
-        courseGroupDetailService.batchInsert(courseGroupId,courseGroupDetail);
+    public Object batchAdd(String courseGroupName, Integer organId, List<CourseGroupDetail> courseGroupDetails){
+        courseGroupDetailService.batchInsert(courseGroupName,organId,courseGroupDetails);
         return succeed();
     }
 

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

@@ -1,8 +1,6 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
-import com.ym.mec.web.dal.entity.CourseGroup;
 import com.ym.mec.web.dal.entity.StudentRegistration;
 import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.web.service.StudentRegistrationService;

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

@@ -61,4 +61,11 @@ public class SubjectController extends BaseController {
     public Object findSubByMusicGroupId(Integer musicGroupId){
         return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
     }
+
+    @ApiOperation(value = "通过乐团收费类型，获取默认的声部列表")
+    @PostMapping("/findSubByChargeType")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer")})
+    public Object findSubByChargeType(Integer chargeTypeId){
+        return succeed(subjectService.findSubByChargeType(chargeTypeId));
+    }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/SubjectDao.java

@@ -13,4 +13,11 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByMusicGroupId(Integer musicGroupId);
+
+    /**
+     * 通过乐团收费方式，获取默认的声部列表
+     * @param chargeTypeId
+     * @return
+     */
+    List<Subject> findSubByChargeType(Integer chargeTypeId);
 }

mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseGroup.java

@@ -29,7 +29,15 @@ public class CourseGroup {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public CourseGroup() {
+	}
+
+	public CourseGroup(Integer organId, String name) {
+		this.organId = organId;
+		this.name = name;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroup.java

@@ -37,7 +37,7 @@ public class MusicGroup {
 	private Integer educationalTeacherId;
 	
 	/** 收费类型 */
-	@ApiModelProperty(value = "乐团名称",required = false)
+	@ApiModelProperty(value = "收费类型",required = false)
 	private Integer chargeTypeId;
 	
 	/** 课程组 */

mec-web/src/main/java/com/ym/mec/web/service/CourseGroupDetailService.java

@@ -3,12 +3,14 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.CourseGroupDetail;
 
+import java.util.List;
+
 public interface CourseGroupDetailService extends BaseService<Integer, CourseGroupDetail> {
 
     /**
      * 新增课程组，并批量新增课程详情
-     * @param courseGroupId
-     * @param courseGroupDetail
+     * @param courseGroupName
+     * @param courseGroupDetails
      */
-    void batchInsert(Integer courseGroupId, CourseGroupDetail courseGroupDetail);
+    void batchInsert(String courseGroupName,Integer organId, List<CourseGroupDetail> courseGroupDetails);
 }

mec-web/src/main/java/com/ym/mec/web/service/SubjectService.java

@@ -13,4 +13,11 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByMusicGroupId(Integer musicGroupId);
+
+    /**
+     * 通过乐团收费方式，获取默认的声部列表
+     * @param chargeTypeId
+     * @return
+     */
+    List<Subject> findSubByChargeType(Integer chargeTypeId);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/CourseGroupDetailServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ym.mec.web.service.impl;
 
+import com.ym.mec.web.dal.dao.CourseGroupDao;
+import com.ym.mec.web.dal.entity.CourseGroup;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.common.dal.BaseDAO;
@@ -9,11 +12,17 @@ import com.ym.mec.web.dal.dao.CourseGroupDetailDao;
 import com.ym.mec.web.dal.entity.CourseGroupDetail;
 import com.ym.mec.web.service.CourseGroupDetailService;
 
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Stream;
+
 @Service
 public class CourseGroupDetailServiceImpl extends BaseServiceImpl<Integer, CourseGroupDetail>  implements CourseGroupDetailService {
 	
 	@Autowired
 	private CourseGroupDetailDao courseGroupDetailDao;
+	@Autowired
+	private CourseGroupDao courseGroupDao;
 
 	@Override
 	public BaseDAO<Integer, CourseGroupDetail> getDAO() {
@@ -21,7 +30,17 @@ public class CourseGroupDetailServiceImpl extends BaseServiceImpl<Integer, Cours
 	}
 
 	@Override
-	public void batchInsert(Integer courseGroupId, CourseGroupDetail courseGroupDetail) {
-		
+	public void batchInsert(String courseGroupName,Integer organId, List<CourseGroupDetail> courseGroupDetails) {
+		CourseGroup courseGroup = new CourseGroup(organId,courseGroupName);
+		Date date = new Date();
+		courseGroup.setCreateTime(date);
+		courseGroup.setUpdateTime(date);
+		courseGroupDao.insert(courseGroup);
+		courseGroupDetails.forEach( e -> {
+			e.setCourseGroupId(courseGroup.getId());
+			e.setCreateTime(date);
+			e.setUpdateTime(date);
+			courseGroupDetailDao.insert(e);
+		} );
 	}
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/SubjectServiceImpl.java

@@ -26,4 +26,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 	public List<Subject> findSubByMusicGroupId(Integer musicGroupId) {
 		return subjectDao.findSubByMusicGroupId(musicGroupId);
 	}
+
+	@Override
+	public List<Subject> findSubByChargeType(Integer chargeTypeId) {
+		return subjectDao.findSubByChargeType(chargeTypeId);
+	}
 }

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -80,4 +80,8 @@
     <select id="findSubByMusicGroupId" resultMap="Subject">
         SELECT s.* FROM music_group_subject_plan mgsp LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_ WHERE mgsp.music_group_id_ = #{musicGroupId}
     </select>
+
+    <select id="findSubByChargeType" resultMap="Subject">
+        SELECT s.* FROM charge_type_subject_mapper ctsm LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_ WHERE ctsm.charge_type_id_ = #{chargeTypeId}
+    </select>
 </mapper>