Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-web/src/main/java/com/ym/mec/web/service/impl/TeacherAttendanceServiceImpl.java

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

@@ -1,12 +1,14 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.dto.SubFeeSettingDto;
 import com.ym.mec.web.dal.entity.MusicGroup;
 import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.web.service.MusicGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,8 +25,15 @@ public class MusicGroupController extends BaseController {
     @ApiOperation(value = "新增乐团")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroup musicGroup){
-        musicGroupService.insert(musicGroup);
-        return succeed();
+        if(musicGroup != null){
+            if(StringUtils.isNotEmpty(musicGroup.getPaymentMonths())){
+                musicGroupService.add(musicGroup);
+            }else {
+                musicGroupService.insert(musicGroup);
+            }
+            return succeed();
+        }
+        return failed();
     }
 
     @ApiOperation(value = "删除乐团")
@@ -53,4 +62,11 @@ public class MusicGroupController extends BaseController {
     public Object queryPage(@RequestBody MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "建团申请数据提交")
+    @PostMapping("/createGroup")
+    public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
+        musicGroupService.createGroup(subFeeSettingDto);
+        return succeed();
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.ym.mec.web.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.entity.CooperationOrgan;
+
+public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan> {
+
+	
+}

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

@@ -10,5 +10,5 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * 根据乐团编号删除乐团缴费周期
      * @param musicGroupId
      */
-    void delByGroupId(Integer musicGroupId);
+    void delByGroupId(String musicGroupId);
 }

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

@@ -0,0 +1,9 @@
+package com.ym.mec.web.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.entity.TeacherClassFee;
+
+public interface TeacherClassFeeDao extends BaseDAO<Long, TeacherClassFee> {
+
+	
+}

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubFeeSettingDto.java

@@ -1,13 +1,67 @@
 package com.ym.mec.web.dal.dto;
 
+import com.ym.mec.web.dal.entity.MusicGroup;
+import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
+import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
 public class SubFeeSettingDto {
-    private Integer subjectId;
 
-    private String subjectName;
+    @ApiModelProperty(value = "乐团明细",required = false)
+    private MusicGroup musicGroup;
+
+    @ApiModelProperty(value = "乐团付费主体列表",required = false)
+    private List<MusicGroupPaymentEntities> musicGroupPaymentEntities;
+
+    @ApiModelProperty(value = "声部设置列表",required = false)
+    private List<MusicGroupSubjectPlan> musicGroupSubjectPlans;
+
+    @ApiModelProperty(value = "乐器、教辅组合列表",required = false)
+    private List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups;
+
+    @ApiModelProperty(value = "学员的付费方式月份列表",required = false)
+    private List<Integer> months;
+
+    public MusicGroup getMusicGroup() {
+        return musicGroup;
+    }
+
+    public void setMusicGroup(MusicGroup musicGroup) {
+        this.musicGroup = musicGroup;
+    }
+
+    public List<MusicGroupPaymentEntities> getMusicGroupPaymentEntities() {
+        return musicGroupPaymentEntities;
+    }
+
+    public void setMusicGroupPaymentEntities(List<MusicGroupPaymentEntities> musicGroupPaymentEntities) {
+        this.musicGroupPaymentEntities = musicGroupPaymentEntities;
+    }
+
+    public List<MusicGroupSubjectPlan> getMusicGroupSubjectPlans() {
+        return musicGroupSubjectPlans;
+    }
+
+    public void setMusicGroupSubjectPlans(List<MusicGroupSubjectPlan> musicGroupSubjectPlans) {
+        this.musicGroupSubjectPlans = musicGroupSubjectPlans;
+    }
+
+    public List<MusicGroupSubjectGoodsGroup> getMusicGroupSubjectGoodsGroups() {
+        return musicGroupSubjectGoodsGroups;
+    }
 
-    private Integer expectedStudentNum;
+    public void setMusicGroupSubjectGoodsGroups(List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups) {
+        this.musicGroupSubjectGoodsGroups = musicGroupSubjectGoodsGroups;
+    }
 
-    private Long depositFee;
+    public List<Integer> getMonths() {
+        return months;
+    }
 
-//    private
+    public void setMonths(List<Integer> months) {
+        this.months = months;
+    }
 }

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

