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

codegen/src/main/java/com/yonge/crud/CodegenApplication.java

@@ -28,7 +28,7 @@ public class CodegenApplication {
 		 */
 
 		// "src/generateConfigration.xml"
-		GenerateConfiguration genConfig = toObject("codegen/src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
+		GenerateConfiguration genConfig = toObject("src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
 
 		Configuration config = genConfig.getDbConfiguration();
 

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserLoginLog.java

@@ -7,18 +7,28 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class SysUserLoginLog {
 
+	private Long id;
+
 	/** 会员ID */
 	private Integer userId;
-	
+
 	/** 登录IP */
 	private String loginIp;
-	
+
 	/** 登录时间 */
 	private java.util.Date loginTime;
-	
+
 	/** 终端类型(0,pc端;1,人工;2,移动端;3,自动) */
 	private Integer source;
 
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}
@@ -27,30 +37,30 @@ public class SysUserLoginLog {
 		this.userId = userId;
 	}
 
-	public void setLoginIp(String loginIp){
+	public void setLoginIp(String loginIp) {
 		this.loginIp = loginIp;
 	}
-	
-	public String getLoginIp(){
+
+	public String getLoginIp() {
 		return this.loginIp;
 	}
-			
-	public void setLoginTime(java.util.Date loginTime){
+
+	public void setLoginTime(java.util.Date loginTime) {
 		this.loginTime = loginTime;
 	}
-	
-	public java.util.Date getLoginTime(){
+
+	public java.util.Date getLoginTime() {
 		return this.loginTime;
 	}
-			
-	public void setSource(Integer source){
+
+	public void setSource(Integer source) {
 		this.source = source;
 	}
-	
-	public Integer getSource(){
+
+	public Integer getSource() {
 		return this.source;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginLogMapper.xml

@@ -7,6 +7,7 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserLoginLogDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUserLoginLog" id="SysUserLoginLog">
+		<result column="id_" property="id"/>
 		<result column="user_id_" property="userId" />
 		<result column="login_ip_" property="loginIp" />
 		<result column="login_time_" property="loginTime" />
@@ -26,7 +27,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_login_log (user_id_,login_ip_,login_time_,source_) VALUES(#{userId},#{loginIp},#{loginTime},#{source})
+		INSERT INTO sys_user_login_log (id_,user_id_,login_ip_,login_time_,source_) VALUES(#{id},#{userId},#{loginIp},#{loginTime},#{source})
 	</insert>
 	
 	

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

@@ -29,6 +29,10 @@ public class OrganizationController extends BaseController {
     @ApiOperation(value = "新增机构")
     @PostMapping("/add")
     public Object add(Organization organization){
+        Organization organizationByCode = organizationService.findByCode(organization.getCode());
+        if(organizationByCode != null){
+            return failed("组织机构代码已经存在,请更改");
+        }
         Date date = new Date();
         organization.setCreateTime(date);
         organization.setUpdateTime(date);
@@ -44,6 +48,10 @@ public class OrganizationController extends BaseController {
     @ApiOperation(value = "修改机构信息")
     @PutMapping("/update")
     public Object update(Organization organization){
+        Organization organizationByCode = organizationService.findByCode(organization.getCode());
+        if(organizationByCode != null && !organizationByCode.getId().equals(organization.getId())){
+            return failed("组织机构代码已存在,请更改");
+        }
         organization.setUpdateTime(new Date());
         return succeed(organizationService.update(organization));
     }

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

@@ -21,6 +21,10 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "新增科目")
     @PostMapping("/add")
     public Object add(Subject subject){
+        Subject subjectByCode = subjectService.findByCode(subject.getCode());
+        if(subjectByCode != null){
+            return failed("科目编号已存在，请核查");
+        }
         Date date = new Date();
         subject.setCreateTime(date);
         subject.setUpdateTime(date);
@@ -38,6 +42,10 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "修改科目")
     @PutMapping("/update")
     public Object update(Subject subject){
+        Subject subjectByCode = subjectService.findByCode(subject.getCode());
+        if(subjectByCode != null && !subjectByCode.getId().equals(subject.getId())){
+            return failed("科目编号已存在，请核查");
+        }
         subject.setUpdateTime(new Date());
         subjectService.update(subject);
         return succeed();

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

@@ -9,6 +9,7 @@ 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("teacher")
@@ -21,7 +22,11 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
-    public Object add(Teacher teacher){
+    public Object add(@RequestBody Teacher teacher) {
+        Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
+        if (teacherServiceByCertificateNum != null) {
+            return failed("系统已存在该证件号的老师，请核查");
+        }
         Date date = new Date();
         teacher.setCreateTime(date);
         teacher.setUpdateTime(date);
@@ -31,14 +36,18 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "删除教师")
     @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id){
+    public Object del(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
         teacherService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改教师")
     @PutMapping("/update")
-    public Object update(Teacher teacher){
+    public Object update(Teacher teacher) {
+        Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
+        if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
+            return failed("系统已存在该证件号的老师，请核查");
+        }
         teacher.setUpdateTime(new Date());
         teacherService.update(teacher);
         return succeed();
@@ -46,13 +55,13 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "根据教师编号查询教师")
     @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id){
+    public Object get(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
         return succeed(teacherService.get(id));
     }
 
     @ApiOperation(value = "分页查询教师列表")
     @PostMapping("/queryPage")
-    public Object queryPage(TeacherQueryInfo queryInfo){
+    public Object queryPage(TeacherQueryInfo queryInfo) {
         return succeed(teacherService.queryPage(queryInfo));
     }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderDao.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.GoodsOrder;
+
+public interface GoodsOrderDao extends BaseDAO<Long, GoodsOrder> {
+
+	
+}

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderItemDao.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.GoodsOrderItem;
+
+public interface GoodsOrderItemDao extends BaseDAO<Long, GoodsOrderItem> {
+
+	
+}

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderPaymentDao.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.GoodsOrderPayment;
+
+public interface GoodsOrderPaymentDao extends BaseDAO<Long, GoodsOrderPayment> {
+
+	
+}

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectGoodsGroupDao.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.MusicGroupSubjectGoodsGroup;
+
+public interface MusicGroupSubjectGoodsGroupDao extends BaseDAO<Long, MusicGroupSubjectGoodsGroup> {
+
+	
+}

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectGoodsMapperDao.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.MusicGroupSubjectGoodsMapper;
+
+public interface MusicGroupSubjectGoodsMapperDao extends BaseDAO<Long, MusicGroupSubjectGoodsMapper> {
+
+	
+}

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

@@ -15,4 +15,11 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      * @return
      */
     List<Organization> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag);
+
+    /**
+     * 根据机构编码查机构
+     * @param code
+     * @return
+     */
+    Organization findByCode(@Param("code") int code);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.Subject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,12 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByChargeType(Integer chargeTypeId);
+
+    /**
+     * 根据科目code查科目
+     * @param code
+     * @return Subject
+     */
+    Subject findByCode(@Param("code") String code);
+
 }

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

@@ -2,8 +2,15 @@ package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.web.dal.entity.Teacher;
+import org.apache.ibatis.annotations.Param;
 
 public interface TeacherDao extends BaseDAO<Integer, Teacher> {
 
+    /**
+     * 根据证件号查询老师
+     * @param certificateNum  证件号
+     * @return Teacher 老师信息
+     */
+    Teacher findByCertificateNum(@Param("certificateNum") String certificateNum);
 	
 }

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

@@ -0,0 +1,184 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 对应数据库表(goods_order):
+ */
+public class GoodsOrder {
+
+	public enum OrderStatus implements BaseEnum<String, OrderStatus> {
+
+		NOT_PAY("NOT_PAY", "待支付"), WAIT_PAY_CONFIRM("WAIT_PAY_CONFIRM", "支付待确认"), WAIT_SHIPMENT("WAIT_SHIPMENT", "待发货"), SHIPPED("SHIPPED", "已发货"), RECEIVED(
+				"RECEIVED", "已收货"), COMPLETED("COMPLETED", "已完成"), CANCELED("CANCELED", "已取消"), FAILED("FAILED", "支付失败");
+
+		private String code;
+
+		private String desc;
+
+		private OrderStatus(String code, String desc) {
+			this.code = code;
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+	}
+
+	/**  */
+	private Long id;
+
+	/**  */
+	private Integer userId;
+
+	/** 订单状态 */
+	private OrderStatus status;
+
+	/** 订单总额 */
+	private long totalAmount;
+
+	/** 商品数量 */
+	private Integer goodsQuantity;
+
+	/** 用户备注 */
+	private String userNote;
+
+	/** 订单号 */
+	private String orderNo;
+
+	/** 订单来源 */
+	private String orderSource;
+
+	/** 收货人 */
+	private Long receiverId;
+
+	/** 快递公司 */
+	private String expressCompanyCode;
+
+	/** 快递单号 */
+	private String expressNum;
+
+	/**  */
+	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 setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setStatus(OrderStatus status) {
+		this.status = status;
+	}
+
+	public OrderStatus getStatus() {
+		return this.status;
+	}
+
+	public void setTotalAmount(long totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	public long getTotalAmount() {
+		return this.totalAmount;
+	}
+
+	public void setGoodsQuantity(Integer goodsQuantity) {
+		this.goodsQuantity = goodsQuantity;
+	}
+
+	public Integer getGoodsQuantity() {
+		return this.goodsQuantity;
+	}
+
+	public void setUserNote(String userNote) {
+		this.userNote = userNote;
+	}
+
+	public String getUserNote() {
+		return this.userNote;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getOrderNo() {
+		return this.orderNo;
+	}
+
+	public void setOrderSource(String orderSource) {
+		this.orderSource = orderSource;
+	}
+
+	public String getOrderSource() {
+		return this.orderSource;
+	}
+
+	public void setReceiverId(Long receiverId) {
+		this.receiverId = receiverId;
+	}
+
+	public Long getReceiverId() {
+		return this.receiverId;
+	}
+
+	public void setExpressCompanyCode(String expressCompanyCode) {
+		this.expressCompanyCode = expressCompanyCode;
+	}
+
+	public String getExpressCompanyCode() {
+		return this.expressCompanyCode;
+	}
+
+	public void setExpressNum(String expressNum) {
+		this.expressNum = expressNum;
+	}
+
+	public String getExpressNum() {
+		return this.expressNum;
+	}
+
+	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/GoodsOrderItem.java

@@ -0,0 +1,103 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(goods_order_item):
+ */
+public class GoodsOrderItem {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Long goodsOrderId;
+	
+	/**  */
+	private Integer goodsId;
+	
+	/** 市场价 */
+	private long marketPrice;
+	
+	/** 折扣价 */
+	private long discountPrice;
+	
+	/** 商品数量 */
+	private Integer goodsQuantity;
+	
+	/**  */
+	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 setGoodsOrderId(Long goodsOrderId){
+		this.goodsOrderId = goodsOrderId;
+	}
+	
+	public Long getGoodsOrderId(){
+		return this.goodsOrderId;
+	}
+			
+	public void setGoodsId(Integer goodsId){
+		this.goodsId = goodsId;
+	}
+	
+	public Integer getGoodsId(){
+		return this.goodsId;
+	}
+			
+	public void setMarketPrice(long marketPrice){
+		this.marketPrice = marketPrice;
+	}
+	
+	public long getMarketPrice(){
+		return this.marketPrice;
+	}
+			
+	public void setDiscountPrice(long discountPrice){
+		this.discountPrice = discountPrice;
+	}
+	
+	public long getDiscountPrice(){
+		return this.discountPrice;
+	}
+			
+	public void setGoodsQuantity(Integer goodsQuantity){
+		this.goodsQuantity = goodsQuantity;
+	}
+	
+	public Integer getGoodsQuantity(){
+		return this.goodsQuantity;
+	}
+			
+	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/GoodsOrderPayment.java

@@ -0,0 +1,194 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 对应数据库表(goods_order_payment):
+ */
+public class GoodsOrderPayment {
+
+	public enum PayStatus implements BaseEnum<String, PayStatus> {
+
+		FAILED("FAILED", "支付失败"), WAIT_PAY("WAIT_PAY", "待支付"), PAYING("PAYING", "支付中"), SUCCESSED("SUCCESSED", "支付成功");
+
+		private String code;
+
+		private String desc;
+
+		private PayStatus(String code, String desc) {
+			this.code = code;
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+	}
+
+	/**  */
+	private Long id;
+
+	/**  */
+	private Integer userId;
+
+	/**  */
+	private Long goodsOrderId;
+
+	/** 支付渠道 */
+	private String paymentChannel;
+
+	/** 业务渠道 */
+	private String paymentBusinessChannel;
+
+	/** 支付账号 */
+	private String paymentAccountNo;
+
+	/** 支付金额 */
+	private long amount;
+
+	/** 交易流水号 */
+	private String transNo;
+
+	/** 订单号 */
+	private String orderNo;
+
+	/** 支付状态 */
+	private PayStatus payStatus;
+
+	/** 到账时间 */
+	private java.util.Date arrivalTime;
+
+	/** 备注 */
+	private String remark;
+
+	/**  */
+	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 setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setGoodsOrderId(Long goodsOrderId) {
+		this.goodsOrderId = goodsOrderId;
+	}
+
+	public Long getGoodsOrderId() {
+		return this.goodsOrderId;
+	}
+
+	public void setPaymentChannel(String paymentChannel) {
+		this.paymentChannel = paymentChannel;
+	}
+
+	public String getPaymentChannel() {
+		return this.paymentChannel;
+	}
+
+	public void setPaymentBusinessChannel(String paymentBusinessChannel) {
+		this.paymentBusinessChannel = paymentBusinessChannel;
+	}
+
+	public String getPaymentBusinessChannel() {
+		return this.paymentBusinessChannel;
+	}
+
+	public void setPaymentAccountNo(String paymentAccountNo) {
+		this.paymentAccountNo = paymentAccountNo;
+	}
+
+	public String getPaymentAccountNo() {
+		return this.paymentAccountNo;
+	}
+
+	public void setAmount(long amount) {
+		this.amount = amount;
+	}
+
+	public long getAmount() {
+		return this.amount;
+	}
+
+	public void setTransNo(String transNo) {
+		this.transNo = transNo;
+	}
+
+	public String getTransNo() {
+		return this.transNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getOrderNo() {
+		return this.orderNo;
+	}
+
+	public void setPayStatus(PayStatus payStatus) {
+		this.payStatus = payStatus;
+	}
+
+	public PayStatus getPayStatus() {
+		return this.payStatus;
+	}
+
+	public void setArrivalTime(java.util.Date arrivalTime) {
+		this.arrivalTime = arrivalTime;
+	}
+
+	public java.util.Date getArrivalTime() {
+		return this.arrivalTime;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	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/MusicGroupSubjectGoodsGroup.java

@@ -0,0 +1,114 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_subject_goods_group):
+ */
+public class MusicGroupSubjectGoodsGroup {
+
+	/**  */
+	private Long id;
+	
+	/** 名称 */
+	private String name;
+	
+	/** 类型(乐器、辅件、教材) */
+	private String type;
+	
+	/**  */
+	private Integer musicGroupId;
+	
+	/**  */
+	private Integer subjectId;
+	
+	/** 商品列表(用户|分开) */
+	private String goodsIdList;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/** 打包价格 */
+	private long price;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setType(String type){
+		this.type = type;
+	}
+	
+	public String getType(){
+		return this.type;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setSubjectId(Integer subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public Integer getSubjectId(){
+		return this.subjectId;
+	}
+			
+	public void setGoodsIdList(String goodsIdList){
+		this.goodsIdList = goodsIdList;
+	}
+	
+	public String getGoodsIdList(){
+		return this.goodsIdList;
+	}
+			
+	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;
+	}
+			
+	public void setPrice(long price){
+		this.price = price;
+	}
+	
+	public long getPrice(){
+		return this.price;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,103 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_subject_goods_mapper):
+ */
+public class MusicGroupSubjectGoodsMapper {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer organId;
+	
+	/**  */
+	private Integer musicGroupId;
+	
+	/**  */
+	private String subjectId;
+	
+	/**  */
+	private Integer goodsId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/** 类型(乐器、辅件、教材) */
+	private String type;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setOrganId(Integer organId){
+		this.organId = organId;
+	}
+	
+	public Integer getOrganId(){
+		return this.organId;
+	}
+			
+	public void setMusicGroupId(Integer musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public Integer getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setSubjectId(String subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public String getSubjectId(){
+		return this.subjectId;
+	}
+			
+	public void setGoodsId(Integer goodsId){
+		this.goodsId = goodsId;
+	}
+	
+	public Integer getGoodsId(){
+		return this.goodsId;
+	}
+			
+	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;
+	}
+			
+	public void setType(String type){
+		this.type = type;
+	}
+	
+	public String getType(){
+		return this.type;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -1,8 +1,11 @@
 package com.ym.mec.web.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.web.dal.enums.GoodsType;
+
 /**
  * 对应数据库表(subject_plan_goods_mapper):
  */
@@ -10,61 +13,82 @@ public class SubjectGoodsMapper {
 
 	/**  */
 	private Long id;
-	
+
+	@ApiModelProperty(value = "组织编号", required = false)
+	private Integer organId;
+
 	/**  */
-	@ApiModelProperty(value = "科目编号",required = false)
+	@ApiModelProperty(value = "科目编号", required = false)
 	private String subjectId;
-	
+
 	/**  */
-	@ApiModelProperty(value = "商品编号",required = false)
+	@ApiModelProperty(value = "商品编号", required = false)
 	private Integer goodsId;
-	
+
+	private GoodsType type;
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
-	public void setId(Long id){
+
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setSubjectId(String subjectId){
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+
+	public void setSubjectId(String subjectId) {
 		this.subjectId = subjectId;
 	}
-	
-	public String getSubjectId(){
+
+	public String getSubjectId() {
 		return this.subjectId;
 	}
-			
-	public void setGoodsId(Integer goodsId){
+
+	public void setGoodsId(Integer goodsId) {
 		this.goodsId = goodsId;
 	}
-	
-	public Integer getGoodsId(){
+
+	public Integer getGoodsId() {
 		return this.goodsId;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public GoodsType getType() {
+		return type;
+	}
+
+	public void setType(GoodsType type) {
+		this.type = type;
+	}
+
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	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/Teacher.java

@@ -13,78 +13,81 @@ public class Teacher {
 
 	/**  */
 	private Integer userId;
-	
+
 	/**  */
-	@ApiModelProperty(value = "机构编号",required = false)
+	@ApiModelProperty(value = "机构编号", required = false)
 	private Integer organId;
-	
+
 	/** 职务类型（指导老师、教务老师、教学主管） */
-	@ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）",required = false)
+	@ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）", required = false)
 	private JobTypeEnum jobType;
-	
+
 	/** 工作性质（兼职、全职） */
-	@ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）",required = false)
+	@ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）", required = false)
 	private JobNatureEnum jobNature;
-	
+
 	/** 是否试用期 */
-	@ApiModelProperty(value = "是否试用期1是，0否",required = false)
+	@ApiModelProperty(value = "是否试用期1是，0否", required = false)
 	private YesOrNoEnum isProbationPeriod;
-	
+
 	/** 学历 */
-	@ApiModelProperty(value = "学历",required = false)
+	@ApiModelProperty(value = "学历", required = false)
 	private String educationBackground;
-	
+
 	/** 毕业学校 */
-	@ApiModelProperty(value = "毕业学校",required = false)
+	@ApiModelProperty(value = "毕业学校", required = false)
 	private String graduateSchool;
-	
+
 	/** 技术职称 */
-	@ApiModelProperty(value = "技术职称",required = false)
+	@ApiModelProperty(value = "技术职称", required = false)
 	private String technicalTitles;
-	
+
 	/** 工作单位 */
-	@ApiModelProperty(value = "工作单位",required = false)
+	@ApiModelProperty(value = "工作单位", required = false)
 	private String workUnit;
-	
+
 	/** 专业技能（支持多个，用|分隔），对应科目表编号 */
-	@ApiModelProperty(value = "专业技能（支持多个，用|分隔），对应科目表编号",required = false)
+	@ApiModelProperty(value = "专业技能（支持多个，用|分隔），对应科目表编号", required = false)
 	private String subjectId;
-	
+
 	/** 入职时间 */
-	@ApiModelProperty(value = "入职时间",required = false)
+	@ApiModelProperty(value = "入职时间", required = false)
 	private java.util.Date entryDate;
-	
+
 	/** 证件类型 */
-	@ApiModelProperty(value = "证件类型",required = false)
+	@ApiModelProperty(value = "证件类型", required = false)
 	private String certificateType;
-	
+
 	/** 证件号码 */
-	@ApiModelProperty(value = "证件号码",required = false)
+	@ApiModelProperty(value = "证件号码", required = false)
 	private String certificateNum;
-	
+
 	/** 流动范围(多个用|分开) */
-	@ApiModelProperty(value = "流动范围(多个用|分开)",required = false)
+	@ApiModelProperty(value = "流动范围(多个用|分开)", required = false)
 	private String flowOrganRange;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
-	public void setUserId(Integer userId){
+
+	@ApiModelProperty(value = "老师介绍", required = false)
+	private String introduction;
+
+	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
-	public Integer getUserId(){
+
+	public Integer getUserId() {
 		return this.userId;
 	}
-			
-	public void setOrganId(Integer organId){
+
+	public void setOrganId(Integer organId) {
 		this.organId = organId;
 	}
-	
-	public Integer getOrganId(){
+
+	public Integer getOrganId() {
 		return this.organId;
 	}
 
@@ -112,94 +115,102 @@ public class Teacher {
 		this.jobNature = jobNature;
 	}
 
-	public void setEducationBackground(String educationBackground){
+	public void setEducationBackground(String educationBackground) {
 		this.educationBackground = educationBackground;
 	}
-	
-	public String getEducationBackground(){
+
+	public String getEducationBackground() {
 		return this.educationBackground;
 	}
-			
-	public void setGraduateSchool(String graduateSchool){
+
+	public void setGraduateSchool(String graduateSchool) {
 		this.graduateSchool = graduateSchool;
 	}
-	
-	public String getGraduateSchool(){
+
+	public String getGraduateSchool() {
 		return this.graduateSchool;
 	}
-			
-	public void setTechnicalTitles(String technicalTitles){
+
+	public void setTechnicalTitles(String technicalTitles) {
 		this.technicalTitles = technicalTitles;
 	}
-	
-	public String getTechnicalTitles(){
+
+	public String getTechnicalTitles() {
 		return this.technicalTitles;
 	}
-			
-	public void setWorkUnit(String workUnit){
+
+	public void setWorkUnit(String workUnit) {
 		this.workUnit = workUnit;
 	}
-	
-	public String getWorkUnit(){
+
+	public String getWorkUnit() {
 		return this.workUnit;
 	}
-			
-	public void setSubjectId(String subjectId){
+
+	public void setSubjectId(String subjectId) {
 		this.subjectId = subjectId;
 	}
-	
-	public String getSubjectId(){
+
+	public String getSubjectId() {
 		return this.subjectId;
 	}
-			
-	public void setEntryDate(java.util.Date entryDate){
+
+	public void setEntryDate(java.util.Date entryDate) {
 		this.entryDate = entryDate;
 	}
-	
-	public java.util.Date getEntryDate(){
+
+	public java.util.Date getEntryDate() {
 		return this.entryDate;
 	}
-			
-	public void setCertificateType(String certificateType){
+
+	public void setCertificateType(String certificateType) {
 		this.certificateType = certificateType;
 	}
-	
-	public String getCertificateType(){
+
+	public String getCertificateType() {
 		return this.certificateType;
 	}
-			
-	public void setCertificateNum(String certificateNum){
+
+	public void setCertificateNum(String certificateNum) {
 		this.certificateNum = certificateNum;
 	}
-	
-	public String getCertificateNum(){
+
+	public String getCertificateNum() {
 		return this.certificateNum;
 	}
-			
-	public void setFlowOrganRange(String flowOrganRange){
+
+	public void setFlowOrganRange(String flowOrganRange) {
 		this.flowOrganRange = flowOrganRange;
 	}
-	
-	public String getFlowOrganRange(){
+
+	public String getFlowOrganRange() {
 		return this.flowOrganRange;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -5,33 +5,32 @@ import com.ym.mec.common.enums.BaseEnum;
 /**
  * 班级类型(普通班级、合奏班级)
  */
-public enum ClassGroupTypeEnum implements BaseEnum<String,ClassGroupTypeEnum> {
-    COMMON("COMMON","普通班级"),
-    CONCERT("CONCERT","合奏班级"),
-    ENHANCE("ENHANCE","提高班");
+public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班");
 
-    private String code;
+	private String code;
 
-    private String msg;
+	private String msg;
 
-    ClassGroupTypeEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
+	ClassGroupTypeEnum(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/GoodsType.java

@@ -0,0 +1,27 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum GoodsType implements BaseEnum<String, GoodsType> {
+
+	INSTRUMENT("INSTRUMENT", "乐器"), ACCESSORIES("ACCESSORIES", "辅件"), MATERIAL("MATERIAL", "教材");
+
+	private String code;
+
+	private String desc;
+
+	private GoodsType(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -4,9 +4,9 @@ import com.ym.mec.common.enums.BaseEnum;
 
 //工作性质（兼职、全职）
 public enum JobNatureEnum implements BaseEnum<String,JobNatureEnum> {
-    PART_JOB("PART_JOB","兼职"),
-    FULL_JOB("FULL_JOB","全职"),
-    TEMPORARY_JOB("TEMPORARY_JOB","零时工");
+    PART_TIME("PART_TIME","兼职"),
+    FULL_TIME("FULL_TIME","全职"),
+    TEMPORARY("TEMPORARY","零时工");
 
     private String code;
 

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

@@ -8,7 +8,7 @@ public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnu
     PAY("PAY","缴费中"),
     PREPARE("PREPARE","筹备中"),
     UNDERWAY("UNDERWAY","进行中"),
-    CANCEL("CANCEL","取消");
+    CANCELED("CANCELED","取消");
 
     private String code;
     private String msg;
@@ -22,4 +22,8 @@ public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnu
     public String getCode() {
         return this.code;
     }
+
+	public String getMsg() {
+		return msg;
+	}
 }

mec-web/src/main/java/com/ym/mec/web/service/GoodsOrderItemService.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.GoodsOrderItem;
+
+public interface GoodsOrderItemService extends BaseService<Long, GoodsOrderItem> {
+
+}

mec-web/src/main/java/com/ym/mec/web/service/GoodsOrderPaymentService.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.GoodsOrderPayment;
+
+public interface GoodsOrderPaymentService extends BaseService<Long, GoodsOrderPayment> {
+
+}

mec-web/src/main/java/com/ym/mec/web/service/GoodsOrderService.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.GoodsOrder;
+
+public interface GoodsOrderService extends BaseService<Long, GoodsOrder> {
+
+}

mec-web/src/main/java/com/ym/mec/web/service/MusicGroupSubjectGoodsGroupService.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.MusicGroupSubjectGoodsGroup;
+
+public interface MusicGroupSubjectGoodsGroupService extends BaseService<Long, MusicGroupSubjectGoodsGroup> {
+
+}

mec-web/src/main/java/com/ym/mec/web/service/MusicGroupSubjectGoodsMapperService.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.MusicGroupSubjectGoodsMapper;
+
+public interface MusicGroupSubjectGoodsMapperService extends BaseService<Long, MusicGroupSubjectGoodsMapper> {
+
+}

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

@@ -4,6 +4,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Organization;
 import com.ym.mec.web.dal.page.OrganizationQueryInfo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,12 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      */
     PageInfo<Organization> queryTreePage(OrganizationQueryInfo queryInfo);
 
+    /**
+     * 根据机构编码查机构
+     * @param code
+     * @return
+     */
+    Organization findByCode(@Param("code") int code);
+
+
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Subject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,12 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return
      */
     List<Subject> findSubByChargeType(Integer chargeTypeId);
+
+    /**
+     * 根据科目code查科目
+     * @param code
+     * @return
+     */
+    Subject findByCode(@Param("code") String code);
+
 }

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

@@ -2,7 +2,14 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.web.dal.entity.Teacher;
+import org.apache.ibatis.annotations.Param;
 
 public interface TeacherService extends BaseService<Integer, Teacher> {
 
+    /**
+     * 根据证件号查询老师信息
+     * @param certificateNum 证件号
+     * @return Teacher 老师信息
+     */
+    Teacher findByCertificateNum(String certificateNum);
 }

mec-web/src/main/java/com/ym/mec/web/service/impl/GoodsOrderItemServiceImpl.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.GoodsOrderItemDao;
+import com.ym.mec.web.dal.entity.GoodsOrderItem;
+import com.ym.mec.web.service.GoodsOrderItemService;
+
+@Service
+public class GoodsOrderItemServiceImpl extends BaseServiceImpl<Long, GoodsOrderItem>  implements GoodsOrderItemService {
+	
+	@Autowired
+	private GoodsOrderItemDao goodsOrderItemDao;
+
+	@Override
+	public BaseDAO<Long, GoodsOrderItem> getDAO() {
+		return goodsOrderItemDao;
+	}
+	
+}

mec-web/src/main/java/com/ym/mec/web/service/impl/GoodsOrderPaymentServiceImpl.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.GoodsOrderPaymentDao;
+import com.ym.mec.web.dal.entity.GoodsOrderPayment;
+import com.ym.mec.web.service.GoodsOrderPaymentService;
+
+@Service
+public class GoodsOrderPaymentServiceImpl extends BaseServiceImpl<Long, GoodsOrderPayment>  implements GoodsOrderPaymentService {
+	
+	@Autowired
+	private GoodsOrderPaymentDao goodsOrderPaymentDao;
+
+	@Override
+	public BaseDAO<Long, GoodsOrderPayment> getDAO() {
+		return goodsOrderPaymentDao;
+	}
+	
+}

mec-web/src/main/java/com/ym/mec/web/service/impl/GoodsOrderServiceImpl.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.GoodsOrderDao;
+import com.ym.mec.web.dal.entity.GoodsOrder;
+import com.ym.mec.web.service.GoodsOrderService;
+
+@Service
+public class GoodsOrderServiceImpl extends BaseServiceImpl<Long, GoodsOrder>  implements GoodsOrderService {
+	
+	@Autowired
+	private GoodsOrderDao goodsOrderDao;
+
+	@Override
+	public BaseDAO<Long, GoodsOrder> getDAO() {
+		return goodsOrderDao;
+	}
+	
+}

mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupSubjectGoodsGroupServiceImpl.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.MusicGroupSubjectGoodsGroupDao;
+import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.web.service.MusicGroupSubjectGoodsGroupService;
+
+@Service
+public class MusicGroupSubjectGoodsGroupServiceImpl extends BaseServiceImpl<Long, MusicGroupSubjectGoodsGroup>  implements MusicGroupSubjectGoodsGroupService {
+	
+	@Autowired
+	private MusicGroupSubjectGoodsGroupDao musicGroupSubjectGoodsGroupDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupSubjectGoodsGroup> getDAO() {
+		return musicGroupSubjectGoodsGroupDao;
+	}
+	
+}

mec-web/src/main/java/com/ym/mec/web/service/impl/MusicGroupSubjectGoodsMapperServiceImpl.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.MusicGroupSubjectGoodsMapperDao;
+import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsMapper;
+import com.ym.mec.web.service.MusicGroupSubjectGoodsMapperService;
+
+@Service
+public class MusicGroupSubjectGoodsMapperServiceImpl extends BaseServiceImpl<Long, MusicGroupSubjectGoodsMapper>  implements MusicGroupSubjectGoodsMapperService {
+	
+	@Autowired
+	private MusicGroupSubjectGoodsMapperDao musicGroupSubjectGoodsMapperDao;
+
+	@Override
+	public BaseDAO<Long, MusicGroupSubjectGoodsMapper> getDAO() {
+		return musicGroupSubjectGoodsMapperDao;
+	}
+	
+}

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

@@ -51,5 +51,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 			return org;
 	}
+
+	@Override
+	public Organization findByCode(int code){
+		return organizationDao.findByCode(code);
+	}
 	
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.service.impl;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,4 +32,10 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
 	public List<Subject> findSubByChargeType(Integer chargeTypeId) {
 		return subjectDao.findSubByChargeType(chargeTypeId);
 	}
+
+	@Override
+	public Subject findByCode(String code){
+		return subjectDao.findByCode(code);
+	}
+
 }

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

@@ -19,5 +19,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	public BaseDAO<Integer, Teacher> getDAO() {
 		return teacherDao;
 	}
-	
+
+	@Override
+	public Teacher findByCertificateNum(String certificateNum){
+		return teacherDao.findByCertificateNum(certificateNum);
+	}
+
 }

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

@@ -0,0 +1,89 @@
+<?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.GoodsOrderItemDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrderItem"
+		id="GoodsOrderItem">
+		<result column="id_" property="id" />
+		<result column="goods_order_id_" property="goodsOrderId" />
+		<result column="goods_id_" property="goodsId" />
+		<result column="market_price_" property="marketPrice" />
+		<result column="discount_price_" property="discountPrice" />
+		<result column="goods_quantity_" property="goodsQuantity" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="GoodsOrderItem">
+		SELECT * FROM
+		goods_order_item WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="GoodsOrderItem">
+		SELECT * FROM goods_order_item
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrderItem"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO goods_order_item
+		(id_,goods_order_id_,goods_id_,market_price_,discount_price_,goods_quantity_,create_time_,update_time_)
+		VALUES(#{id},#{goodsOrderId},#{goodsId},#{marketPrice},#{discountPrice},#{goodsQuantity},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrderItem">
+		UPDATE goods_order_item
+		<set>
+			<if test="goodsQuantity != null">
+				goods_quantity_ = #{goodsQuantity},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="marketPrice != null">
+				market_price_ = #{marketPrice},
+			</if>
+			<if test="discountPrice != null">
+				discount_price_ = #{discountPrice},
+			</if>
+			<if test="goodsOrderId != null">
+				goods_order_id_ = #{goodsOrderId},
+			</if>
+			<if test="goodsId != null">
+				goods_id_ = #{goodsId},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM goods_order_item WHERE id_ =
+		#{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="GoodsOrderItem" parameterType="map">
+		SELECT * FROM goods_order_item ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		goods_order_item
+	</select>
+</mapper>

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

@@ -0,0 +1,107 @@
+<?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.GoodsOrderDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrder" id="GoodsOrder">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="total_amount_" property="totalAmount" />
+		<result column="goods_quantity_" property="goodsQuantity" />
+		<result column="user_note_" property="userNote" />
+		<result column="order_no_" property="orderNo" />
+		<result column="order_source_" property="orderSource" />
+		<result column="receiver_id_" property="receiverId" />
+		<result column="express_company_code_" property="expressCompanyCode" />
+		<result column="express_num_" property="expressNum" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="GoodsOrder">
+		SELECT * FROM
+		goods_order WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="GoodsOrder">
+		SELECT * FROM goods_order ORDER
+		BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrder"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO goods_order
+		(id_,user_id_,status_,total_amount_,goods_quantity_,user_note_,order_no_,order_source_,receiver_id_,express_company_code_,express_num_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{totalAmount},#{goodsQuantity},#{userNote},#{orderNo},#{orderSource},#{receiverId},#{expressCompanyCode},#{expressNum},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrder">
+		UPDATE goods_order
+		<set>
+			<if test="status != null">
+				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="goodsQuantity != null">
+				goods_quantity_ = #{goodsQuantity},
+			</if>
+			<if test="orderNo != null">
+				order_no_ = #{orderNo},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="receiverId != null">
+				receiver_id_ = #{receiverId},
+			</if>
+			<if test="userId != null">
+				user_id_ = #{userId},
+			</if>
+			<if test="userNote != null">
+				user_note_ = #{userNote},
+			</if>
+			<if test="orderSource != null">
+				order_source_ = #{orderSource},
+			</if>
+			<if test="totalAmount != null">
+				total_amount_ = #{totalAmount},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="expressCompanyCode != null">
+				express_company_code_ = #{expressCompanyCode},
+			</if>
+			<if test="expressNum != null">
+				express_num_ = #{expressNum},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM goods_order WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="GoodsOrder" parameterType="map">
+		SELECT * FROM goods_order ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		goods_order
+	</select>
+</mapper>

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

@@ -0,0 +1,114 @@
+<?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.GoodsOrderPaymentDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrderPayment"
+		id="GoodsOrderPayment">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="goods_order_id_" property="goodsOrderId" />
+		<result column="payment_channel_" property="paymentChannel" />
+		<result column="payment_business_channel_" property="paymentBusinessChannel" />
+		<result column="payment_account_no_" property="paymentAccountNo" />
+		<result column="amount_" property="amount" />
+		<result column="trans_no_" property="transNo" />
+		<result column="order_no_" property="orderNo" />
+		<result column="pay_status_" property="payStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="arrival_time_" property="arrivalTime" />
+		<result column="remark_" property="remark" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="GoodsOrderPayment">
+		SELECT * FROM
+		goods_order_payment WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="GoodsOrderPayment">
+		SELECT * FROM goods_order_payment
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrderPayment"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO goods_order_payment
+		(id_,user_id_,goods_order_id_,payment_channel_,payment_business_channel_,payment_account_no_,amount_,trans_no_,order_no_,pay_status_,arrival_time_,remark_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{goodsOrderId},#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{amount},#{transNo},#{orderNo},#{payStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{arrivalTime},#{remark},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrderPayment">
+		UPDATE goods_order_payment
+		<set>
+			<if test="payStatus != null">
+				pay_status_ = #{payStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="orderNo != null">
+				order_no_ = #{orderNo},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="amount != null">
+				amount_ = #{amount},
+			</if>
+			<if test="arrivalTime != null">
+				arrival_time_ = #{arrivalTime},
+			</if>
+			<if test="paymentChannel != null">
+				payment_channel_ = #{paymentChannel},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+			<if test="userId != null">
+				user_id_ = #{userId},
+			</if>
+			<if test="remark != null">
+				remark_ = #{remark},
+			</if>
+			<if test="paymentAccountNo != null">
+				payment_account_no_ = #{paymentAccountNo},
+			</if>
+			<if test="paymentBusinessChannel != null">
+				payment_business_channel_ = #{paymentBusinessChannel},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="goodsOrderId != null">
+				goods_order_id_ = #{goodsOrderId},
+			</if>
+			<if test="transNo != null">
+				trans_no_ = #{transNo},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM goods_order_payment WHERE id_ =
+		#{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="GoodsOrderPayment"
+		parameterType="map">
+		SELECT * FROM goods_order_payment ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		goods_order_payment
+	</select>
+</mapper>

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

@@ -0,0 +1,96 @@
+<?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.MusicGroupSubjectGoodsGroupDao">
+
+	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup"
+		id="MusicGroupSubjectGoodsGroup">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="type_" property="type" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="subject_id_" property="subjectId" />
+		<result column="goods_id_list_" property="goodsIdList" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="price_" property="price" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupSubjectGoodsGroup">
+		SELECT
+		* FROM music_group_subject_goods_group WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupSubjectGoodsGroup">
+		SELECT * FROM
+		music_group_subject_goods_group ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert"
+		parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup"
+		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_subject_goods_group
+		(id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_)
+		VALUES(#{id},#{name},#{type},#{musicGroupId},#{subjectId},#{goodsIdList},#{createTime},#{updateTime},#{price})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update"
+		parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup">
+		UPDATE music_group_subject_goods_group
+		<set>
+			<if test="price != null">
+				price_ = #{price},
+			</if>
+			<if test="subjectId != null">
+				subject_id_ = #{subjectId},
+			</if>
+			<if test="goodsIdList != null">
+				goods_id_list_ = #{goodsIdList},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="type != null">
+				type_ = #{type},
+			</if>
+			<if test="musicGroupId != null">
+				music_group_id_ = #{musicGroupId},
+			</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 music_group_subject_goods_group
+		WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupSubjectGoodsGroup"
+		parameterType="map">
+		SELECT * FROM music_group_subject_goods_group ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		music_group_subject_goods_group
+	</select>
+</mapper>

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

@@ -0,0 +1,84 @@
+<?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.MusicGroupSubjectGoodsMapperDao">
+	
+	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsMapper" id="MusicGroupSubjectGoodsMapper">
+		<result column="id_" property="id" />
+		<result column="organ_id_" property="organId" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="subject_id_" property="subjectId" />
+		<result column="goods_id_" property="goodsId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="type_" property="type" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupSubjectGoodsMapper" >
+		SELECT * FROM music_group_subject_goods_mapper WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupSubjectGoodsMapper">
+		SELECT * FROM music_group_subject_goods_mapper ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsMapper" 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_subject_goods_mapper (id_,organ_id_,music_group_id_,subject_id_,goods_id_,create_time_,update_time_,type_) VALUES(#{id},#{organId},#{musicGroupId},#{subjectId},#{goodsId},#{createTime},#{updateTime},#{type})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsMapper">
+		UPDATE music_group_subject_goods_mapper <set>
+<if test="subjectId != null">
+subject_id_ = #{subjectId},
+</if>
+<if test="organId != null">
+organ_id_ = #{organId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="musicGroupId != null">
+music_group_id_ = #{musicGroupId},
+</if>
+<if test="type != null">
+type_ = #{type},
+</if>
+<if test="goodsId != null">
+goods_id_ = #{goodsId},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_group_subject_goods_mapper WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupSubjectGoodsMapper" parameterType="map">
+		SELECT * FROM music_group_subject_goods_mapper ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_subject_goods_mapper
+	</select>
+</mapper>

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

@@ -99,4 +99,8 @@
     <select id="findByParentId" resultMap="Organization">
         SELECT * FROM organization <include refid="queryPageSql"/>
     </select>
+
+    <select id="findByCode" resultMap="Organization">
+        SELECT * FROM organization WHERE code = #{code}
+    </select>
 </mapper>

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

@@ -8,7 +8,9 @@
 
     <resultMap type="com.ym.mec.web.dal.entity.SubjectGoodsMapper" id="SubjectGoodsMapper">
         <result column="id_" property="id"/>
+        <result column="organ_id_" property="organId"/>
         <result column="subject_id_" property="subjectId"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
         <result column="goods_id_" property="goodsId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -32,8 +34,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO subject_plan_goods_mapper (id_,subject_id_,goods_id_,create_time_,update_time_)
-        VALUES(#{id},#{subjectId},#{goodsId},#{createTime},#{updateTime})
+        INSERT INTO subject_plan_goods_mapper (id_,organ_id_,subject_id_,goods_id_,type_,create_time_,update_time_)
+        VALUES(#{id},#{organId},#{subjectId},#{goodsId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,6 +45,12 @@
             <if test="subjectId != null">
                 subject_id_ = #{subjectId},
             </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>

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

@@ -84,4 +84,9 @@
     <select id="findSubByChargeType" resultMap="Subject">
         SELECT s.* FROM charge_type_subject_mapper ctsm LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_ WHERE ctsm.charge_type_id_ = #{chargeTypeId}
     </select>
+
+    <!-- 根据科目code查科目 -->
+    <select id="findByCode" resultMap="Subject">
+        SELECT * FROM subject WHERE code = #{code}
+    </select>
 </mapper>

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

@@ -21,6 +21,7 @@
         <result column="certificate_type_" property="certificateType"/>
         <result column="certificate_num_" property="certificateNum"/>
         <result column="flow_organ_range_" property="flowOrganRange"/>
+        <result column="introduction_" property="introduction"/>
         <result column="update_time_" property="updateTime"/>
         <result column="create_time_" property="createTime"/>
     </resultMap>
@@ -44,8 +45,8 @@
         </selectKey>
         -->
         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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{updateTime},#{createTime})
+        (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_,introduction_,update_time_,create_time_)
+        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},#{updateTime},#{createTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -94,6 +95,9 @@
             <if test="workUnit != null">
                 work_unit_ = #{workUnit},
             </if>
+            <if test="introduction != null">
+                introduction_ = #{introduction},
+            </if>
         </set>
         WHERE user_id_ = #{userId}
     </update>
@@ -113,4 +117,9 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM teacher
 	</select>
+
+    <!-- 根据证件号查询老师 -->
+    <select id="findByCertificateNum" resultMap="Teacher">
+		SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum}
+	</select>
 </mapper>

mec-workflow/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec</artifactId>
+		<version>1.0</version>
+	</parent>
+	<artifactId>mec-workflow</artifactId>
+	<name>mec-workflow</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-core</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-mybatis</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-spring</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+	</dependencies>
+</project>

pom.xml

@@ -312,5 +312,6 @@
 		<module>mec-web</module>
 		<module>cms</module>
 	  <module>mec-im</module>
+    <module>mec-workflow</module>
   </modules>
 </project>