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

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

@@ -22,7 +22,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation(value = "新增课程组")
     @PostMapping("/add")
-    public Object add(CourseGroup courseGroup){
+    public Object add(@RequestBody CourseGroup courseGroup){
         Date date = new Date();
         courseGroup.setCreateTime(date);
         courseGroup.setUpdateTime(date);
@@ -39,7 +39,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation(value = "修改课程组")
     @PutMapping("/update")
-    public Object update(CourseGroup courseGroup){
+    public Object update(@RequestBody CourseGroup courseGroup){
         courseGroup.setUpdateTime(new Date());
         courseGroupService.update(courseGroup);
         return succeed();
@@ -53,7 +53,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation(value = "分页查询课程组")
     @PostMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(@RequestBody QueryInfo queryInfo){
         return succeed(courseGroupService.queryPage(queryInfo));
     }
 }

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

@@ -23,7 +23,7 @@ public class CourseGroupDetailController extends BaseController {
 
     @ApiOperation(value = "新增课程组详情")
     @PostMapping("/add")
-    public Object add(CourseGroupDetail courseGroupDetail){
+    public Object add(@RequestBody CourseGroupDetail courseGroupDetail){
         Date date = new Date();
         courseGroupDetail.setCreateTime(date);
         courseGroupDetail.setUpdateTime(date);
@@ -33,8 +33,8 @@ public class CourseGroupDetailController extends BaseController {
 
     @ApiOperation(value = "批量新增课程组详情")
     @PostMapping("/batchAdd")
-    public Object batchAdd(String courseGroupName, Integer organId, List<CourseGroupDetail> courseGroupDetails){
-        courseGroupDetailService.batchInsert(courseGroupName,organId,courseGroupDetails);
+    public Object batchAdd(@RequestBody List<CourseGroupDetail> courseGroupDetails){
+        courseGroupDetailService.batchInsert(courseGroupDetails);
         return succeed();
     }
 
@@ -47,7 +47,7 @@ public class CourseGroupDetailController extends BaseController {
 
     @ApiOperation(value = "修改课程组详情")
     @PutMapping("/update")
-    public Object update(CourseGroupDetail courseGroupDetail){
+    public Object update(@RequestBody CourseGroupDetail courseGroupDetail){
         courseGroupDetail.setUpdateTime(new Date());
         courseGroupDetailService.update(courseGroupDetail);
         return succeed();
@@ -61,7 +61,7 @@ public class CourseGroupDetailController extends BaseController {
 
     @ApiOperation(value = "分页查询课程组详情")
     @PostMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(@RequestBody QueryInfo queryInfo){
         return succeed(courseGroupDetailService.queryPage(queryInfo));
     }
 }

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

@@ -24,7 +24,7 @@ public class CourseTypeController extends BaseController {
 
     @ApiOperation(value = "新增课程类型")
     @PostMapping("/add")
-    public Object add(CourseType courseType){
+    public Object add(@RequestBody CourseType courseType){
         Date date = new Date();
         courseType.setCreateTime(date);
         courseType.setUpdateTime(date);
@@ -41,7 +41,7 @@ public class CourseTypeController extends BaseController {
 
     @ApiOperation(value = "修改课程类型")
     @PutMapping("/update")
-    public Object update(CourseType courseType){
+    public Object update(@RequestBody CourseType courseType){
         courseType.setUpdateTime(new Date());
         courseTypeService.update(courseType);
         return succeed();
@@ -55,7 +55,7 @@ public class CourseTypeController extends BaseController {
 
     @ApiOperation(value = "分页查询课程类型")
     @PostMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(@RequestBody QueryInfo queryInfo){
         return succeed(courseTypeService.queryPage(queryInfo));
     }
 }

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

@@ -25,7 +25,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "新增商品分类")
     @PostMapping("/add")
-    public Object add(GoodsCategory goodsCategory) {
+    public Object add(@RequestBody GoodsCategory goodsCategory) {
         Date date = new Date();
         goodsCategory.setCreateTime(date);
         goodsCategory.setUpdateTime(date);
@@ -46,7 +46,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "修改商品分类")
     @PutMapping("/update")
-    public Object update(GoodsCategory goodsCategory) {
+    public Object update(@RequestBody GoodsCategory goodsCategory) {
         goodsCategory.setUpdateTime(new Date());
         GoodsCategoryCategoryService.update(goodsCategory);
         return succeed();
@@ -54,7 +54,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询商品分类列表")
     @PostMapping("/queryPage")
-    public Object queryPage(GoodsCategoryQueryInfo queryInfo) {
+    public Object queryPage(@RequestBody GoodsCategoryQueryInfo queryInfo) {
         queryInfo.setParentId(-1);
         return succeed(GoodsCategoryCategoryService.queryPage(queryInfo));
     }

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.HashMap;
 
 @RequestMapping("goods")
 @Api(tags = "商品(教材、辅件)服务")
@@ -23,7 +24,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "新增商品(教材、辅件)")
     @PostMapping("/add")
-    public Object add(Goods goods){
+    public Object add(@RequestBody Goods goods){
         Date date = new Date();
         goods.setCreateTime(date);
         goods.setUpdateTime(date);
@@ -40,7 +41,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "修改商品(教材、辅件)")
     @PutMapping("/update")
-    public Object update(Goods goods){
+    public Object update(@RequestBody Goods goods){
         goods.setUpdateTime(new Date());
         goodsService.update(goods);
         return succeed();
@@ -54,7 +55,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @PostMapping("/queryPage")
-    public Object queryPage(GoodsQueryInfo queryInfo){
+    public Object queryPage(@RequestBody GoodsQueryInfo queryInfo){
         return succeed(goodsService.queryPage(queryInfo));
     }
 
@@ -62,7 +63,9 @@ public class GoodsController extends BaseController {
     @PostMapping("/queryGoodsBySubId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "goodsCategoryId", value = "商品分类", required = true, dataType = "Integer")})
-    public Object findGoodsBySubId(Integer subjectId,Integer goodsCategoryId){
+    public Object findGoodsBySubId(@RequestBody HashMap<String, Integer> param){
+        Integer subjectId = param.get("subjectId");
+        Integer goodsCategoryId = param.get("goodsCategoryId");
         return succeed(goodsService.findGoodsBySubId(subjectId,goodsCategoryId));
     }
 }

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

@@ -23,7 +23,7 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "新增乐团")
     @PostMapping("/add")
-    public Object add(MusicGroup musicGroup){
+    public Object add(@RequestBody MusicGroup musicGroup){
         Date date = new Date();
         musicGroup.setCreateTime(date);
         musicGroup.setUpdateTime(date);
@@ -40,7 +40,7 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "修改乐团")
     @PutMapping("/update")
-    public Object update(MusicGroup musicGroup){
+    public Object update(@RequestBody MusicGroup musicGroup){
         musicGroup.setUpdateTime(new Date());
         musicGroupService.update(musicGroup);
         return succeed();
@@ -54,13 +54,13 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "分页查询乐团列表")
     @PostMapping("/queryPage")
-    public Object queryPage(MusicGroupQueryInfo queryInfo){
+    public Object queryPage(@RequestBody MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "【建团申请-->】，新增、修改提交【声部设置】")
     @PostMapping("/subSet")
-    public Object subSet(List<SubSettingUtilEntity> subSettingUtilEntitys){
+    public Object subSet(@RequestBody List<SubSettingUtilEntity> subSettingUtilEntitys){
         musicGroupService.subSetting(subSettingUtilEntitys);
         return succeed();
     }
@@ -70,9 +70,4 @@ public class MusicGroupController extends BaseController {
     public Object getSubSetting(@RequestBody Integer musicGroupId){
         return succeed(musicGroupService.getSubSetting(musicGroupId));
     }
-
-    public Object financeFeeSet(){
-        return succeed();
-    }
-
 }

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

@@ -0,0 +1,61 @@
+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.MusicGroupPaymentEntities;
+import com.ym.mec.web.service.MusicGroupPaymentEntitiesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+@RequestMapping("musicGroupPaymentEntities")
+@Api(tags = "乐团付费主体服务")
+@RestController
+public class MusicGroupPaymentEntitiesController extends BaseController {
+
+    @Autowired
+    private MusicGroupPaymentEntitiesService musicGroupPaymentEntitiesService;
+
+    @ApiOperation(value = "新增乐团付费主体")
+    @PostMapping("/add")
+    public Object add(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+        Date date = new Date();
+        musicGroupPaymentEntities.setCreateTime(date);
+        musicGroupPaymentEntities.setUpdateTime(date);
+        musicGroupPaymentEntitiesService.insert(musicGroupPaymentEntities);
+        return succeed();
+    }
+
+    @ApiOperation(value = "批量新增乐团付费主体")
+    @PostMapping("/batchAdd")
+    public Object batchAdd(@RequestBody List<MusicGroupPaymentEntities> musicGroupPaymentEntities){
+        musicGroupPaymentEntitiesService.batchInsert(musicGroupPaymentEntities);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除乐团付费主体")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "乐团付费主体编号", required = true) @PathVariable("id") Integer id){
+        musicGroupPaymentEntitiesService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改乐团付费主体")
+    @PutMapping("/update")
+    public Object update(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+        musicGroupPaymentEntities.setUpdateTime(new Date());
+        musicGroupPaymentEntitiesService.update(musicGroupPaymentEntities);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询乐团付费主体")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody QueryInfo queryInfo){
+        return succeed(musicGroupPaymentEntitiesService.queryPage(queryInfo));
+    }
+}

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

@@ -22,13 +22,13 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "分页查询组织机构树状列表")
     @PostMapping("/queryPage")
-    public Object queryPage(OrganizationQueryInfo queryInfo){
+    public Object queryPage(@RequestBody OrganizationQueryInfo queryInfo){
         return organizationService.queryTreePage(queryInfo);
     }
 
     @ApiOperation(value = "新增机构")
     @PostMapping("/add")
-    public Object add(Organization organization){
+    public Object add(@RequestBody Organization organization){
         Organization organizationByCode = organizationService.findByCode(organization.getCode());
         if(organizationByCode != null){
             return failed("组织机构代码已经存在,请更改");

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

@@ -21,7 +21,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "新增学校")
     @PostMapping("/add")
-    public Object add(School school){
+    public Object add(@RequestBody School school){
         Date date = new Date();
         school.setCreateTime(date);
         school.setUpdateTime(date);
@@ -38,7 +38,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "修改学校")
     @PutMapping("/update")
-    public Object update(School school){
+    public Object update(@RequestBody School school){
         school.setUpdateTime(new Date());
         schoolService.update(school);
         return succeed();
@@ -52,7 +52,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "分页查询学校列表")
     @PostMapping("/queryPage")
-    public Object queryPage(SchoolQueryInfo queryInfo){
+    public Object queryPage(@RequestBody SchoolQueryInfo queryInfo){
         return succeed(schoolService.queryPage(queryInfo));
     }
 }

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

@@ -22,7 +22,7 @@ public class StudentAttendanceController extends BaseController {
 
     @ApiOperation(value = "新增课程组")
     @PostMapping("/add")
-    public Object add(CourseGroup courseGroup){
+    public Object add(@RequestBody CourseGroup courseGroup){
         Date date = new Date();
         courseGroup.setCreateTime(date);
         courseGroup.setUpdateTime(date);
@@ -39,7 +39,7 @@ public class StudentAttendanceController extends BaseController {
 
     @ApiOperation(value = "修改课程组")
     @PutMapping("/update")
-    public Object update(CourseGroup courseGroup){
+    public Object update(@RequestBody CourseGroup courseGroup){
         courseGroup.setUpdateTime(new Date());
         courseGroupService.update(courseGroup);
         return succeed();
@@ -53,7 +53,7 @@ public class StudentAttendanceController extends BaseController {
 
     @ApiOperation(value = "分页查询课程组")
     @PostMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(@RequestBody QueryInfo queryInfo){
         return succeed(courseGroupService.queryPage(queryInfo));
     }
 }

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.HashMap;
 
 @RequestMapping("studentRegistration")
 @Api(tags = "学生报名信息服务")
@@ -23,7 +24,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
-    public Object add(StudentRegistration studentRegistration){
+    public Object add(@RequestBody StudentRegistration studentRegistration){
         Date date = new Date();
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
@@ -40,7 +41,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "修改学生报名信息")
     @PutMapping("/update")
-    public Object update(StudentRegistration studentRegistration){
+    public Object update(@RequestBody StudentRegistration studentRegistration){
         studentRegistration.setUpdateTime(new Date());
         studentRegistrationService.update(studentRegistration);
         return succeed();
@@ -48,16 +49,18 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "分页查询学生乐团报名详情")
     @PostMapping("/queryStudentDetailPage")
-    public Object queryStudentDetailPage(StudentRegistrationQueryInfo queryInfo){
+    public Object queryStudentDetailPage(@RequestBody StudentRegistrationQueryInfo queryInfo){
         return succeed(studentRegistrationService.queryStudentDetailPage(queryInfo));
     }
 
     @ApiOperation(value = "批量调剂学生报名专业")
     @PutMapping("/batchUpdateSubject")
-    public Object batchUpdateSubject(String userId,Integer subId){
-        if(StringUtils.isEmpty(userId) || subId == null){
+    public Object batchUpdateSubject(@RequestBody HashMap<String,String> param){
+        String userId = param.get("userId");
+        String subId = param.get("subId");
+        if(StringUtils.isEmpty(userId) || StringUtils.isEmpty(subId)){
             return failed();
         }
-        return succeed(studentRegistrationService.batchUpdateSubject(userId,subId));
+        return succeed(studentRegistrationService.batchUpdateSubject(userId,Integer.parseInt(subId)));
     }
 }

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

@@ -20,7 +20,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "新增科目")
     @PostMapping("/add")
-    public Object add(Subject subject){
+    public Object add(@RequestBody Subject subject){
         Subject subjectByCode = subjectService.findByCode(subject.getCode());
         if(subjectByCode != null){
             return failed("科目编号已存在，请核查");
@@ -41,7 +41,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "修改科目")
     @PutMapping("/update")
-    public Object update(Subject subject){
+    public Object update(@RequestBody Subject subject){
         Subject subjectByCode = subjectService.findByCode(subject.getCode());
         if(subjectByCode != null && !subjectByCode.getId().equals(subject.getId())){
             return failed("科目编号已存在，请核查");
@@ -59,21 +59,21 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "分页查询科目列表")
     @PostMapping("/queryPage")
-    public Object queryPage(SubjectQueryInfo queryInfo){
+    public Object queryPage(@RequestBody SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "通过乐团编号查询科目列表")
     @PostMapping("/querySubByMusicGroupId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubByMusicGroupId(Integer musicGroupId){
+    public Object findSubByMusicGroupId(@RequestBody 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){
+    public Object findSubByChargeType(@RequestBody Integer chargeTypeId){
         return succeed(subjectService.findSubByChargeType(chargeTypeId));
     }
 }

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

@@ -43,7 +43,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "修改教师")
     @PutMapping("/update")
-    public Object update(Teacher teacher) {
+    public Object update(@RequestBody Teacher teacher) {
         Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
         if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
             return failed("系统已存在该证件号的老师，请核查");
@@ -61,7 +61,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "分页查询教师列表")
     @PostMapping("/queryPage")
-    public Object queryPage(TeacherQueryInfo queryInfo) {
+    public Object queryPage(@RequestBody TeacherQueryInfo queryInfo) {
         return succeed(teacherService.queryPage(queryInfo));
     }
 }

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

@@ -3,7 +3,7 @@ package com.ym.mec.web.dal.dao;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
 
-public interface MusicGroupPaymentEntitiesDao extends BaseDAO<Integer, MusicGroupPaymentEntities> {
+import java.util.List;
 
-	
+public interface MusicGroupPaymentEntitiesDao extends BaseDAO<Integer, MusicGroupPaymentEntities> {
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.web.dal.enums.PaymentMethod;
@@ -13,18 +14,23 @@ public class MusicGroupPaymentEntities {
 	private Integer id;
 	
 	/** 乐团编号 */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private String musicGroupId;
 	
 	/** 主体名称 */
+	@ApiModelProperty(value = "主体名称",required = false)
 	private String name;
 	
 	/** 付费方式(一次性、按月、按学期、按学年) */
+	@ApiModelProperty(value = "付费方式(一次性、按月、按学期、按学年)",required = false)
 	private PaymentMethod paymentMethod;
 	
 	/** 金额 */
+	@ApiModelProperty(value = "金额",required = false)
 	private long amount;
 	
 	/** 备注 */
+	@ApiModelProperty(value = "备注",required = false)
 	private String memo;
 	
 	/**  */

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

@@ -9,8 +9,7 @@ public interface CourseGroupDetailService extends BaseService<Integer, CourseGro
 
     /**
      * 新增课程组，并批量新增课程详情
-     * @param courseGroupName
      * @param courseGroupDetails
      */
-    void batchInsert(String courseGroupName,Integer organId, List<CourseGroupDetail> courseGroupDetails);
+    void batchInsert(List<CourseGroupDetail> courseGroupDetails);
 }

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

@@ -3,6 +3,13 @@ package com.ym.mec.web.service;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
 
+import java.util.List;
+
 public interface MusicGroupPaymentEntitiesService extends BaseService<Integer, MusicGroupPaymentEntities> {
 
+    /**
+     * 批量新增乐团付费主体
+     * @param musicGroupPaymentEntities
+     */
+    void batchInsert(List<MusicGroupPaymentEntities> musicGroupPaymentEntities);
 }

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

@@ -1,28 +1,21 @@
 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;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.CourseGroupDetailDao;
 import com.ym.mec.web.dal.entity.CourseGroupDetail;
 import com.ym.mec.web.service.CourseGroupDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 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() {
@@ -30,14 +23,9 @@ public class CourseGroupDetailServiceImpl extends BaseServiceImpl<Integer, Cours
 	}
 
 	@Override
-	public void batchInsert(String courseGroupName,Integer organId, List<CourseGroupDetail> courseGroupDetails) {
-		CourseGroup courseGroup = new CourseGroup(organId,courseGroupName);
+	public void batchInsert(List<CourseGroupDetail> courseGroupDetails) {
 		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/MusicGroupPaymentEntitiesServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.web.service.impl;
 
 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;
@@ -8,6 +9,10 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.MusicGroupPaymentEntitiesDao;
 import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
 import com.ym.mec.web.service.MusicGroupPaymentEntitiesService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class MusicGroupPaymentEntitiesServiceImpl extends BaseServiceImpl<Integer, MusicGroupPaymentEntities>  implements MusicGroupPaymentEntitiesService {
@@ -19,5 +24,15 @@ public class MusicGroupPaymentEntitiesServiceImpl extends BaseServiceImpl<Intege
 	public BaseDAO<Integer, MusicGroupPaymentEntities> getDAO() {
 		return musicGroupPaymentEntitiesDao;
 	}
-	
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void batchInsert(List<MusicGroupPaymentEntities> musicGroupPaymentEntities) {
+		Date date = new Date();
+		musicGroupPaymentEntities.forEach(e -> {
+			e.setCreateTime(date);
+			e.setUpdateTime(date);
+			musicGroupPaymentEntitiesDao.insert(e);
+		});
+	}
 }

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

@@ -36,7 +36,7 @@
 		-->
 		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_) VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},#{createTime},#{updateTime})
 	</insert>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities">
 		UPDATE music_group_payment_entities