@@ -30,14 +30,6 @@ public class ClassGroup {
 	@ApiModelProperty(value = "学生数量",required = false)
 	private Integer studentNum;
 	
-	/** 助教 */
-	@ApiModelProperty(value = "助教",required = false)
-	private Integer assistantTeacherId;
-	
-	/** 主教 */
-	@ApiModelProperty(value = "主教",required = false)
-	private Integer mainTeacherId;
-	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -51,10 +43,6 @@ public class ClassGroup {
 	/** 班级类型(普通班级、合奏班级) */
 	@ApiModelProperty(value = "是否删除，1是 0否",required = false)
 	private YesOrNoEnum delFlag;
-	
-	/** 教师课酬 */
-	@ApiModelProperty(value = "教师课酬",required = false)
-	private long teacherSalary;
 
 	public YesOrNoEnum getDelFlag() {
 		return delFlag;
@@ -104,22 +92,6 @@ public class ClassGroup {
 		return this.studentNum;
 	}
 			
-	public void setAssistantTeacherId(Integer assistantTeacherId){
-		this.assistantTeacherId = assistantTeacherId;
-	}
-	
-	public Integer getAssistantTeacherId(){
-		return this.assistantTeacherId;
-	}
-			
-	public void setMainTeacherId(Integer mainTeacherId){
-		this.mainTeacherId = mainTeacherId;
-	}
-	
-	public Integer getMainTeacherId(){
-		return this.mainTeacherId;
-	}
-			
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
@@ -144,14 +116,6 @@ public class ClassGroup {
 		this.type = type;
 	}
 
-	public void setTeacherSalary(long teacherSalary){
-		this.teacherSalary = teacherSalary;
-	}
-	
-	public long getTeacherSalary(){
-		return this.teacherSalary;
-	}
-			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,103 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(cooperation_organ):
+ */
+public class CooperationOrgan {
+
+	/**  */
+	private Integer id;
+	
+	/** 单位名称 */
+	private String name;
+	
+	/** 联系人 */
+	private String linkman;
+	
+	/**  */
+	private String job;
+	
+	/**  */
+	private String mobileNo;
+	
+	/**  */
+	private String address;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setLinkman(String linkman){
+		this.linkman = linkman;
+	}
+	
+	public String getLinkman(){
+		return this.linkman;
+	}
+			
+	public void setJob(String job){
+		this.job = job;
+	}
+	
+	public String getJob(){
+		return this.job;
+	}
+			
+	public void setMobileNo(String mobileNo){
+		this.mobileNo = mobileNo;
+	}
+	
+	public String getMobileNo(){
+		return this.mobileNo;
+	}
+			
+	public void setAddress(String address){
+		this.address = address;
+	}
+	
+	public String getAddress(){
+		return this.address;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -1,10 +1,8 @@
 package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.web.dal.enums.PaymentMethod;
-
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -32,7 +30,7 @@ public class MusicGroup {
 	private java.util.Date applyExpireDate;
 	
 	/** 团长 */
-	@ApiModelProperty(value = "团长",required = false)
+	@ApiModelProperty(value = "运营主管",required = false)
 	private Integer teamTeacherId;
 	
 	/** 教务老师 */
@@ -43,17 +41,8 @@ public class MusicGroup {
 	@ApiModelProperty(value = "收费类型",required = false)
 	private Integer chargeTypeId;
 	
-	/** 课程组 */
-	@ApiModelProperty(value = "课程组",required = false)
-	private String courseGroupId;
-	
-	/**  */
-	@ApiModelProperty(value = "乐团课时数",required = false)
-	private Integer classPeriod;
-	
-	/**  */
-	@ApiModelProperty(value = "乐团赠送课时数",required = false)
-	private Integer freeClassPeriod;
+	@ApiModelProperty(value = "课程形态",required = false)
+	private String courseForm;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -76,21 +65,42 @@ public class MusicGroup {
 	@ApiModelProperty(value = "提高课班级数",required = false)
 	private Integer improventClassesNum;
 	
-	@ApiModelProperty(value = "招生年级（多个用|分开）",required = false)
+	@ApiModelProperty(value = "招生年级（多个用,分开）",required = false)
 	private String enrollClasses;
 	
-	/** 付费方式(一次性、按月、按学期、按学年) */
-	@ApiModelProperty(value = "付费方式",required = false)
-	private PaymentMethod paymentMethod;
+	/** 是否是加课*/
+	@ApiModelProperty(value = "是否是加课",required = false)
+	private YesOrNoEnum isExtraClass;
 	
-	public void setId(String id){
-		this.id = id;
-	}
+	@ApiModelProperty(value = "合作单位编号",required = false)
+	private String cooperationOrganId;
+	
+	@ApiModelProperty(value = "启蒙课日期",required = false)
+	private String enlightenmentCourseTime;
 	
-	public String getId(){
-		return this.id;
+	@ApiModelProperty(value = "家长会日期",required = false)
+	private String parentMeetingTime;
+
+	/** 缴费月份*/
+	@ApiModelProperty(value = "缴费月份（多个用,分开）",required = false)
+	private String paymentMonths;
+
+	public String getPaymentMonths() {
+		return paymentMonths;
 	}
-			
+
+	public void setPaymentMonths(String paymentMonth) {
+		this.paymentMonths = paymentMonth;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	public void setName(String name){
 		this.name = name;
 	}
@@ -147,30 +157,38 @@ public class MusicGroup {
 		return this.chargeTypeId;
 	}
 			
-	public void setCourseGroupId(String courseGroupId){
-		this.courseGroupId = courseGroupId;
+	public String getCourseForm() {
+		return courseForm;
 	}
-	
-	public String getCourseGroupId(){
-		return this.courseGroupId;
+
+	public void setCourseForm(String courseForm) {
+		this.courseForm = courseForm;
 	}
-			
-	public void setClassPeriod(Integer classPeriod){
-		this.classPeriod = classPeriod;
+
+	public String getCooperationOrganId() {
+		return cooperationOrganId;
 	}
-	
-	public Integer getClassPeriod(){
-		return this.classPeriod;
+
+	public void setCooperationOrganId(String cooperationOrganId) {
+		this.cooperationOrganId = cooperationOrganId;
 	}
-			
-	public void setFreeClassPeriod(Integer freeClassPeriod){
-		this.freeClassPeriod = freeClassPeriod;
+
+	public String getEnlightenmentCourseTime() {
+		return enlightenmentCourseTime;
 	}
-	
-	public Integer getFreeClassPeriod(){
-		return this.freeClassPeriod;
+
+	public void setEnlightenmentCourseTime(String enlightenmentCourseTime) {
+		this.enlightenmentCourseTime = enlightenmentCourseTime;
 	}
-			
+
+	public String getParentMeetingTime() {
+		return parentMeetingTime;
+	}
+
+	public void setParentMeetingTime(String parentMeetingTime) {
+		this.parentMeetingTime = parentMeetingTime;
+	}
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
@@ -227,12 +245,12 @@ public class MusicGroup {
 		this.enrollClasses = enrollClasses;
 	}
 
-	public PaymentMethod getPaymentMethod() {
-		return paymentMethod;
+	public YesOrNoEnum getIsExtraClass() {
+		return isExtraClass;
 	}
 
-	public void setPaymentMethod(PaymentMethod paymentMethod) {
-		this.paymentMethod = paymentMethod;
+	public void setIsExtraClass(YesOrNoEnum isExtraClass) {
+		this.isExtraClass = isExtraClass;
 	}
 
 	@Override

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

@@ -13,7 +13,7 @@ public class MusicGroupPaymentCalender {
 	
 	/**  */
 	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
+	private String musicGroupId;
 	
 	/** 缴费月份 */
 	@ApiModelProperty(value = "缴费月份",required = false)
@@ -37,11 +37,11 @@ public class MusicGroupPaymentCalender {
 		return this.id;
 	}
 			
-	public void setMusicGroupId(Integer musicGroupId){
+	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}
 	
-	public Integer getMusicGroupId(){
+	public String getMusicGroupId(){
 		return this.musicGroupId;
 	}
 			

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

@@ -1,10 +1,9 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.PaymentMethod;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.web.dal.enums.PaymentMethod;
-
 import java.math.BigDecimal;
 
 /**
@@ -40,7 +39,7 @@ public class MusicGroupPaymentEntities {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -25,7 +25,7 @@ public class MusicGroupSubjectGoodsGroup {
 	
 	/**  */
 	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
+	private String musicGroupId;
 	
 	/**  */
 	@ApiModelProperty(value = "科目编号",required = false)
@@ -80,11 +80,11 @@ public class MusicGroupSubjectGoodsGroup {
 		this.type = type;
 	}
 
-	public void setMusicGroupId(Integer musicGroupId){
+	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}
 	
-	public Integer getMusicGroupId(){
+	public String getMusicGroupId(){
 		return this.musicGroupId;
 	}
 			

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

@@ -16,7 +16,7 @@ public class MusicGroupSubjectPlan {
 	
 	/** 乐团编号 */
 	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
+	private String musicGroupId;
 	
 	/** 科目编号 */
 	@ApiModelProperty(value = "科目编号",required = false)
@@ -42,8 +42,8 @@ public class MusicGroupSubjectPlan {
 	@ApiModelProperty(value = "乐器团购类型（免费、租赁、借用）",required = false)
 	private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
 	
-	/** 乐器团购类型对应的费用 */
-	@ApiModelProperty(value = "乐器团购类型对应的费用",required = false)
+	/** 保证金（只有租赁才有） */
+	@ApiModelProperty(value = "保证金（只有租赁才有）",required = false)
 	private BigDecimal depositFee;
 	
 	/**  */
@@ -68,11 +68,11 @@ public class MusicGroupSubjectPlan {
 		return this.id;
 	}
 			
-	public void setMusicGroupId(Integer musicGroupId){
+	public void setMusicGroupId(String musicGroupId){
 		this.musicGroupId = musicGroupId;
 	}
 	
-	public Integer getMusicGroupId(){
+	public String getMusicGroupId(){
 		return this.musicGroupId;
 	}
 			

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

@@ -1,7 +1,11 @@
 package com.ym.mec.web.dal.entity;
 
+import java.math.BigDecimal;
+
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -44,6 +48,9 @@ public class School {
 
 	@ApiModelProperty(value = "经纬度", required = false)
 	private String longitudeLatitude;
+	
+	@ApiModelProperty(value = "补贴", required = false)
+	private BigDecimal subsidy;
 
 	public void setId(Integer id) {
 		this.id = id;
@@ -125,6 +132,14 @@ public class School {
 		this.longitudeLatitude = longitudeLatitude;
 	}
 
+	public BigDecimal getSubsidy() {
+		return subsidy;
+	}
+
+	public void setSubsidy(BigDecimal subsidy) {
+		this.subsidy = subsidy;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.SignStatusEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -40,7 +41,7 @@ public class TeacherAttendance {
 	
 	/** 状态(正常签到，异常签到) */
 	@ApiModelProperty(value = "状态(1正常签到，0异常签到，2正常签退) ",required = false)
-	private YesOrNoEnum status;
+	private SignStatusEnum status;
 	
 	/** 备注 */
 	@ApiModelProperty(value = "备注",required = false)
@@ -105,11 +106,11 @@ public class TeacherAttendance {
 		this.signInTime = signInTime;
 	}
 
-	public YesOrNoEnum getStatus() {
+	public SignStatusEnum getStatus() {
 		return status;
 	}
 
-	public void setStatus(YesOrNoEnum status) {
+	public void setStatus(SignStatusEnum status) {
 		this.status = status;
 	}
 

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

@@ -0,0 +1,103 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(teacher_class_fee):
+ */
+public class TeacherClassFee {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer musicGroupId;
+	
+	/**  */
+	private Integer classGroupId;
+	
+	/**  */
+	private Integer teacherId;
+	
+	/** 职务类型（助教、主教） */
+	private String jobType;
+	
+	/**  */
+	private long classFee;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setClassGroupId(Integer classGroupId){
+		this.classGroupId = classGroupId;
+	}
+	
+	public Integer getClassGroupId(){
+		return this.classGroupId;
+	}
+			
+	public void setTeacherId(Integer teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Integer getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public void setJobType(String jobType){
+		this.jobType = jobType;
+	}
+	
+	public String getJobType(){
+		return this.jobType;
+	}
+			
+	public void setClassFee(long classFee){
+		this.classFee = classFee;
+	}
+	
+	public long getClassFee(){
+		return this.classFee;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-web/src/main/java/com/ym/mec/web/dal/enums/JobTypeEnum.java

@@ -3,34 +3,32 @@ package com.ym.mec.web.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 //职务类型（指导老师、教务老师、教学主管）
-public enum JobTypeEnum implements BaseEnum<String,JobTypeEnum> {
-    ADVISER("ADVISER","指导老师"),
-    ACADEMIC("ACADEMIC","教务老师"),
-    TEACHING("TEACHING","教学主管");
+public enum JobTypeEnum implements BaseEnum<String, JobTypeEnum> {
+	ADVISER("ADVISER", "指导老师"), ACADEMIC("ACADEMIC", "教务老师"), TEACHING("TEACHING", "教学主管"), ASSISTANT("ASSISTANT", "助教");
 
-    private String code;
+	private String code;
 
-    private String msg;
+	private String msg;
 
-    JobTypeEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
+	JobTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
 
-    public void setCode(String code) {
-        this.code = code;
-    }
+	public void setCode(String code) {
+		this.code = code;
+	}
 
-    public String getMsg() {
-        return msg;
-    }
+	public String getMsg() {
+		return msg;
+	}
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
 
-    @Override
-    public String getCode() {
-        return this.code;
-    }
+	@Override
+	public String getCode() {
+		return this.code;
+	}
 }

mec-web/src/main/java/com/ym/mec/web/dal/enums/SignStatusEnum.java

@@ -0,0 +1,35 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+//状态(1正常签到，0异常签到，2正常签退)
+public enum SignStatusEnum implements BaseEnum<Integer, SignStatusEnum> {
+    SIGN(1,"1正常签到"),
+    EXCEPTION(0,"异常签到"),
+    YES_QUIT(2,"正常签退");
+
+    private Integer code;
+    private String msg;
+
+    SignStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/enums/YesOrNoEnum.java

@@ -4,8 +4,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     YES(1,"是"),
-    NO(0,"否"),
-    YES_QUIT(2,"正常签退");
+    NO(0,"否");
 
     private Integer code;
     private String msg;

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

@@ -0,0 +1,8 @@
+package com.ym.mec.web.service;
+
+import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.entity.CooperationOrgan;
+
+public interface CooperationOrganService extends BaseService<Integer, CooperationOrgan> {
+
+}

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

@@ -1,7 +1,20 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.dto.SubFeeSettingDto;
 import com.ym.mec.web.dal.entity.MusicGroup;
 
 public interface MusicGroupService extends BaseService<String, MusicGroup> {
+
+    /**
+     * 建团申请，基本信息提交
+     * @param musicGroup
+     */
+    void add(MusicGroup musicGroup);
+
+    /**
+     * 建团申请数据提交
+     * @param subFeeSettingDto
+     */
+    void createGroup(SubFeeSettingDto subFeeSettingDto);
 }

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

@@ -0,0 +1,8 @@
+package com.ym.mec.web.service;
+
+import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.entity.TeacherClassFee;
+
+public interface TeacherClassFeeService extends BaseService<Long, TeacherClassFee> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.web.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.CooperationOrganDao;
+import com.ym.mec.web.dal.entity.CooperationOrgan;
+import com.ym.mec.web.service.CooperationOrganService;
+
+@Service
+public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, CooperationOrgan>  implements CooperationOrganService {
+	
+	@Autowired
+	private CooperationOrganDao cooperationOrganDao;
+
+	@Override
+	public BaseDAO<Integer, CooperationOrgan> getDAO() {
+		return cooperationOrganDao;
+	}
+	
+}

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

@@ -1,17 +1,15 @@
 package com.ym.mec.web.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.common.dal.BaseDAO;
 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.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Service
 public class MusicGroupPaymentEntitiesServiceImpl extends BaseServiceImpl<Integer, MusicGroupPaymentEntities>  implements MusicGroupPaymentEntitiesService {
@@ -27,10 +25,7 @@ public class MusicGroupPaymentEntitiesServiceImpl extends BaseServiceImpl<Intege
 	@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/java/com/ym/mec/web/service/impl/MusicGroupServiceImpl.java

@@ -2,21 +2,85 @@ package com.ym.mec.web.service.impl;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.MusicGroupDao;
-import com.ym.mec.web.dal.entity.MusicGroup;
+import com.ym.mec.web.dal.dao.*;
+import com.ym.mec.web.dal.dto.SubFeeSettingDto;
+import com.ym.mec.web.dal.entity.*;
 import com.ym.mec.web.service.MusicGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Service
 public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>  implements MusicGroupService {
 	
 	@Autowired
 	private MusicGroupDao musicGroupDao;
+	@Autowired
+	private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+	@Autowired
+	private MusicGroupPaymentEntitiesDao musicGroupPaymentEntitiesDao;
+	@Autowired
+	private MusicGroupSubjectGoodsGroupDao musicGroupSubjectGoodsGroupDao;
+	@Autowired
+	private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
 
 	@Override
 	public BaseDAO<String, MusicGroup> getDAO() {
 		return musicGroupDao;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void add(MusicGroup musicGroup) {
+		musicGroupDao.insert(musicGroup);
+		String[] split = musicGroup.getPaymentMonths().split(",");
+		MusicGroupPaymentCalender mg;
+		for (String month:split) {
+			mg = new MusicGroupPaymentCalender();
+			mg.setMusicGroupId(musicGroup.getId());
+			mg.setPaymentMonth(Integer.parseInt(month));
+			musicGroupPaymentCalenderDao.insert(mg);
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void createGroup(SubFeeSettingDto subFeeSettingDto) {
+		MusicGroup musicGroup = subFeeSettingDto.getMusicGroup();
+		List<MusicGroupPaymentEntities> musicGroupPaymentEntities = subFeeSettingDto.getMusicGroupPaymentEntities();
+		List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroups = subFeeSettingDto.getMusicGroupSubjectGoodsGroups();
+		List<MusicGroupSubjectPlan> musicGroupSubjectPlans = subFeeSettingDto.getMusicGroupSubjectPlans();
+		if(musicGroup == null || musicGroupPaymentEntities == null || musicGroupSubjectGoodsGroups == null || musicGroupSubjectPlans == null){
+			//保存乐团基本信息
+			musicGroupDao.insert(musicGroup);
+			//保存乐团付费主体列表
+			musicGroupPaymentEntities.forEach(e ->{
+				e.setMusicGroupId(musicGroup.getId());
+				musicGroupPaymentEntitiesDao.insert(e);
+			});
+			//保存学员付费周期
+			List<Integer> months = subFeeSettingDto.getMonths();
+			if(months != null && months.size() > 0){
+				MusicGroupPaymentCalender mg;
+				for (Integer month:months) {
+					mg = new MusicGroupPaymentCalender();
+					mg.setMusicGroupId(musicGroup.getId());
+					mg.setPaymentMonth(month);
+					musicGroupPaymentCalenderDao.insert(mg);
+				}
+			}
+			//保存乐团声部规划
+			musicGroupSubjectPlans.forEach(e ->{
+				e.setMusicGroupId(musicGroup.getId());
+				musicGroupSubjectPlanDao.insert(e);
+			});
+			//保存乐团声部商品规划
+			musicGroupSubjectGoodsGroups.forEach(e->{
+				e.setMusicGroupId(musicGroup.getId());
+				musicGroupSubjectGoodsGroupDao.insert(e);
+			});
+		}
+	}
 }

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

@@ -1,19 +1,15 @@
 package com.ym.mec.web.service.impl;
 
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dao.CourseScheduleDao;
 import com.ym.mec.web.dal.dao.TeacherAttendanceDao;
 import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
-import com.ym.mec.web.dal.dto.TeacherPersonalAttendanceDto;
 import com.ym.mec.web.dal.entity.CourseSchedule;
 import com.ym.mec.web.dal.entity.TeacherAttendance;
 import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import com.ym.mec.web.dal.enums.ParamEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
-import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
 import com.ym.mec.web.service.TeacherAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,7 +35,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	public void addTeacherAttendanceRecord(TeacherAttendance teacherAttendance) {
 		CourseSchedule courseSchedule=new CourseSchedule();
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherAttendance.getCourseScheduleId());
-		courseSchedule.setActualTeacherId(teacherAttendance.getTeacherId());
 		courseSchedule.setId(currentCourseDetail.getCourseScheduleId());
 		Date date = new Date();
 		if(teacherAttendance.getStatus()!= YesOrNoEnum.YES_QUIT){

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

@@ -0,0 +1,23 @@
+package com.ym.mec.web.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.TeacherClassFeeDao;
+import com.ym.mec.web.dal.entity.TeacherClassFee;
+import com.ym.mec.web.service.TeacherClassFeeService;
+
+@Service
+public class TeacherClassFeeServiceImpl extends BaseServiceImpl<Long, TeacherClassFee>  implements TeacherClassFeeService {
+	
+	@Autowired
+	private TeacherClassFeeDao teacherClassFeeDao;
+
+	@Override
+	public BaseDAO<Long, TeacherClassFee> getDAO() {
+		return teacherClassFeeDao;
+	}
+	
+}

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

@@ -11,12 +11,9 @@
         <result column="subject_id_" property="subjectId"/>
         <result column="name_" property="name"/>
         <result column="student_num_" property="studentNum"/>
-        <result column="assistant_teacher_id_" property="assistantTeacherId"/>
-        <result column="main_teacher_id_" property="mainTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="teacher_salary_" property="teacherSalary"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroupId" javaType="com.ym.mec.web.dal.entity.MusicGroup" >
             <result column="name_" property="name"/>
@@ -30,12 +27,9 @@
         <result column="subject_id_" property="subjectId"/>
         <result column="name_" property="name"/>
         <result column="student_num_" property="studentNum"/>
-        <result column="assistant_teacher_id_" property="assistantTeacherId"/>
-        <result column="main_teacher_id_" property="mainTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="teacher_salary_" property="teacherSalary"/>
         <result column="name_" property="musicGroupName"/>
         <result column="status" property="musicGroupStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -49,12 +43,9 @@
             <if test="subjectId!=null">subject_id_,</if>
             <if test="name!=null">name_,</if>
             <if test="studentNum!=null">student_num_,</if>
-            <if test="assistantTeacherId!=null">assistant_teacher_id_,</if>
-            <if test="mainTeacherId!=null">main_teacher_id_,</if>
             <if test="createTime!=null">create_time_,</if>
             <if test="updateTime!=null">update_time_,</if>
             <if test="type!=null">type_,</if>
-            <if test="teacherSalary!=null">teacher_salary_</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -63,12 +54,9 @@
             <if test="subjectId!=null">#{subjectId},</if>
             <if test="name!=null">#{name},</if>
             <if test="studentNum!=null">#{studentNum},</if>
-            <if test="assistantTeacherId!=null">#{assistantTeacherId},</if>
-            <if test="mainTeacherId!=null">#{mainTeacherId},</if>
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
-            <if test="teacherSalary!=null">#{teacherSalary}</if>
         </trim>
     </insert>
 
@@ -86,9 +74,6 @@
     <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroup">
         UPDATE class_group
         <set>
-            <if test="mainTeacherId != null">
-                main_teacher_id_ = #{mainTeacherId},
-            </if>
             <if test="subjectId != null">
                 subject_id_ = #{subjectId},
             </if>
@@ -98,12 +83,6 @@
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>
-            <if test="assistantTeacherId != null">
-                assistant_teacher_id_ = #{assistantTeacherId},
-            </if>
-            <if test="teacherSalary != null">
-                teacher_salary_ = #{teacherSalary},
-            </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.web.dal.dao.CooperationOrganDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.CooperationOrgan"
+		id="CooperationOrgan">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="linkman_" property="linkman" />
+		<result column="job_" property="job" />
+		<result column="mobile_no_" property="mobileNo" />
+		<result column="address_" property="address" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CooperationOrgan">
+		SELECT * FROM
+		cooperation_organ WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CooperationOrgan">
+		SELECT * FROM cooperation_organ
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO cooperation_organ
+		(id_,name_,linkman_,job_,mobile_no_,address_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{linkman},#{job},#{mobileNo},#{address},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.CooperationOrgan">
+		UPDATE cooperation_organ
+		<set>
+			<if test="address != null">
+				address_ = #{address},
+			</if>
+			<if test="job != null">
+				job_ = #{job},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="linkman != null">
+				linkman_ = #{linkman},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="mobileNo != null">
+				mobile_no_ = #{mobileNo},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM cooperation_organ WHERE id_ =
+		#{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CooperationOrgan"
+		parameterType="map">
+		SELECT * FROM cooperation_organ ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		cooperation_organ
+	</select>
+</mapper>

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

@@ -45,8 +45,9 @@
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO goods
-        (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,create_time_,complement_goods_id_list_,update_time_)
-        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},#{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{publishTime},#{complementGoodsIdList},now(),now())
+        (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,complement_goods_id_list_,update_time_,create_time_)
+        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
+        #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{publishTime},#{complementGoodsIdList},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -1,122 +1,135 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.web.dal.dao.MusicGroupDao">
-    <resultMap type="com.ym.mec.web.dal.entity.MusicGroup" id="MusicGroup">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="school_id_" property="schoolId"/>
-        <result column="apply_expire_date_" property="applyExpireDate"/>
-        <result column="team_teacher_id_" property="teamTeacherId"/>
-        <result column="educational_teacher_id_" property="educationalTeacherId"/>
-        <result column="charge_type_id_" property="chargeTypeId"/>
-        <result column="course_group_id_" property="courseGroupId"/>
-        <result column="class_period_" property="classPeriod"/>
-        <result column="free_class_period_" property="freeClassPeriod"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="payment_expire_date_" property="paymentExpireDate"/>
-        <result column="bill_start_date_" property="billStartDate"/>
-        <result column="improvent_classes_num_" property="improventClassesNum"/>
-        <result column="enroll_classes_" property="enrollClasses"/>
-		<result column="payment_method_" property="paymentMethod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-    </resultMap>
 
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="MusicGroup">
-		SELECT * FROM music_group WHERE id_ = #{id} 
+	<resultMap type="com.ym.mec.web.dal.entity.MusicGroup" id="MusicGroup">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="organ_id_" property="organId" />
+		<result column="school_id_" property="schoolId" />
+		<result column="apply_expire_date_" property="applyExpireDate" />
+		<result column="team_teacher_id_" property="teamTeacherId" />
+		<result column="educational_teacher_id_" property="educationalTeacherId" />
+		<result column="charge_type_id_" property="chargeTypeId" />
+		<result column="course_form_" property="courseForm" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="status_" property="status" />
+		<result column="bill_start_date_" property="billStartDate" />
+		<result column="improvent_classes_num_" property="improventClassesNum" />
+		<result column="enroll_classes_" property="enrollClasses" />
+		<result column="payment_expire_date_" property="paymentExpireDate" />
+		<result column="is_extra_class_" property="isExtraClass" />
+		<result column="cooperation_organ_id_" property="cooperationOrganId" />
+		<result column="enlightenment_course_time_" property="enlightenmentCourseTime" />
+		<result column="parent_meeting_time_" property="parentMeetingTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroup">
+		SELECT * FROM
+		music_group WHERE id_ = #{id}
 	</select>
 
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="MusicGroup">
-		SELECT * FROM music_group ORDER BY id_
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroup">
+		SELECT * FROM music_group ORDER
+		BY id_
 	</select>
 
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO music_group
-        (id_,name_,organ_id_,school_id_,apply_expire_date_,improvent_classes_num_,enroll_classes_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_,payment_method_)
-        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{improventClassesNum},#{enrollClasses},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},now(),now(),#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
-    </insert>
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO music_group
+		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_)
+		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},#{createTime},#{updateTime},#{status},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},#{isExtraClass},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime})
+	</insert>
 
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroup">
-        UPDATE music_group
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="improventClassesNum != null">
-                improvent_classes_num_ = #{improventClassesNum},
-            </if>
-            <if test="enrollClasses != null">
-                enroll_classes_ = #{enrollClasses},
-            </if>
-            <if test="chargeTypeId != null">
-                charge_type_id_ = #{chargeTypeId},
-            </if>
-            <if test="courseGroupId != null">
-                course_group_id_ = #{courseGroupId},
-            </if>
-            <if test="educationalTeacherId != null">
-                educational_teacher_id_ = #{educationalTeacherId},
-            </if>
-            <if test="classPeriod != null">
-                class_period_ = #{classPeriod},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="freeClassPeriod != null">
-                free_class_period_ = #{freeClassPeriod},
-            </if>
-            <if test="paymentExpireDate != null">
-                payment_expire_date_ = #{paymentExpireDate},
-            </if>
-            <if test="schoolId != null">
-                school_id_ = #{schoolId},
-            </if>
-            <if test="applyExpireDate != null">
-                apply_expire_date_ = #{applyExpireDate},
-            </if>
-            <if test="billStartDate != null">
-                bill_start_date_ = #{billStartDate},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="teamTeacherId != null">
-                team_teacher_id_ = #{teamTeacherId},
-            </if>
-			<if test="paymentMethod != null">
-				payment_method_ = #{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroup">
+		UPDATE music_group
+		<set>
+			<if test="status != null">
+				status_ = #{status},
+			</if>
+			<if test="organId != null">
+				organ_id_ = #{organId},
+			</if>
+			<if test="improventClassesNum != null">
+				improvent_classes_num_ = #{improventClassesNum},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="courseForm != null">
+				course_form_ = #{courseForm},
+			</if>
+			<if test="chargeTypeId != null">
+				charge_type_id_ = #{chargeTypeId},
+			</if>
+			<if test="educationalTeacherId != null">
+				educational_teacher_id_ = #{educationalTeacherId},
+			</if>
+			<if test="enrollClasses != null">
+				enroll_classes_ = #{enrollClasses},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="isExtraClass != null">
+				is_extra_class_ = #{isExtraClass},
+			</if>
+			<if test="paymentExpireDate != null">
+				payment_expire_date_ = #{paymentExpireDate},
+			</if>
+			<if test="schoolId != null">
+				school_id_ = #{schoolId},
+			</if>
+			<if test="applyExpireDate != null">
+				apply_expire_date_ = #{applyExpireDate},
+			</if>
+			<if test="billStartDate != null">
+				bill_start_date_ = #{billStartDate},
+			</if>
+			<if test="cooperationOrganId != null">
+				cooperation_organ_id_ = #{cooperationOrganId},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="enlightenmentCourseTime != null">
+				enlightenment_course_time_ = #{enlightenmentCourseTime},
+			</if>
+			<if test="teamTeacherId != null">
+				team_teacher_id_ = #{teamTeacherId},
+			</if>
+			<if test="parentMeetingTime != null">
+				parent_meeting_time_ = #{parentMeetingTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
 
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM music_group WHERE id_ = #{id} 
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM music_group WHERE id_ = #{id}
 	</delete>
 
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="MusicGroup" parameterType="map">
-        SELECT * FROM music_group ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroup" parameterType="map">
+		SELECT * FROM music_group ORDER BY id_
+		<include refid="global.limit" />
+	</select>
 
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int" parameterType="map">
-		SELECT COUNT(*) FROM music_group
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		music_group
 	</select>
 </mapper>

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

@@ -17,6 +17,7 @@
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="contact_name_" property="contactName"/>
         <result column="longitude_latitude_" property="longitudeLatitude"/>
+        <result column="subsidy_" property="subsidy"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -38,8 +39,8 @@
         </selectKey>
         -->
         INSERT INTO school
-        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_,longitude_latitude_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude})
+        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_,longitude_latitude_,subsidy_)
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude},#{subsidy})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -70,6 +71,9 @@
             <if test="name != null">
                 name_ = #{name},
             </if>
+            <if test="subsidy != null">
+                subsidy_ = #{subsidy},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.web.dal.dao.TeacherClassFeeDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.TeacherClassFee"
+		id="TeacherClassFee">
+		<result column="id_" property="id" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="class_group_id_" property="classGroupId" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="job_type_" property="jobType" />
+		<result column="class_fee_" property="classFee" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="TeacherClassFee">
+		SELECT * FROM
+		teacher_class_fee WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="TeacherClassFee">
+		SELECT * FROM teacher_class_fee
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherClassFee"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO teacher_class_fee
+		(id_,music_group_id_,class_group_id_,teacher_id_,job_type_,class_fee_,create_time_,update_time_)
+		VALUES(#{id},#{musicGroupId},#{classGroupId},#{teacherId},#{jobType},#{classFee},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherClassFee">
+		UPDATE teacher_class_fee
+		<set>
+			<if test="jobType != null">
+				job_type_ = #{jobType},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="classGroupId != null">
+				class_group_id_ = #{classGroupId},
+			</if>
+			<if test="teacherId != null">
+				teacher_id_ = #{teacherId},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="classFee != null">
+				class_fee_ = #{classFee},
+			</if>
+			<if test="musicGroupId != null">
+				music_group_id_ = #{musicGroupId},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM teacher_class_fee WHERE id_ =
+		#{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="TeacherClassFee"
+		parameterType="map">
+		SELECT * FROM teacher_class_fee ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		teacher_class_fee
+	</select>
+</mapper>