add

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

@@ -0,0 +1,59 @@
+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.service.CourseGroupService;
+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;
+
+@RequestMapping("courseGroup")
+@Api(tags = "课程组服务")
+@RestController
+public class CourseGroupController extends BaseController {
+
+    @Autowired
+    private CourseGroupService courseGroupService;
+
+    @ApiOperation(value = "新增课程组")
+    @PostMapping("/add")
+    public Object add(CourseGroup courseGroup){
+        Date date = new Date();
+        courseGroup.setCreateTime(date);
+        courseGroup.setUpdateTime(date);
+        courseGroupService.insert(courseGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除课程组")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
+        courseGroupService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改课程组")
+    @PutMapping("/update")
+    public Object update(CourseGroup courseGroup){
+        courseGroup.setUpdateTime(new Date());
+        courseGroupService.update(courseGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据课程组编号查询课程组")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "课程组编号", required = true) @PathVariable("id") Integer id){
+        return succeed(courseGroupService.findDetailById(id));
+    }
+
+    @ApiOperation(value = "分页查询课程组")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(courseGroupService.queryPage(queryInfo));
+    }
+}

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

@@ -0,0 +1,59 @@
+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.CourseGroupDetail;
+import com.ym.mec.web.service.CourseGroupDetailService;
+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;
+
+@RequestMapping("courseGroupDetail")
+@Api(tags = "课程组详情服务")
+@RestController
+public class CourseGroupDetailController extends BaseController {
+
+    @Autowired
+    private CourseGroupDetailService courseGroupDetailService;
+
+    @ApiOperation(value = "新增课程组详情")
+    @PostMapping("/add")
+    public Object add(CourseGroupDetail courseGroupDetail){
+        Date date = new Date();
+        courseGroupDetail.setCreateTime(date);
+        courseGroupDetail.setUpdateTime(date);
+        courseGroupDetailService.insert(courseGroupDetail);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除课程组详情")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "课程组详情编号", required = true) @PathVariable("id") Integer id){
+        courseGroupDetailService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改课程组详情")
+    @PutMapping("/update")
+    public Object update(CourseGroupDetail courseGroupDetail){
+        courseGroupDetail.setUpdateTime(new Date());
+        courseGroupDetailService.update(courseGroupDetail);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据课程组详情编号查询课程组详情")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "课程组详情编号", required = true) @PathVariable("id") Integer id){
+        return succeed(courseGroupDetailService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询课程组详情")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(courseGroupDetailService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/CourseTypeController.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.CourseType;
+import com.ym.mec.web.dal.entity.Goods;
+import com.ym.mec.web.dal.page.GoodsQueryInfo;
+import com.ym.mec.web.service.CourseGroupService;
+import com.ym.mec.web.service.CourseTypeService;
+import com.ym.mec.web.service.GoodsService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("courseType")
+@Api(tags = "课程类型服务")
+@RestController
+public class CourseTypeController extends BaseController {
+
+    @Autowired
+    private CourseTypeService courseTypeService;
+
+    @ApiOperation(value = "新增课程类型")
+    @PostMapping("/add")
+    public Object add(CourseType courseType){
+        Date date = new Date();
+        courseType.setCreateTime(date);
+        courseType.setUpdateTime(date);
+        courseTypeService.insert(courseType);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除课程类型")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id){
+        courseTypeService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改课程类型")
+    @PutMapping("/update")
+    public Object update(CourseType courseType){
+        courseType.setUpdateTime(new Date());
+        courseTypeService.update(courseType);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据课程类型编号查询课程类型")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id){
+        return succeed(courseTypeService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询课程类型")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
+        return succeed(courseTypeService.queryPage(queryInfo));
+    }
+}

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

@@ -1,9 +1,18 @@
 package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
 import com.ym.mec.web.dal.entity.CourseGroup;
 
+import java.util.List;
+
 public interface CourseGroupDao extends BaseDAO<Integer, CourseGroup> {
 
-	
+
+    /**
+     * 根据课程组编号，查询课程详情
+     * @param courseGroupId
+     * @return
+     */
+    List<CourseGroupUtilEntity> findDetailById(Integer courseGroupId);
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,15 +10,19 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class ChargeType {
 
 	/**  */
+	@ApiModelProperty(value = "收费类型编号",required = false)
 	private Integer id;
 	
 	/** 名称 */
+	@ApiModelProperty(value = "收费类型名称",required = false)
 	private String name;
 	
 	/**  */
-	private String delFlag;
+	@ApiModelProperty(value = "是否删除",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/** 描述 */
+	@ApiModelProperty(value = "收费类型描述",required = false)
 	private String description;
 	
 	/**  */
@@ -40,15 +46,15 @@ public class ChargeType {
 	public String getName(){
 		return this.name;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	public void setDescription(String description){
 		this.description = description;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,9 +12,11 @@ public class ChargeTypeSubjectMapper {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "收费类型编号",required = false)
 	private Integer chargeTypeId;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private Integer subjectId;
 	
 	/**  */

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,24 +10,31 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class ClassGroup {
 
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private String subjectId;
 	
 	/** 班级名称 */
+	@ApiModelProperty(value = "班级名称",required = false)
 	private String name;
 	
 	/** 学生数 */
+	@ApiModelProperty(value = "学生数量",required = false)
 	private Integer studentNum;
 	
 	/** 助教 */
+	@ApiModelProperty(value = "助教",required = false)
 	private Integer assistantTeacherId;
 	
 	/** 主教 */
+	@ApiModelProperty(value = "主教",required = false)
 	private Integer mainTeacherId;
 	
 	/**  */
@@ -35,9 +44,11 @@ public class ClassGroup {
 	private java.util.Date updateTime;
 	
 	/** 班级类型(普通班级、合奏班级) */
-	private String type;
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级)",required = false)
+	private ClassGroupTypeEnum type;
 	
 	/** 教师课酬 */
+	@ApiModelProperty(value = "教师课酬",required = false)
 	private long teacherSalary;
 	
 	public void setId(Integer id){
@@ -111,15 +122,15 @@ public class ClassGroup {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setType(String type){
-		this.type = type;
+
+	public ClassGroupTypeEnum getType() {
+		return type;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public void setType(ClassGroupTypeEnum type) {
+		this.type = type;
 	}
-			
+
 	public void setTeacherSalary(long teacherSalary){
 		this.teacherSalary = teacherSalary;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,6 +12,7 @@ public class ClassGroupRelation {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer classGroupId;
 	
 	/**  */

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,9 +12,11 @@ public class ClassGroupStudentMapper {
 	private Long id;
 	
 	/** 班级 */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer classGroupId;
 	
 	/** 学生 */
+	@ApiModelProperty(value = "学生编号",required = false)
 	private Integer userId;
 	
 	/**  */

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,13 +13,16 @@ public class CourseGroup {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "机构编号",required = false)
 	private Integer organId;
 	
 	/**  */
+	@ApiModelProperty(value = "课程组名称",required = false)
 	private String name;
 	
 	/**  */
-	private String delFlag;
+	@ApiModelProperty(value = "是否删除",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -48,15 +53,15 @@ public class CourseGroup {
 	public String getName(){
 		return this.name;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,22 +13,27 @@ public class CourseGroupDetail {
 	private Integer id;
 	
 	/** course_type表的id */
+	@ApiModelProperty(value = "课程类型编号",required = false)
 	private Integer courseTypeId;
 	
 	/** course_fee_type表的id */
+	@ApiModelProperty(value = "课程组编号",required = false)
 	private Integer courseGroupId;
 	
 	/** 课时（单位：分钟） */
+	@ApiModelProperty(value = "课时（单位：分钟）",required = false)
 	private Integer classPeriod;
 	
 	/** 单价 */
+	@ApiModelProperty(value = "单价",required = false)
 	private long unitPrice;
 	
 	/** 折扣单价 */
+	@ApiModelProperty(value = "折扣单价",required = false)
 	private long discountUnitPrice;
 	
 	/**  */
-	private String delFlag;
+	private YesOrNoEnum delFlag;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -81,15 +88,15 @@ public class CourseGroupDetail {
 	public long getDiscountUnitPrice(){
 		return this.discountUnitPrice;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.CourseStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,27 +13,35 @@ public class CourseSchedule {
 	private Long id;
 	
 	/** 班级编号 */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer classGroupId;
 	
 	/** 课程状态 */
-	private String status;
+	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退",required = false)
+	private CourseStatusEnum status;
 	
 	/** 补贴 */
+	@ApiModelProperty(value = "补贴",required = false)
 	private long subsidy;
 	
 	/** 上课日期 */
+	@ApiModelProperty(value = "上课日期",required = false)
 	private java.util.Date classDate;
 	
 	/** 上课时间 */
+	@ApiModelProperty(value = "上课时间",required = false)
 	private java.util.Date startClassTime;
 	
 	/** 结束时间 */
+	@ApiModelProperty(value = "结束时间",required = false)
 	private java.util.Date endClassTime;
 	
 	/** 上课教师 */
+	@ApiModelProperty(value = "上课教师",required = false)
 	private Integer teacherId;
 	
 	/** 实际上课教师 */
+	@ApiModelProperty(value = "实际上课教师",required = false)
 	private Integer actualTeacherId;
 	
 	/**  */
@@ -55,15 +65,15 @@ public class CourseSchedule {
 	public Integer getClassGroupId(){
 		return this.classGroupId;
 	}
-			
-	public void setStatus(String status){
-		this.status = status;
+
+	public CourseStatusEnum getStatus() {
+		return status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public void setStatus(CourseStatusEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setSubsidy(long subsidy){
 		this.subsidy = subsidy;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,16 +13,19 @@ public class CourseType {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "机构编号",required = false)
 	private Integer organId;
 	
 	/**  */
+	@ApiModelProperty(value = "课程类型名称",required = false)
 	private String name;
 	
 	/** 支持的课时时间（多个用|分隔） */
+	@ApiModelProperty(value = "支持的课时时间（多个用|分隔）",required = false)
 	private String supportPeriods;
 	
 	/**  */
-	private String delFlag;
+	private YesOrNoEnum delFlag;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -29,6 +34,7 @@ public class CourseType {
 	private java.util.Date updateTime;
 	
 	/**  */
+	@ApiModelProperty(value = "描述",required = false)
 	private String description;
 	
 	public void setId(Integer id){
@@ -62,15 +68,15 @@ public class CourseType {
 	public String getSupportPeriods(){
 		return this.supportPeriods;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,60 +10,79 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class Goods {
 
 	/** 商品编号 */
+	@ApiModelProperty(value = "商品编号",required = false)
 	private Integer id;
 	
 	/** 产品分类 */
+	@ApiModelProperty(value = "产品分类",required = false)
 	private Integer goodsCategoryId;
 	
 	/** 商品货号 */
+	@ApiModelProperty(value = "商品货号",required = false)
 	private String sn;
 	
 	/** 商品名称 */
+	@ApiModelProperty(value = "商品名称",required = false)
 	private String name;
 	
 	/** 品牌 */
+	@ApiModelProperty(value = "品牌",required = false)
 	private String brand;
 	
 	/** 规格 */
+	@ApiModelProperty(value = "规格",required = false)
 	private String specification;
 	
 	/** 展示图片的地址 */
+	@ApiModelProperty(value = "展示图片的地址",required = false)
 	private String image;
 	
 	/** 库存数量 */
+	@ApiModelProperty(value = "库存数量",required = false)
 	private Integer stockCount;
 	
 	/** 总销量数 */
+	@ApiModelProperty(value = "总销量数",required = false)
 	private Integer sellCount;
 	
 	/** 市场销售价 */
+	@ApiModelProperty(value = "市场销售价",required = false)
 	private long marketPrice;
 	
 	/** 折扣价 */
+	@ApiModelProperty(value = "折扣价",required = false)
 	private long discountPrice;
 	
 	/** 团购价 */
+	@ApiModelProperty(value = "团购价",required = false)
 	private long groupPurchasePrice;
 	
 	/** 页面简介 */
+	@ApiModelProperty(value = "页面简介",required = false)
 	private String brief;
 	
 	/** 商品的详细描述 */
+	@ApiModelProperty(value = "商品的详细描述",required = false)
 	private String desc;
 	
 	/** 是否是新品（1，是  0，否） */
-	private boolean isNew;
+	@ApiModelProperty(value = "是否是新品（1，是  0，否）",required = false)
+	private YesOrNoEnum isNew;
 	
 	/** 是否置顶（1，置顶   0，不置顶） */
-	private boolean isTop;
+	@ApiModelProperty(value = "是否置顶（1，置顶   0，不置顶）",required = false)
+	private YesOrNoEnum isTop;
 	
 	/** 状态（1，上架  0，下架） */
-	private boolean status;
+	@ApiModelProperty(value = "状态（1，上架  0，下架）",required = false)
+	private YesOrNoEnum status;
 	
 	/** 备注 */
+	@ApiModelProperty(value = "备注",required = false)
 	private String memo;
 	
 	/** 发布时间 */
+	@ApiModelProperty(value = "发布时间",required = false)
 	private java.util.Date publishTime;
 	
 	/** 创建时间 */
@@ -181,31 +202,31 @@ public class Goods {
 	public String getDesc(){
 		return this.desc;
 	}
-			
-	public void setIsNew(boolean isNew){
+
+	public YesOrNoEnum getIsNew() {
+		return isNew;
+	}
+
+	public void setIsNew(YesOrNoEnum isNew) {
 		this.isNew = isNew;
 	}
-	
-	public boolean isIsNew(){
-		return this.isNew;
+
+	public YesOrNoEnum getIsTop() {
+		return isTop;
 	}
-			
-	public void setIsTop(boolean isTop){
+
+	public void setIsTop(YesOrNoEnum isTop) {
 		this.isTop = isTop;
 	}
-	
-	public boolean isIsTop(){
-		return this.isTop;
+
+	public YesOrNoEnum getStatus() {
+		return status;
 	}
-			
-	public void setStatus(boolean status){
+
+	public void setStatus(YesOrNoEnum status) {
 		this.status = status;
 	}
-	
-	public boolean isStatus(){
-		return this.status;
-	}
-			
+
 	public void setMemo(String memo){
 		this.memo = memo;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,21 +13,27 @@ public class GoodsCategory {
 	private Integer id;
 	
 	/** 分类名称 */
+	@ApiModelProperty(value = "分类名称",required = false)
 	private String name;
 	
 	/** 产品展示的图片地址 */
+	@ApiModelProperty(value = "产品展示的图片地址",required = false)
 	private String img;
 	
 	/** 父节点编号 */
+	@ApiModelProperty(value = "父节点编号",required = false)
 	private Integer parentId;
 	
 	/** 顺序编号 */
+	@ApiModelProperty(value = "顺序编号",required = false)
 	private Integer orderNo;
 	
 	/** 状态（1，表示可见  0，表示不可见） */
-	private boolean status;
+	@ApiModelProperty(value = "状态（1，表示可见  0，表示不可见）",required = false)
+	private YesOrNoEnum status;
 	
 	/** 描述 */
+	@ApiModelProperty(value = "描述",required = false)
 	private String desc;
 	
 	/** 最后修改时间 */
@@ -73,15 +81,15 @@ public class GoodsCategory {
 	public Integer getOrderNo(){
 		return this.orderNo;
 	}
-			
-	public void setStatus(boolean status){
-		this.status = status;
+
+	public YesOrNoEnum getStatus() {
+		return status;
 	}
-	
-	public boolean isStatus(){
-		return this.status;
+
+	public void setStatus(YesOrNoEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setDesc(String desc){
 		this.desc = desc;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.KitGroupPurchaseTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,24 +13,31 @@ public class MusicGroupSubjectPlan {
 	private Integer id;
 	
 	/** 乐团编号 */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/** 科目编号 */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private Integer subjectId;
 	
 	/** 预计学生数 */
+	@ApiModelProperty(value = "预计学生数",required = false)
 	private Integer expectedStudentNum;
 	
 	/** 报名学生数 */
+	@ApiModelProperty(value = "报名学生数",required = false)
 	private Integer applyStudentNum;
 	
 	/** 费用 */
+	@ApiModelProperty(value = "费用",required = false)
 	private long fee;
-	
+
 	/** 乐器团购类型（免费、租赁、借用） */
-	private String kitGroupPurchaseType;
+	@ApiModelProperty(value = "乐器团购类型（免费、租赁、借用）",required = false)
+	private KitGroupPurchaseTypeEnum kitGroupPurchaseType;
 	
 	/** 乐器团购类型对应的费用 */
+	@ApiModelProperty(value = "乐器团购类型对应的费用",required = false)
 	private long kitFee;
 	
 	/**  */
@@ -84,15 +93,15 @@ public class MusicGroupSubjectPlan {
 	public long getFee(){
 		return this.fee;
 	}
-			
-	public void setKitGroupPurchaseType(String kitGroupPurchaseType){
-		this.kitGroupPurchaseType = kitGroupPurchaseType;
+
+	public KitGroupPurchaseTypeEnum getKitGroupPurchaseType() {
+		return kitGroupPurchaseType;
 	}
-	
-	public String getKitGroupPurchaseType(){
-		return this.kitGroupPurchaseType;
+
+	public void setKitGroupPurchaseType(KitGroupPurchaseTypeEnum kitGroupPurchaseType) {
+		this.kitGroupPurchaseType = kitGroupPurchaseType;
 	}
-			
+
 	public void setKitFee(long kitFee){
 		this.kitFee = kitFee;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -28,8 +29,8 @@ public class Organization {
 	private java.util.Date updateTime;
 	
 	/** 是否删除  -1：已删除  0：正常 */
-	@ApiModelProperty(value = "是否删除  -1：已删除  0：正常",required = false)
-	private String delFlag;
+	@ApiModelProperty(value = "是否删除  1：已删除  0：正常",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/** 父节点编号 */
 	@ApiModelProperty(value = "父节点编号",required = false)
@@ -85,15 +86,15 @@ public class Organization {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	public void setParentOrganId(Integer parentOrganId){
 		this.parentOrganId = parentOrganId;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -34,8 +35,8 @@ public class School {
 	private java.util.Date updateTime;
 	
 	/**  */
-	@ApiModelProperty(value = "是否删除",required = false)
-	private String delFlag;
+	@ApiModelProperty(value = "是否删除1是，0否",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/** 联系人 */
 	@ApiModelProperty(value = "联系人",required = false)
@@ -97,11 +98,11 @@ public class School {
 		return this.updateTime;
 	}
 
-	public String getDelFlag() {
+	public YesOrNoEnum getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(String delFlag) {
+	public void setDelFlag(YesOrNoEnum delFlag) {
 		this.delFlag = delFlag;
 	}
 

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,30 +13,38 @@ public class StudentAttendance {
 	private Long id;
 	
 	/** 乐团 */
+	@ApiModelProperty(value = "乐团",required = false)
 	private Integer musicGroupId;
 	
 	/** 科目 */
+	@ApiModelProperty(value = "科目",required = false)
 	private Integer subjectId;
 	
 	/** 班级 */
+	@ApiModelProperty(value = "班级",required = false)
 	private Integer classGroupId;
 	
 	/** 课程计划 */
+	@ApiModelProperty(value = "课程计划",required = false)
 	private Long courseScheduleId;
 	
 	/**  */
+	@ApiModelProperty(value = "学生编号",required = false)
 	private Integer userId;
 	
 	/** 点名的教师 */
+	@ApiModelProperty(value = "点名的教师",required = false)
 	private Integer teacherId;
 	
 	/** 状态（正常、旷课、请假） */
-	private String status;
+	@ApiModelProperty(value = "状态（正常、旷课、请假）",required = false)
+	private StudentAttendanceStatusEnum status;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/** 如果是请假状态，此字段就指请假原因 */
+	@ApiModelProperty(value = "如果是请假状态，此字段就指请假原因",required = false)
 	private String remark;
 	
 	public void setId(Long id){
@@ -92,15 +102,15 @@ public class StudentAttendance {
 	public Integer getTeacherId(){
 		return this.teacherId;
 	}
-			
-	public void setStatus(String status){
-		this.status = status;
+
+	public StudentAttendanceStatusEnum getStatus() {
+		return status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public void setStatus(StudentAttendanceStatusEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,27 +13,35 @@ public class StudentRegistration {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "学生编号",required = false)
 	private Integer userId;
 	
 	/** 所属乐团（对应 music_group 表id） */
+	@ApiModelProperty(value = "所属乐团（对应 music_group 表id）",required = false)
 	private Integer musicGroupId;
 	
 	/** 当前所在年级 */
+	@ApiModelProperty(value = "当前所在年级",required = false)
 	private String currentGrade;
 	
 	/** 当前所在班级 */
+	@ApiModelProperty(value = "当前所在班级",required = false)
 	private String currentClass;
 	
 	/** 报名科目 */
+	@ApiModelProperty(value = "报名科目",required = false)
 	private Integer subjectId;
 	
 	/** 是否允许调剂 */
-	private String isAllowAdjust;
+	@ApiModelProperty(value = "是否允许调剂",required = false)
+	private YesOrNoEnum isAllowAdjust;
 	
 	/** 器材购买方式（团购、自备） */
+	@ApiModelProperty(value = "器材购买方式（团购、自备）",required = false)
 	private String kitPurchaseMethod;
 	
 	/**  */
+	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 	
 	/**  */
@@ -41,18 +51,23 @@ public class StudentRegistration {
 	private java.util.Date updateTime;
 	
 	/** 家长姓名 */
+	@ApiModelProperty(value = "家长姓名",required = false)
 	private String parentsName;
 	
 	/** 家长单位 */
+	@ApiModelProperty(value = "家长单位",required = false)
 	private String parentsCompany;
 	
 	/** 缴费状态（1-已缴费 0-未交费） */
-	private String paymentStatus;
+	@ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）",required = false)
+	private YesOrNoEnum paymentStatus;
 	
 	/** 最后缴费日期 */
+	@ApiModelProperty(value = "最后缴费日期",required = false)
 	private java.util.Date lastPaymentDate;
 	
 	/** 预计下次缴费日期 */
+	@ApiModelProperty(value = "预计下次缴费日期",required = false)
 	private java.util.Date nextPaymentDate;
 	
 	public void setId(Long id){
@@ -102,15 +117,19 @@ public class StudentRegistration {
 	public Integer getSubjectId(){
 		return this.subjectId;
 	}
-			
-	public void setIsAllowAdjust(String isAllowAdjust){
+
+	public YesOrNoEnum getIsAllowAdjust() {
+		return isAllowAdjust;
+	}
+
+	public void setIsAllowAdjust(YesOrNoEnum isAllowAdjust) {
 		this.isAllowAdjust = isAllowAdjust;
 	}
-	
-	public String getIsAllowAdjust(){
-		return this.isAllowAdjust;
+
+	public void setPaymentStatus(YesOrNoEnum paymentStatus) {
+		this.paymentStatus = paymentStatus;
 	}
-			
+
 	public void setKitPurchaseMethod(String kitPurchaseMethod){
 		this.kitPurchaseMethod = kitPurchaseMethod;
 	}
@@ -158,15 +177,11 @@ public class StudentRegistration {
 	public String getParentsCompany(){
 		return this.parentsCompany;
 	}
-			
-	public void setPaymentStatus(String paymentStatus){
-		this.paymentStatus = paymentStatus;
-	}
-	
-	public String getPaymentStatus(){
-		return this.paymentStatus;
+
+	public YesOrNoEnum getPaymentStatus() {
+		return paymentStatus;
 	}
-			
+
 	public void setLastPaymentDate(java.util.Date lastPaymentDate){
 		this.lastPaymentDate = lastPaymentDate;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -31,7 +32,7 @@ public class Subject {
 	
 	/**  */
 	@ApiModelProperty(value = "是否删除1是，0否",required = false)
-	private String delFlag;
+	private YesOrNoEnum delFlag;
 	
 	public void setId(Integer id){
 		this.id = id;
@@ -80,15 +81,15 @@ public class Subject {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,12 +12,15 @@ public class SubjectGoodsMapper {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private String subjectId;
 	
 	/**  */
+	@ApiModelProperty(value = "商品编号",required = false)
 	private Integer goodsId;
 	
 	/**  */

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.JobNatureEnum;
 import com.ym.mec.web.dal.enums.JobTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -27,7 +28,7 @@ public class Teacher {
 	
 	/** 是否试用期 */
 	@ApiModelProperty(value = "是否试用期1是，0否",required = false)
-	private Boolean isProbationPeriod;
+	private YesOrNoEnum isProbationPeriod;
 	
 	/** 学历 */
 	@ApiModelProperty(value = "学历",required = false)
@@ -95,12 +96,12 @@ public class Teacher {
 		this.jobType = jobType;
 	}
 
-	public Boolean getProbationPeriod() {
+	public YesOrNoEnum getIsProbationPeriod() {
 		return isProbationPeriod;
 	}
 
-	public void setProbationPeriod(Boolean probationPeriod) {
-		isProbationPeriod = probationPeriod;
+	public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+		this.isProbationPeriod = isProbationPeriod;
 	}
 
 	public JobNatureEnum getJobNature() {
@@ -111,14 +112,6 @@ public class Teacher {
 		this.jobNature = jobNature;
 	}
 
-	public Boolean getIsProbationPeriod() {
-		return isProbationPeriod;
-	}
-
-	public void setIsProbationPeriod(Boolean isProbationPeriod) {
-		this.isProbationPeriod = isProbationPeriod;
-	}
-
 	public void setEducationBackground(String educationBackground){
 		this.educationBackground = educationBackground;
 	}

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

@@ -1,5 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,27 +13,35 @@ public class TeacherAttendance {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "教师编号",required = false)
 	private Integer teacherId;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private Integer subjectId;
 	
 	/**  */
+	@ApiModelProperty(value = "班级编号",required = false)
 	private Integer classGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "课程计划编号",required = false)
 	private Long courseScheduleId;
 	
 	/** 签到时间 */
+	@ApiModelProperty(value = "签到时间",required = false)
 	private java.util.Date signInTime;
 	
 	/** 状态(正常签到，异常签到) */
-	private String status;
+	@ApiModelProperty(value = "状态(1正常签到，0异常签到) ",required = false)
+	private YesOrNoEnum status;
 	
 	/** 备注 */
+	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 	
 	/**  */
@@ -92,15 +102,15 @@ public class TeacherAttendance {
 	public java.util.Date getSignInTime(){
 		return this.signInTime;
 	}
-			
-	public void setStatus(String status){
-		this.status = status;
+
+	public YesOrNoEnum getStatus() {
+		return status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public void setStatus(YesOrNoEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setRemark(String remark){
 		this.remark = remark;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,12 +12,15 @@ public class TeacherSalary {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "学员编号",required = false)
 	private Integer userId;
 	
 	/**  */
+	@ApiModelProperty(value = "科目编号",required = false)
 	private Integer subjectId;
 	
 	/** 课酬 */
+	@ApiModelProperty(value = "课酬",required = false)
 	private long salary;
 	
 	/**  */

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

@@ -0,0 +1,36 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 班级类型(普通班级、合奏班级)
+ */
+public enum ClassGroupTypeEnum implements BaseEnum {
+    COMMON("COMMON","普通班级"),
+    CONCERT("CONCERT","合奏班级");
+
+    private String code;
+
+    private String msg;
+
+    ClassGroupTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Object getCode() {
+        return this.code;
+    }}

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

@@ -0,0 +1,37 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 课程状态NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退
+ */
+public enum CourseStatusEnum implements BaseEnum {
+    NOT_START("NOT_START","未开始"),
+    SIGN_IN("SIGN_IN","已签到"),
+    SIGN_OUT("SIGN_OUT","已签退");
+
+    private String code;
+
+    private String msg;
+
+    CourseStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Object getCode() {
+        return this.code;
+    }}

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

@@ -0,0 +1,34 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+//乐器团购类型（免费、租赁、借用）
+public enum  KitGroupPurchaseTypeEnum implements BaseEnum {
+    FREE("FREE","免费"),
+    LEASE("LEASE","租赁");
+    private String code;
+
+    private String msg;
+
+    KitGroupPurchaseTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Object getCode() {
+        return this.code;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 学生考勤状态
+ */
+public enum StudentAttendanceStatusEnum implements BaseEnum {
+    NORMAL("NORMAL","正常"),
+    TRUANT("TRUANT","旷课"),
+    LEAVE("LEAVE","请假");
+
+    private String code;
+
+    private String msg;
+
+    StudentAttendanceStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Object getCode() {
+        return this.code;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/utilEntity/CourseGroupUtilEntity.java

@@ -0,0 +1,53 @@
+package com.ym.mec.web.dal.utilEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+//课程组响应实体类
+public class CourseGroupUtilEntity {
+
+    @ApiModelProperty(value = "课时（单位：分钟）",required = false)
+    private Integer classPeriod;
+
+    @ApiModelProperty(value = "折扣单价",required = false)
+    private BigDecimal discountUnitPrice;
+
+    @ApiModelProperty(value = "支持的课时时间（多个用|分隔）",required = false)
+    private String supportPeriods;
+
+    @ApiModelProperty(value = "课程类型名称",required = false)
+    private String courseTypeName;
+
+    public Integer getClassPeriod() {
+        return classPeriod;
+    }
+
+    public void setClassPeriod(Integer classPeriod) {
+        this.classPeriod = classPeriod;
+    }
+
+    public BigDecimal getDiscountUnitPrice() {
+        return discountUnitPrice;
+    }
+
+    public void setDiscountUnitPrice(BigDecimal discountUnitPrice) {
+        this.discountUnitPrice = discountUnitPrice;
+    }
+
+    public String getSupportPeriods() {
+        return supportPeriods;
+    }
+
+    public void setSupportPeriods(String supportPeriods) {
+        this.supportPeriods = supportPeriods;
+    }
+
+    public String getCourseTypeName() {
+        return courseTypeName;
+    }
+
+    public void setCourseTypeName(String courseTypeName) {
+        this.courseTypeName = courseTypeName;
+    }
+}

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

@@ -1,8 +1,17 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
 import com.ym.mec.web.dal.entity.CourseGroup;
 
+import java.util.List;
+
 public interface CourseGroupService extends BaseService<Integer, CourseGroup> {
 
+    /**
+     * 根据课程组编号，查询课程详情
+     * @param id
+     * @return
+     */
+    List<CourseGroupUtilEntity> findDetailById(Integer id);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.service.impl;
 
+import com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,8 @@ import com.ym.mec.web.dal.dao.CourseGroupDao;
 import com.ym.mec.web.dal.entity.CourseGroup;
 import com.ym.mec.web.service.CourseGroupService;
 
+import java.util.List;
+
 @Service
 public class CourseGroupServiceImpl extends BaseServiceImpl<Integer, CourseGroup>  implements CourseGroupService {
 	
@@ -19,5 +22,9 @@ public class CourseGroupServiceImpl extends BaseServiceImpl<Integer, CourseGroup
 	public BaseDAO<Integer, CourseGroup> getDAO() {
 		return courseGroupDao;
 	}
-	
+
+	@Override
+	public List<CourseGroupUtilEntity> findDetailById(Integer id) {
+		return courseGroupDao.findDetailById(id);
+	}
 }

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

@@ -9,7 +9,7 @@
     <resultMap type="com.ym.mec.web.dal.entity.ChargeType" id="ChargeType">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="description_" property="description"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -34,7 +34,7 @@
         </selectKey>
         -->
         INSERT INTO charge_type (id_,name_,del_flag_,description_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag},#{description},#{createTime},#{updateTime})
+        VALUES(#{id},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{description},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -42,7 +42,7 @@
         UPDATE charge_type
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},

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

@@ -16,7 +16,7 @@
         <result column="main_teacher_id_" property="mainTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="type_" property="type"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="teacher_salary_" property="teacherSalary"/>
     </resultMap>
 
@@ -40,7 +40,7 @@
         -->
         INSERT INTO class_group
         (id_,music_group_id_,subject_id_,name_,student_num_,assistant_teacher_id_,main_teacher_id_,create_time_,update_time_,type_,teacher_salary_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{name},#{studentNum},#{assistantTeacherId},#{mainTeacherId},#{createTime},#{updateTime},#{type},#{teacherSalary})
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{name},#{studentNum},#{assistantTeacherId},#{mainTeacherId},#{createTime},#{updateTime},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{teacherSalary})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -69,7 +69,7 @@
                 music_group_id_ = #{musicGroupId},
             </if>
             <if test="type != null">
-                type_ = #{type},
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="name != null">
                 name_ = #{name},

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

@@ -13,7 +13,7 @@
         <result column="class_period_" property="classPeriod"/>
         <result column="unit_price_" property="unitPrice"/>
         <result column="discount_unit_price_" property="discountUnitPrice"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -38,7 +38,7 @@
         -->
         INSERT INTO course_group_detail
         (id_,course_type_id_,course_group_id_,class_period_,unit_price_,discount_unit_price_,del_flag_,create_time_,update_time_)
-        VALUES(#{id},#{courseTypeId},#{courseGroupId},#{classPeriod},#{unitPrice},#{discountUnitPrice},#{delFlag},#{createTime},#{updateTime})
+        VALUES(#{id},#{courseTypeId},#{courseGroupId},#{classPeriod},#{unitPrice},#{discountUnitPrice},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -46,7 +46,7 @@
         UPDATE course_group_detail
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="courseTypeId != null">
                 course_type_id_ = #{courseTypeId},

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

@@ -10,7 +10,7 @@
         <result column="id_" property="id"/>
         <result column="organ_id_" property="organId"/>
         <result column="name_" property="name"/>
-        <result column="del_flag" property="delFlag"/>
+        <result column="del_flag" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -34,7 +34,7 @@
         </selectKey>
         -->
         INSERT INTO course_group (id_,organ_id_,name_,del_flag,create_time_,update_time_)
-        VALUES(#{id},#{organId},#{name},#{delFlag},#{createTime},#{updateTime})
+        VALUES(#{id},#{organId},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -42,7 +42,7 @@
         UPDATE course_group
         <set>
             <if test="delFlag != null">
-                del_flag = #{delFlag},
+                del_flag = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},
@@ -72,4 +72,18 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_group
 	</select>
+
+    <resultMap type="com.ym.mec.web.dal.utilEntity.CourseGroupUtilEntity" id="courseGroupUtilEntity">
+        <result column="class_period_" property="classPeriod"/>
+        <result column="course_type_name_" property="courseTypeName"/>
+        <result column="discount_unit_price_" property="discountUnitPrice"/>
+        <result column="support_periods_" property="supportPeriods"/>
+    </resultMap>
+    <select id="findDetailById" resultMap="courseGroupUtilEntity">
+        SELECT cgd.class_period_,cgd.unit_price_,cgd.discount_unit_price_,ct.name_ course_type_name_,ct.description_
+        FROM course_group cg
+        LEFT JOIN course_group_detail cgd ON cg.id_ = cgd.course_group_id_
+        LEFT JOIN course_type ct ON cgd.course_type_id_ = ct.id_
+        WHERE cg.id_ = #{courseGroupId}
+    </select>
 </mapper>

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

@@ -9,7 +9,7 @@
     <resultMap type="com.ym.mec.web.dal.entity.CourseSchedule" id="CourseSchedule">
         <result column="id_" property="id"/>
         <result column="class_group_id_" property="classGroupId"/>
-        <result column="status_" property="status"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="subsidy_" property="subsidy"/>
         <result column="class_date_" property="classDate"/>
         <result column="start_class_time_" property="startClassTime"/>
@@ -40,7 +40,7 @@
         -->
         INSERT INTO course_schedule
         (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_)
-        VALUES(#{id},#{classGroupId},#{status},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime})
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -54,7 +54,7 @@
                 end_class_time_ = #{endClassTime},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="actualTeacherId != null">
                 actual_teacher_id_ = #{actualTeacherId},

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

@@ -11,7 +11,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="name_" property="name"/>
         <result column="support_periods_" property="supportPeriods"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="description_" property="description"/>
@@ -36,7 +36,7 @@
         </selectKey>
         -->
         INSERT INTO course_type (id_,organ_id_,name_,support_periods_,del_flag_,create_time_,update_time_,description_)
-        VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag},#{createTime},#{updateTime},#{description})
+        VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime},#{description})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -44,7 +44,7 @@
         UPDATE course_type
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},

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

@@ -12,7 +12,7 @@
         <result column="img_" property="img"/>
         <result column="parent_id_" property="parentId"/>
         <result column="order_no_" property="orderNo"/>
-        <result column="status_" property="status"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="desc_" property="desc"/>
         <result column="update_time_" property="updateTime"/>
         <result column="create_time_" property="createTime"/>
@@ -37,7 +37,7 @@
         </selectKey>
         -->
         INSERT INTO goods_category (id_,name_,img_,parent_id_,order_no_,status_,desc_,update_time_,create_time_)
-        VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{status},#{desc},#{updateTime},#{createTime})
+        VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},#{updateTime},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -48,7 +48,7 @@
                 parent_id_ = #{parentId},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="orderNo != null">
                 order_no_ = #{orderNo},

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

@@ -21,9 +21,9 @@
         <result column="group_purchase_price_" property="groupPurchasePrice"/>
         <result column="brief_" property="brief"/>
         <result column="desc_" property="desc"/>
-        <result column="is_new_" property="isNew"/>
-        <result column="is_top_" property="isTop"/>
-        <result column="status_" property="status"/>
+        <result column="is_new_" property="isNew" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="is_top_" property="isTop" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="memo_" property="memo"/>
         <result column="publish_time_" property="publishTime"/>
         <result column="create_time_" property="createTime"/>
@@ -50,7 +50,7 @@
         -->
         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_,update_time_)
-        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},#{isNew},#{isTop},#{status},#{memo},#{publishTime},#{createTime},#{updateTime})
+        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},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -61,10 +61,10 @@
                 specification_ = #{specification},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="isTop != null">
-                is_top_ = #{isTop},
+                is_top_ = #{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="sn != null">
                 sn_ = #{sn},
@@ -76,7 +76,7 @@
                 memo_ = #{memo},
             </if>
             <if test="isNew != null">
-                is_new_ = #{isNew},
+                is_new_ = #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="groupPurchasePrice != null">
                 group_purchase_price_ = #{groupPurchasePrice},

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

@@ -13,7 +13,7 @@
         <result column="expected_student_num_" property="expectedStudentNum"/>
         <result column="apply_student_num_" property="applyStudentNum"/>
         <result column="fee_" property="fee"/>
-        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"/>
+        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="kit_fee_" property="kitFee"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -39,7 +39,7 @@
         -->
         INSERT INTO music_group_subject_plan
         (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,kit_fee_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType},#{kitFee},#{createTime},#{updateTime})
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitFee},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -56,7 +56,7 @@
                 fee_ = #{fee},
             </if>
             <if test="kitGroupPurchaseType != null">
-                kit_group_purchase_type_ = #{kitGroupPurchaseType},
+                kit_group_purchase_type_ = #{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},

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

@@ -12,7 +12,7 @@
         <result column="code_" property="code"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="parent_organ_id_" property="parentOrganId"/>
     </resultMap>
 
@@ -35,7 +35,7 @@
         </selectKey>
         -->
         INSERT INTO organization (id_,name_,code_,create_time_,update_time_,del_flag_,parent_organ_id_)
-        VALUES(#{id},#{name},#{code},#{createTime},#{updateTime},#{delFlag},#{parentOrganId})
+        VALUES(#{id},#{name},#{code},#{createTime},#{updateTime},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,7 +43,7 @@
         UPDATE organization
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="parentOrganId != null">
                 parent_organ_id_ = #{parentOrganId},

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

@@ -14,7 +14,7 @@
         <result column="contact_phone_" property="contactPhone"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="contact_name_" property="contactName"/>
     </resultMap>
 
@@ -38,7 +38,7 @@
         -->
         INSERT INTO school
         (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},#{createTime},#{updateTime},#{delFlag},#{contactName})
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},#{createTime},#{updateTime},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -46,7 +46,7 @@
         UPDATE school
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},

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

@@ -14,7 +14,7 @@
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="user_id_" property="userId"/>
         <result column="teacher_id_" property="teacherId"/>
-        <result column="status_" property="status"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="remark_" property="remark"/>
     </resultMap>
@@ -39,7 +39,7 @@
         -->
         INSERT INTO student_attendance
         (id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status},#{createTime},#{remark})
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{remark})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,7 +50,7 @@
                 subject_id_ = #{subjectId},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="userId != null">
                 user_id_ = #{userId},

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

@@ -13,14 +13,14 @@
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
         <result column="subject_id_" property="subjectId"/>
-        <result column="is_allow_adjust_" property="isAllowAdjust"/>
+        <result column="is_allow_adjust_" property="isAllowAdjust" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="kit_purchase_method_" property="kitPurchaseMethod"/>
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="parents_name_" property="parentsName"/>
         <result column="parents_company_" property="parentsCompany"/>
-        <result column="payment_status_" property="paymentStatus"/>
+        <result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="last_payment_date_" property="lastPaymentDate"/>
         <result column="next_payment_date_" property="nextPaymentDate"/>
     </resultMap>
@@ -45,7 +45,7 @@
         -->
         INSERT INTO student_registration
         (id_,user_id_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,last_payment_date_,next_payment_date_)
-        VALUES(#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{remark},#{createTime},#{updateTime},#{parentsName},#{parentsCompany},#{paymentStatus},#{lastPaymentDate},#{nextPaymentDate})
+        VALUES(#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitPurchaseMethod},#{remark},#{createTime},#{updateTime},#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{lastPaymentDate},#{nextPaymentDate})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -68,7 +68,7 @@
                 current_class_ = #{currentClass},
             </if>
             <if test="isAllowAdjust != null">
-                is_allow_adjust_ = #{isAllowAdjust},
+                is_allow_adjust_ = #{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="kitPurchaseMethod != null">
                 kit_purchase_method_ = #{kitPurchaseMethod},
@@ -80,7 +80,7 @@
                 remark_ = #{remark},
             </if>
             <if test="paymentStatus != null">
-                payment_status_ = #{paymentStatus},
+                payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="parentsName != null">
                 parents_name_ = #{parentsName},

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

@@ -13,7 +13,7 @@
         <result column="parent_subject_id_" property="parentSubjectId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -35,7 +35,7 @@
         </selectKey>
         -->
         INSERT INTO subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_,del_flag_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag})
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,7 +43,7 @@
         UPDATE subject
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag},
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="parentSubjectId != null">
                 parent_subject_id_ = #{parentSubjectId},

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

@@ -14,7 +14,7 @@
         <result column="class_group_id_" property="classGroupId"/>
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="sign_in_time_" property="signInTime"/>
-        <result column="status_" property="status"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
     </resultMap>
@@ -39,7 +39,7 @@
         -->
         INSERT INTO teacher_attendance
         (id_,teacher_id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
-        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status},#{remark},#{createTime})
+        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,7 +50,7 @@
                 subject_id_ = #{subjectId},
             </if>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="remark != null">
                 remark_ = #{remark},

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

@@ -11,7 +11,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="job_type_" property="jobType"/>
         <result column="job_nature_" property="jobNature"/>
-        <result column="is_probation_period_" property="isProbationPeriod"/>
+        <result column="is_probation_period_" property="isProbationPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="education_background_" property="educationBackground"/>
         <result column="graduate_school_" property="graduateSchool"/>
         <result column="technical_titles_" property="technicalTitles"/>
@@ -45,7 +45,7 @@
         -->
         INSERT INTO teacher
         (user_id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,update_time_,create_time_)
-        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
+        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -80,7 +80,7 @@
                 job_nature_ = #{jobNature},
             </if>
             <if test="isProbationPeriod != null">
-                is_probation_period_ = #{isProbationPeriod},
+                is_probation_period_ = #{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},