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

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

@@ -1,8 +1,8 @@
 package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity;
 import com.ym.mec.web.dal.entity.StudentAttendance;
-import com.ym.mec.web.dal.utilEntity.StudentStatusCountUtilEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.utilEntity;
+package com.ym.mec.web.dal.dto;
 
 import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -4,6 +4,8 @@ import com.ym.mec.web.dal.enums.KitGroupPurchaseTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(charge_type_subject_mapper):
  */
@@ -32,11 +34,11 @@ public class ChargeTypeSubjectMapper {
 
 	/**  */
 	@ApiModelProperty(value = "乐器押金",required = false)
-	private Integer depositFee;
+	private BigDecimal depositFee;
 
 	/**  */
 	@ApiModelProperty(value = "课程费用",required = false)
-	private Integer fee;
+	private BigDecimal fee;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -86,19 +88,19 @@ public class ChargeTypeSubjectMapper {
 		this.kitGroupPurchaseTypeEnum = kitGroupPurchaseTypeEnum;
 	}
 
-	public Integer getDepositFee() {
+	public BigDecimal getDepositFee() {
 		return depositFee;
 	}
 
-	public void setDepositFee(Integer depositFee) {
+	public void setDepositFee(BigDecimal depositFee) {
 		this.depositFee = depositFee;
 	}
 
-	public Integer getFee() {
+	public BigDecimal getFee() {
 		return fee;
 	}
 
-	public void setFee(Integer fee) {
+	public void setFee(BigDecimal fee) {
 		this.fee = fee;
 	}
 

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -46,11 +47,23 @@ public class ClassGroup {
 	/** 班级类型(普通班级、合奏班级) */
 	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = false)
 	private ClassGroupTypeEnum type;
+
+	/** 班级类型(普通班级、合奏班级) */
+	@ApiModelProperty(value = "是否删除，1是 0否",required = false)
+	private YesOrNoEnum delFlag;
 	
 	/** 教师课酬 */
 	@ApiModelProperty(value = "教师课酬",required = false)
 	private long teacherSalary;
-	
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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 com.ym.mec.web.dal.enums.ClassGroupStudentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -18,10 +19,22 @@ public class ClassGroupStudentMapper {
 	/** 学生 */
 	@ApiModelProperty(value = "学生编号",required = false)
 	private Integer userId;
+
+	/** 学生 */
+	@ApiModelProperty(value = "状态（在读、请假、退学）",required = false)
+	private ClassGroupStudentStatusEnum status;
 	
 	/**  */
 	private java.util.Date createTime;
-	
+
+	public ClassGroupStudentStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(ClassGroupStudentStatusEnum status) {
+		this.status = status;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -4,6 +4,8 @@ import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(goods):
  */
@@ -47,15 +49,15 @@ public class Goods {
 	
 	/** 市场销售价 */
 	@ApiModelProperty(value = "市场销售价",required = false)
-	private long marketPrice;
+	private BigDecimal marketPrice;
 	
 	/** 折扣价 */
 	@ApiModelProperty(value = "折扣价",required = false)
-	private long discountPrice;
+	private BigDecimal discountPrice;
 	
 	/** 团购价 */
 	@ApiModelProperty(value = "团购价",required = false)
-	private long groupPurchasePrice;
+	private BigDecimal groupPurchasePrice;
 	
 	/** 页面简介 */
 	@ApiModelProperty(value = "页面简介",required = false)
@@ -84,13 +86,25 @@ public class Goods {
 	/** 发布时间 */
 	@ApiModelProperty(value = "发布时间",required = false)
 	private java.util.Date publishTime;
+
+	/** 发布时间 */
+	@ApiModelProperty(value = "附件商品列表编号（用逗号分开）",required = false)
+	private String complementGoodsIdList;
 	
 	/** 创建时间 */
 	private java.util.Date createTime;
 	
 	/** 修改时间 */
 	private java.util.Date updateTime;
-	
+
+	public String getComplementGoodsIdList() {
+		return complementGoodsIdList;
+	}
+
+	public void setComplementGoodsIdList(String complementGoodsIdList) {
+		this.complementGoodsIdList = complementGoodsIdList;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -162,31 +176,31 @@ public class Goods {
 	public Integer getSellCount(){
 		return this.sellCount;
 	}
-			
-	public void setMarketPrice(long marketPrice){
+
+	public BigDecimal getMarketPrice() {
+		return marketPrice;
+	}
+
+	public void setMarketPrice(BigDecimal marketPrice) {
 		this.marketPrice = marketPrice;
 	}
-	
-	public long getMarketPrice(){
-		return this.marketPrice;
+
+	public BigDecimal getDiscountPrice() {
+		return discountPrice;
 	}
-			
-	public void setDiscountPrice(long discountPrice){
+
+	public void setDiscountPrice(BigDecimal discountPrice) {
 		this.discountPrice = discountPrice;
 	}
-	
-	public long getDiscountPrice(){
-		return this.discountPrice;
+
+	public BigDecimal getGroupPurchasePrice() {
+		return groupPurchasePrice;
 	}
-			
-	public void setGroupPurchasePrice(long groupPurchasePrice){
+
+	public void setGroupPurchasePrice(BigDecimal groupPurchasePrice) {
 		this.groupPurchasePrice = groupPurchasePrice;
 	}
-	
-	public long getGroupPurchasePrice(){
-		return this.groupPurchasePrice;
-	}
-			
+
 	public void setBrief(String brief){
 		this.brief = brief;
 	}

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

@@ -1,8 +1,10 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.common.enums.BaseEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.common.enums.BaseEnum;
+import java.math.BigDecimal;
 
 /**
  * 对应数据库表(goods_order):
@@ -40,33 +42,43 @@ public class GoodsOrder {
 	private Integer userId;
 
 	/** 订单状态 */
+	@ApiModelProperty(value = "订单状态",required = false)
 	private OrderStatus status;
 
 	/** 订单总额 */
-	private long totalAmount;
+	@ApiModelProperty(value = "订单总额",required = false)
+	private BigDecimal totalAmount;
 	
 	/** 优惠金额 */
-	private long couponAmount;
+	@ApiModelProperty(value = "优惠金额",required = false)
+	private BigDecimal couponAmount;
 
 	/** 商品数量 */
+	@ApiModelProperty(value = "商品数量",required = false)
 	private Integer goodsQuantity;
 
 	/** 用户备注 */
+	@ApiModelProperty(value = "用户备注",required = false)
 	private String userNote;
 
 	/** 订单号 */
+	@ApiModelProperty(value = "订单号",required = false)
 	private String orderNo;
 
 	/** 订单来源 */
+	@ApiModelProperty(value = "订单来源",required = false)
 	private String orderSource;
 
 	/** 收货人 */
+	@ApiModelProperty(value = "收货人",required = false)
 	private Long receiverId;
 
 	/** 快递公司 */
+	@ApiModelProperty(value = "快递公司",required = false)
 	private String expressCompanyCode;
 
 	/** 快递单号 */
+	@ApiModelProperty(value = "快递单号",required = false)
 	private String expressNum;
 
 	/**  */
@@ -99,19 +111,19 @@ public class GoodsOrder {
 		return this.status;
 	}
 
-	public void setTotalAmount(long totalAmount) {
-		this.totalAmount = totalAmount;
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
 	}
 
-	public long getTotalAmount() {
-		return this.totalAmount;
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
 	}
 
-	public long getCouponAmount() {
+	public BigDecimal getCouponAmount() {
 		return couponAmount;
 	}
 
-	public void setCouponAmount(long couponAmount) {
+	public void setCouponAmount(BigDecimal couponAmount) {
 		this.couponAmount = couponAmount;
 	}
 

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

@@ -1,7 +1,10 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(goods_order_item):
  */
@@ -11,18 +14,23 @@ public class GoodsOrderItem {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "商品订单编号",required = false)
 	private Long goodsOrderId;
 	
 	/**  */
+	@ApiModelProperty(value = "备注",required = false)
 	private Integer goodsId;
 	
 	/** 市场价 */
-	private long marketPrice;
+	@ApiModelProperty(value = "市场价",required = false)
+	private BigDecimal marketPrice;
 	
 	/** 折扣价 */
-	private long discountPrice;
+	@ApiModelProperty(value = "折扣价",required = false)
+	private BigDecimal discountPrice;
 	
 	/** 商品数量 */
+	@ApiModelProperty(value = "商品数量",required = false)
 	private Integer goodsQuantity;
 	
 	/**  */
@@ -54,23 +62,23 @@ public class GoodsOrderItem {
 	public Integer getGoodsId(){
 		return this.goodsId;
 	}
-			
-	public void setMarketPrice(long marketPrice){
+
+	public BigDecimal getMarketPrice() {
+		return marketPrice;
+	}
+
+	public void setMarketPrice(BigDecimal marketPrice) {
 		this.marketPrice = marketPrice;
 	}
-	
-	public long getMarketPrice(){
-		return this.marketPrice;
+
+	public BigDecimal getDiscountPrice() {
+		return discountPrice;
 	}
-			
-	public void setDiscountPrice(long discountPrice){
+
+	public void setDiscountPrice(BigDecimal discountPrice) {
 		this.discountPrice = discountPrice;
 	}
-	
-	public long getDiscountPrice(){
-		return this.discountPrice;
-	}
-			
+
 	public void setGoodsQuantity(Integer goodsQuantity){
 		this.goodsQuantity = goodsQuantity;
 	}

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

@@ -1,9 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.common.enums.BaseEnum;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(goods_order_payment):
  */
@@ -36,36 +39,47 @@ public class GoodsOrderPayment {
 	private Long id;
 
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 
 	/**  */
+	@ApiModelProperty(value = "商品订单编号",required = false)
 	private Long goodsOrderId;
 
 	/** 支付渠道 */
+	@ApiModelProperty(value = "支付渠道",required = false)
 	private String paymentChannel;
 
 	/** 业务渠道 */
+	@ApiModelProperty(value = "业务渠道",required = false)
 	private String paymentBusinessChannel;
 
 	/** 支付账号 */
+	@ApiModelProperty(value = "支付账号",required = false)
 	private String paymentAccountNo;
 
 	/** 支付金额 */
-	private long amount;
+	@ApiModelProperty(value = "支付金额",required = false)
+	private BigDecimal amount;
 
 	/** 交易流水号 */
+	@ApiModelProperty(value = "交易流水号",required = false)
 	private String transNo;
 
 	/** 订单号 */
+	@ApiModelProperty(value = "订单号",required = false)
 	private String orderNo;
 
 	/** 支付状态 */
+	@ApiModelProperty(value = "支付状态",required = false)
 	private PayStatus payStatus;
 
 	/** 到账时间 */
+	@ApiModelProperty(value = "到账时间",required = false)
 	private java.util.Date arrivalTime;
 
 	/** 备注 */
+	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
 
 	/**  */
@@ -122,12 +136,12 @@ public class GoodsOrderPayment {
 		return this.paymentAccountNo;
 	}
 
-	public void setAmount(long amount) {
-		this.amount = amount;
+	public BigDecimal getAmount() {
+		return amount;
 	}
 
-	public long getAmount() {
-		return this.amount;
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
 	}
 
 	public void setTransNo(String transNo) {

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

@@ -80,6 +80,7 @@ public class MusicGroup {
 	private String enrollClasses;
 	
 	/** 付费方式(一次性、按月、按学期、按学年) */
+	@ApiModelProperty(value = "付费方式",required = false)
 	private PaymentMethod paymentMethod;
 	
 	public void setId(String id){

mec-web/src/main/java/com/ym/mec/web/dal/entity/MusicGroupPaymentCalender.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 MusicGroupPaymentCalender {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = false)
 	private Integer musicGroupId;
 	
 	/** 缴费月份 */
+	@ApiModelProperty(value = "缴费月份",required = false)
 	private Integer paymentMonth;
 	
 	/** 开始缴费日期 */
+	@ApiModelProperty(value = "开始缴费日期",required = false)
 	private java.util.Date startPaymentDate;
 	
 	/**  */

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

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.web.dal.enums.PaymentMethod;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_payment_entities):
  */
@@ -27,7 +29,7 @@ public class MusicGroupPaymentEntities {
 	
 	/** 金额 */
 	@ApiModelProperty(value = "金额",required = false)
-	private long amount;
+	private BigDecimal amount;
 	
 	/** 备注 */
 	@ApiModelProperty(value = "备注",required = false)
@@ -70,15 +72,15 @@ public class MusicGroupPaymentEntities {
 	public PaymentMethod getPaymentMethod(){
 		return this.paymentMethod;
 	}
-			
-	public void setAmount(long amount){
-		this.amount = amount;
+
+	public BigDecimal getAmount() {
+		return amount;
 	}
-	
-	public long getAmount(){
-		return this.amount;
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
 	}
-			
+
 	public void setMemo(String memo){
 		this.memo = memo;
 	}

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

@@ -1,7 +1,10 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_student_fee_):
  */
@@ -17,7 +20,8 @@ public class MusicGroupStudentFee {
 	private Integer userId;
 	
 	/** 课程费用 */
-	private long courseFee;
+	@ApiModelProperty(value = "课程费用",required = false)
+	private BigDecimal courseFee;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -48,15 +52,15 @@ public class MusicGroupStudentFee {
 	public Integer getUserId(){
 		return this.userId;
 	}
-			
-	public void setCourseFee(long courseFee){
-		this.courseFee = courseFee;
+
+	public BigDecimal getCourseFee() {
+		return courseFee;
 	}
-	
-	public long getCourseFee(){
-		return this.courseFee;
+
+	public void setCourseFee(BigDecimal courseFee) {
+		this.courseFee = courseFee;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -4,6 +4,7 @@ import com.ym.mec.web.dal.enums.GoodsType;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -45,7 +46,7 @@ public class MusicGroupSubjectGoodsGroup {
 	
 	/** 打包价格 */
 	@ApiModelProperty(value = "打包价格",required = false)
-	private long price;
+	private BigDecimal price;
 
 	public List<String> getGoodsName() {
 		return goodsName;
@@ -118,15 +119,15 @@ public class MusicGroupSubjectGoodsGroup {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setPrice(long price){
-		this.price = price;
+
+	public BigDecimal getPrice() {
+		return price;
 	}
-	
-	public long getPrice(){
-		return this.price;
+
+	public void setPrice(BigDecimal price) {
+		this.price = price;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -4,6 +4,8 @@ import com.ym.mec.web.dal.enums.KitGroupPurchaseTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_subject_plan):
  */
@@ -34,7 +36,7 @@ public class MusicGroupSubjectPlan {
 	
 	/** 费用 */
 	@ApiModelProperty(value = "费用",required = false)
-	private long fee;
+	private BigDecimal fee;
 
 	/** 乐器团购类型（免费、租赁、借用） */
 	@ApiModelProperty(value = "乐器团购类型（免费、租赁、借用）",required = false)
@@ -42,7 +44,7 @@ public class MusicGroupSubjectPlan {
 	
 	/** 乐器团购类型对应的费用 */
 	@ApiModelProperty(value = "乐器团购类型对应的费用",required = false)
-	private long depositFee;
+	private BigDecimal depositFee;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -97,14 +99,6 @@ public class MusicGroupSubjectPlan {
 	public Integer getApplyStudentNum(){
 		return this.applyStudentNum;
 	}
-			
-	public void setFee(long fee){
-		this.fee = fee;
-	}
-	
-	public long getFee(){
-		return this.fee;
-	}
 
 	public KitGroupPurchaseTypeEnum getKitGroupPurchaseType() {
 		return kitGroupPurchaseType;
@@ -114,11 +108,19 @@ public class MusicGroupSubjectPlan {
 		this.kitGroupPurchaseType = kitGroupPurchaseType;
 	}
 
-	public long getDepositFee() {
+	public BigDecimal getFee() {
+		return fee;
+	}
+
+	public void setFee(BigDecimal fee) {
+		this.fee = fee;
+	}
+
+	public BigDecimal getDepositFee() {
 		return depositFee;
 	}
 
-	public void setDepositFee(long depositFee) {
+	public void setDepositFee(BigDecimal depositFee) {
 		this.depositFee = depositFee;
 	}
 

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

@@ -1,7 +1,11 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.PlatformCashAccountStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(platform_cash_account):
  */
@@ -11,19 +15,24 @@ public class PlatformCashAccount {
 	private String id;
 	
 	/** 币种 */
+	@ApiModelProperty(value = "机构名称",required = false)
 	private String currency;
 	
 	/** 账户可用余额 */
-	private long balance;
+	@ApiModelProperty(value = "账户可用余额",required = false)
+	private BigDecimal balance;
 	
 	/** 冻结金额 */
-	private long frozenAmount;
+	@ApiModelProperty(value = "冻结金额",required = false)
+	private BigDecimal frozenAmount;
 	
 	/** 保证金余额 */
-	private long marginBalance;
+	@ApiModelProperty(value = "保证金余额",required = false)
+	private BigDecimal marginBalance;
 	
 	/** 账户状态(0,冻结,1,正常;-1,注销;) */
-	private Integer status;
+	@ApiModelProperty(value = "账户状态",required = false)
+	private PlatformCashAccountStatusEnum status;
 	
 	/** 创建时间 */
 	private java.util.Date createTime;
@@ -46,39 +55,39 @@ public class PlatformCashAccount {
 	public String getCurrency(){
 		return this.currency;
 	}
-			
-	public void setBalance(long balance){
-		this.balance = balance;
-	}
-	
-	public long getBalance(){
-		return this.balance;
+
+	public BigDecimal getFrozenAmount() {
+		return frozenAmount;
 	}
-			
-	public void setFrozenAmount(long frozenAmount){
+
+	public void setFrozenAmount(BigDecimal frozenAmount) {
 		this.frozenAmount = frozenAmount;
 	}
-	
-	public long getFrozenAmount(){
-		return this.frozenAmount;
+
+	public BigDecimal getMarginBalance() {
+		return marginBalance;
 	}
-			
-	public void setMarginBalance(long marginBalance){
+
+	public void setMarginBalance(BigDecimal marginBalance) {
 		this.marginBalance = marginBalance;
 	}
-	
-	public long getMarginBalance(){
-		return this.marginBalance;
+
+	public BigDecimal getBalance() {
+		return balance;
 	}
-			
-	public void setStatus(Integer status){
-		this.status = status;
+
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
 	}
-	
-	public Integer getStatus(){
-		return this.status;
+
+	public PlatformCashAccountStatusEnum getStatus() {
+		return status;
 	}
-			
+
+	public void setStatus(PlatformCashAccountStatusEnum 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/PlatformCashAccountDetail.java

@@ -1,7 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.DealStatusEnum;
+import com.ym.mec.web.dal.enums.PlatformCashAccountDetailTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(platform_cash_account_detail):
  */
@@ -11,27 +16,35 @@ public class PlatformCashAccountDetail {
 	private Long id;
 	
 	/** 用户编号 */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private String platformCashAccountId;
 	
 	/** 交易流水号 */
+	@ApiModelProperty(value = "交易流水号",required = false)
 	private String transNo;
 	
 	/** 交易类型 (RECHARGE 充值,WITHDRAW 提现,PAY_FEE 缴费,REFUNDS 退费,FILL_ACCOUNT 人工补账) */
-	private String type;
+	@ApiModelProperty(value = "交易类型",required = false)
+	private PlatformCashAccountDetailTypeEnum type;
 	
-	/** 交易状态(1,交易中;2,成功交易;-1,交易失败;) */
-	private Integer status;
+	/** 交易状态(1,交易中;2,成功交易;3,交易失败;) */
+	@ApiModelProperty(value = "交易状态",required = false)
+	private DealStatusEnum status;
 	
 	/** 交易金额 */
-	private long amount;
+	@ApiModelProperty(value = "交易金额",required = false)
+	private BigDecimal amount;
 	
 	/** 账户可用余额 */
-	private long balance;
+	@ApiModelProperty(value = "账户可用余额",required = false)
+	private BigDecimal balance;
 	
 	/** 描述 */
+	@ApiModelProperty(value = "描述",required = false)
 	private String description;
 	
 	/** 后台备注 */
+	@ApiModelProperty(value = "后台备注",required = false)
 	private String comment;
 	
 	/** 创建时间 */
@@ -63,39 +76,39 @@ public class PlatformCashAccountDetail {
 	public String getTransNo(){
 		return this.transNo;
 	}
-			
-	public void setType(String type){
+
+	public PlatformCashAccountDetailTypeEnum getType() {
+		return type;
+	}
+
+	public void setType(PlatformCashAccountDetailTypeEnum type) {
 		this.type = type;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public DealStatusEnum getStatus() {
+		return status;
 	}
-			
-	public void setStatus(Integer status){
+
+	public void setStatus(DealStatusEnum status) {
 		this.status = status;
 	}
-	
-	public Integer getStatus(){
-		return this.status;
+
+	public BigDecimal getAmount() {
+		return amount;
 	}
-			
-	public void setAmount(long amount){
+
+	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
-	
-	public long getAmount(){
-		return this.amount;
+
+	public BigDecimal getBalance() {
+		return balance;
 	}
-			
-	public void setBalance(long balance){
+
+	public void setBalance(BigDecimal balance) {
 		this.balance = balance;
 	}
-	
-	public long getBalance(){
-		return this.balance;
-	}
-			
+
 	public void setDescription(String description){
 		this.description = description;
 	}

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

@@ -1,7 +1,11 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.DealStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(student_apply_refunds):
  */
@@ -11,19 +15,24 @@ public class StudentApplyRefunds {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = true)
 	private Integer userId;
 	
 	/** 订单号 */
+	@ApiModelProperty(value = "订单号",required = true)
 	private String orderNo;
 	
 	/** 状态(1,交易中;2,成功交易;-1,交易失败;) */
-	private String status;
+	@ApiModelProperty(value = "状态",required = true)
+	private DealStatusEnum status;
 	
 	/** 预计退费金额 */
-	private long expectAmount;
+	@ApiModelProperty(value = "预计退费金额",required = true)
+	private BigDecimal expectAmount;
 	
 	/** 实际退费金额 */
-	private long actualAmount;
+	@ApiModelProperty(value = "实际退费金额",required = true)
+	private BigDecimal actualAmount;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -32,6 +41,7 @@ public class StudentApplyRefunds {
 	private java.util.Date updateTime;
 	
 	/** 原订单编号 */
+	@ApiModelProperty(value = "原订单编号",required = true)
 	private Long origPaymentOrderId;
 	
 	public void setId(Long id){
@@ -57,31 +67,31 @@ public class StudentApplyRefunds {
 	public String getOrderNo(){
 		return this.orderNo;
 	}
-			
-	public void setStatus(String status){
+
+	public DealStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(DealStatusEnum status) {
 		this.status = status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public BigDecimal getExpectAmount() {
+		return expectAmount;
 	}
-			
-	public void setExpectAmount(long expectAmount){
+
+	public void setExpectAmount(BigDecimal expectAmount) {
 		this.expectAmount = expectAmount;
 	}
-	
-	public long getExpectAmount(){
-		return this.expectAmount;
+
+	public BigDecimal getActualAmount() {
+		return actualAmount;
 	}
-			
-	public void setActualAmount(long actualAmount){
+
+	public void setActualAmount(BigDecimal actualAmount) {
 		this.actualAmount = actualAmount;
 	}
-	
-	public long getActualAmount(){
-		return this.actualAmount;
-	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -1,7 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.DealStatusEnum;
+import com.ym.mec.web.dal.enums.OrderTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(student_payment_order):
  */
@@ -11,24 +16,31 @@ public class StudentPaymentOrder {
 	private Long id;
 	
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = true)
 	private Integer userId;
 	
 	/** 订单类型(报名、续费、小课购买、其他) */
-	private String type;
+	@ApiModelProperty(value = "订单类型",required = true)
+	private OrderTypeEnum type;
 	
 	/** 预计金额 */
-	private long expectAmount;
+	@ApiModelProperty(value = "预计金额",required = true)
+	private BigDecimal expectAmount;
 	
 	/** 实际金额 */
-	private long actualAmount;
+	@ApiModelProperty(value = "实际金额",required = true)
+	private BigDecimal actualAmount;
 	
 	/** 交易流水号 */
+	@ApiModelProperty(value = "交易流水号",required = true)
 	private String transNo;
 	
 	/** 交易状态 */
-	private String status;
+	@ApiModelProperty(value = "交易状态",required = true)
+	private DealStatusEnum status;
 	
 	/** 备注 */
+	@ApiModelProperty(value = "备注",required = true)
 	private String memo;
 	
 	/**  */
@@ -38,21 +50,27 @@ public class StudentPaymentOrder {
 	private java.util.Date updateTime;
 	
 	/** 付款渠道 */
+	@ApiModelProperty(value = "付款渠道",required = true)
 	private String paymentChannel;
 	
 	/** 业务渠道 */
+	@ApiModelProperty(value = "业务渠道",required = true)
 	private String paymentBusinessChannel;
 	
 	/** 付款账户 */
+	@ApiModelProperty(value = "付款账户",required = true)
 	private String paymentAccountNo;
 	
 	/** 订单号 */
+	@ApiModelProperty(value = "订单号",required = true)
 	private String orderNo;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团编号",required = true)
 	private String musicGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "课程组编号",required = true)
 	private Integer classGroupId;
 	
 	public void setId(Long id){
@@ -71,30 +89,6 @@ public class StudentPaymentOrder {
 		return this.userId;
 	}
 			
-	public void setType(String type){
-		this.type = type;
-	}
-	
-	public String getType(){
-		return this.type;
-	}
-			
-	public void setExpectAmount(long expectAmount){
-		this.expectAmount = expectAmount;
-	}
-	
-	public long getExpectAmount(){
-		return this.expectAmount;
-	}
-			
-	public void setActualAmount(long actualAmount){
-		this.actualAmount = actualAmount;
-	}
-	
-	public long getActualAmount(){
-		return this.actualAmount;
-	}
-			
 	public void setTransNo(String transNo){
 		this.transNo = transNo;
 	}
@@ -103,14 +97,6 @@ public class StudentPaymentOrder {
 		return this.transNo;
 	}
 			
-	public void setStatus(String status){
-		this.status = status;
-	}
-	
-	public String getStatus(){
-		return this.status;
-	}
-			
 	public void setMemo(String memo){
 		this.memo = memo;
 	}
@@ -182,7 +168,39 @@ public class StudentPaymentOrder {
 	public Integer getClassGroupId(){
 		return this.classGroupId;
 	}
-			
+
+	public OrderTypeEnum getType() {
+		return type;
+	}
+
+	public void setType(OrderTypeEnum type) {
+		this.type = type;
+	}
+
+	public BigDecimal getExpectAmount() {
+		return expectAmount;
+	}
+
+	public void setExpectAmount(BigDecimal expectAmount) {
+		this.expectAmount = expectAmount;
+	}
+
+	public BigDecimal getActualAmount() {
+		return actualAmount;
+	}
+
+	public void setActualAmount(BigDecimal actualAmount) {
+		this.actualAmount = actualAmount;
+	}
+
+	public DealStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(DealStatusEnum status) {
+		this.status = status;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,36 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 班级类型(普通班级、合奏班级)
+ */
+public enum ClassGroupStudentStatusEnum implements BaseEnum<String, ClassGroupStudentStatusEnum> {
+	NORMAL("NORMAL", "在读"), LEAVE("LEAVE", "请假"), QUIT("QUIT", "退学");
+
+	private String code;
+
+	private String msg;
+
+	ClassGroupStudentStatusEnum(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 String getCode() {
+		return this.code;
+	}
+}

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

@@ -0,0 +1,38 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * '交易状态(1,交易中;2,成功交易;3,交易失败;)',
+ */
+public enum DealStatusEnum implements BaseEnum<Integer, DealStatusEnum> {
+	ING(1, "交易中"),
+	SUCCESS(2, "成功交易"),
+	FALIED(3, "交易失败");
+
+	private Integer code;
+
+	private String msg;
+
+	DealStatusEnum(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public Integer getCode() {
+		return this.code;
+	}
+}

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

@@ -0,0 +1,39 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 订单类型(报名、续费、小课购买、其他)
+ */
+public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
+	APPLY("APPLY", "报名"),
+	RENEW("RENEW", "续费"),
+	ELSE("ELSE", "其他"),
+	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "小课购买");
+
+	private String code;
+
+	private String msg;
+
+	OrderTypeEnum(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 String getCode() {
+		return this.code;
+	}
+}

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

@@ -0,0 +1,40 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 交易类型 (RECHARGE 充值,WITHDRAW 提现,PAY_FEE 缴费,REFUNDS 退费,FILL_ACCOUNT 人工补账)
+ */
+public enum PlatformCashAccountDetailTypeEnum implements BaseEnum<String, PlatformCashAccountDetailTypeEnum> {
+	RECHARGE("RECHARGE", "充值"),
+	WITHDRAW("WITHDRAW", "提现"),
+	PAY_FEE("PAY_FEE", "缴费"),
+	FILL_ACCOUNT("FILL_ACCOUNT", "人工补账"),
+	REFUNDS("REFUNDS", "退费");
+
+	private String code;
+
+	private String msg;
+
+	PlatformCashAccountDetailTypeEnum(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 String getCode() {
+		return this.code;
+	}
+}

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

@@ -0,0 +1,36 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 账户状态(0,冻结,1,正常;2,注销;)
+ */
+public enum PlatformCashAccountStatusEnum implements BaseEnum<Integer, PlatformCashAccountStatusEnum> {
+	FREEZE(0, "冻结"), NORMAL(1, "正常"), LOGOUT(2, "注销");
+
+	private Integer code;
+
+	private String msg;
+
+	PlatformCashAccountStatusEnum(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public Integer getCode() {
+		return this.code;
+	}
+}

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

@@ -5,11 +5,11 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.StudentAttendanceDao;
+import com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity;
 import com.ym.mec.web.dal.entity.StudentAttendance;
 import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.web.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.web.dal.utilEntity.StudentAttendancePageInfo;
-import com.ym.mec.web.dal.utilEntity.StudentStatusCountUtilEntity;
 import com.ym.mec.web.service.StudentAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -17,9 +17,10 @@
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="teacher_salary_" property="teacherSalary"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroupId" javaType="com.ym.mec.web.dal.entity.MusicGroup" >
             <result column="name_" property="name"/>
-            <result column="status_" property="status"/>
+            <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         </association>
     </resultMap>
 
@@ -66,7 +67,7 @@
             <if test="mainTeacherId!=null">#{mainTeacherId},</if>
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
-            <if test="type!=null">#{type},</if>
+            <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
             <if test="teacherSalary!=null">#{teacherSalary}</if>
         </trim>
     </insert>

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

@@ -11,6 +11,7 @@
         <result column="class_group_id_" property="classGroupId"/>
         <result column="user_id_" property="userId"/>
         <result column="create_time_" property="createTime"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,13 +27,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroupStudentMapper" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO class_group_student_mapper (id_,class_group_id_,user_id_,create_time_)
-        VALUES(#{id},#{classGroupId},#{userId},#{createTime})
+        INSERT INTO class_group_student_mapper (id_,class_group_id_,user_id_,status_,create_time_)
+        VALUES(#{id},#{classGroupId},#{userId},#{status},now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -45,6 +41,9 @@
             <if test="classGroupId != null">
                 class_group_id_ = #{classGroupId},
             </if>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{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},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -31,13 +31,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsCategory" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},#{updateTime},#{createTime})
+        VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -28,6 +28,7 @@
         <result column="publish_time_" property="publishTime"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="complement_goods_id_list_" property="complementGoodsIdList"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -43,14 +44,9 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         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,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})
+        (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,create_time_,complement_goods_id_list_,update_time_)
+        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},#{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{publishTime},#{complementGoodsIdList},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -114,6 +110,9 @@
             <if test="publishTime != null">
                 publish_time_ = #{publishTime},
             </if>
+            <if test="complementGoodsIdList != null">
+                complement_goods_id_list_ = #{complementGoodsIdList},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -30,11 +30,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<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})
+		VALUES(#{id},#{goodsOrderId},#{goodsId},#{marketPrice},#{discountPrice},#{goodsQuantity},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -39,7 +39,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO goods_order
 		(id_,user_id_,status_,total_amount_,coupon_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},#{couponAmount},#{goodsQuantity},#{userNote},#{orderNo},#{orderSource},#{receiverId},#{expressCompanyCode},#{expressNum},#{createTime},#{updateTime})
+		VALUES(#{id},#{userId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{totalAmount},#{couponAmount},#{goodsQuantity},#{userNote},#{orderNo},#{orderSource},#{receiverId},#{expressCompanyCode},#{expressNum},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -36,11 +36,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<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})
+		VALUES(#{id},#{userId},#{goodsOrderId},#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{amount},#{transNo},#{orderNo},#{payStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{arrivalTime},#{remark},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

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

@@ -40,14 +40,9 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO music_group
         (id_,name_,organ_id_,school_id_,apply_expire_date_,improvent_classes_num_,enroll_classes_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_group_id_,class_period_,free_class_period_,create_time_,update_time_,status_,payment_expire_date_,bill_start_date_,payment_method_)
-        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{improventClassesNum},#{enrollClasses},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{improventClassesNum},#{enrollClasses},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},now(),now(),#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -29,21 +29,14 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities" 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_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_) VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},#{createTime},#{updateTime})
+		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
+		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now())
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities">
 		UPDATE music_group_payment_entities
 		<set>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
 			</if>
@@ -62,9 +55,6 @@
 			<if test="name != null">
 				name_ = #{name},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

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

@@ -32,8 +32,6 @@
 	<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},NOW(),NOW(),#{price})

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

@@ -32,14 +32,9 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" 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_plan
         (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},#{createTime},#{updateTime})
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId})
+        VALUES(#{id},#{name},#{code},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -48,9 +48,6 @@
             <if test="parentOrganId != null">
                 parent_organ_id_ = #{parentOrganId},
             </if>
-            <if test="id != null">
-                id_ = #{id},
-            </if>
             <if test="code != null">
                 code_ = #{code},
             </if>
@@ -60,9 +57,6 @@
             <if test="name != null">
                 name_ = #{name},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -5,92 +5,92 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" id="PlatformCashAccountDetail">
-		<result column="id_" property="id" />
-		<result column="platform_cash_account_id_" property="platformCashAccountId" />
-		<result column="trans_no_" property="transNo" />
-		<result column="type_" property="type" />
-		<result column="status_" property="status" />
-		<result column="amount_" property="amount" />
-		<result column="balance_" property="balance" />
-		<result column="description_" property="description" />
-		<result column="comment_" property="comment" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="PlatformCashAccountDetail" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" id="PlatformCashAccountDetail">
+        <result column="id_" property="id"/>
+        <result column="platform_cash_account_id_" property="platformCashAccountId"/>
+        <result column="trans_no_" property="transNo"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="amount_" property="amount"/>
+        <result column="balance_" property="balance"/>
+        <result column="description_" property="description"/>
+        <result column="comment_" property="comment"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="PlatformCashAccountDetail">
 		SELECT * FROM platform_cash_account_detail WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="PlatformCashAccountDetail">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="PlatformCashAccountDetail">
 		SELECT * FROM platform_cash_account_detail ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO platform_cash_account_detail (id_,platform_cash_account_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_) VALUES(#{id},#{platformCashAccountId},#{transNo},#{type},#{status},#{amount},#{balance},#{description},#{comment},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail">
-		UPDATE platform_cash_account_detail <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="comment != null">
-comment_ = #{comment},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="amount != null">
-amount_ = #{amount},
-</if>
-<if test="platformCashAccountId != null">
-platform_cash_account_id_ = #{platformCashAccountId},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO platform_cash_account_detail
+        (id_,platform_cash_account_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_)
+        VALUES(#{id},#{platformCashAccountId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail">
+        UPDATE platform_cash_account_detail
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="balance != null">
+                balance_ = #{balance},
+            </if>
+            <if test="comment != null">
+                comment_ = #{comment},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="amount != null">
+                amount_ = #{amount},
+            </if>
+            <if test="platformCashAccountId != null">
+                platform_cash_account_id_ = #{platformCashAccountId},
+            </if>
+            <if test="description != null">
+                description_ = #{description},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo},
+            </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM platform_cash_account_detail WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="PlatformCashAccountDetail" parameterType="map">
-		SELECT * FROM platform_cash_account_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="PlatformCashAccountDetail" parameterType="map">
+        SELECT * FROM platform_cash_account_detail ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM platform_cash_account_detail
 	</select>
 </mapper>

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

@@ -5,80 +5,80 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccount" id="PlatformCashAccount">
-		<result column="id_" property="id" />
-		<result column="currency_" property="currency" />
-		<result column="balance_" property="balance" />
-		<result column="frozen_amount_" property="frozenAmount" />
-		<result column="margin_balance_" property="marginBalance" />
-		<result column="status_" property="status" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="PlatformCashAccount" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccount" id="PlatformCashAccount">
+        <result column="id_" property="id"/>
+        <result column="currency_" property="currency"/>
+        <result column="balance_" property="balance"/>
+        <result column="frozen_amount_" property="frozenAmount"/>
+        <result column="margin_balance_" property="marginBalance"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="PlatformCashAccount">
 		SELECT * FROM platform_cash_account WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="PlatformCashAccount">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="PlatformCashAccount">
 		SELECT * FROM platform_cash_account ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO platform_cash_account (id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time) VALUES(#{id},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount">
-		UPDATE platform_cash_account <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="updateTime != null">
-update_time = #{updateTime},
-</if>
-<if test="frozenAmount != null">
-frozen_amount_ = #{frozenAmount},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="marginBalance != null">
-margin_balance_ = #{marginBalance},
-</if>
-<if test="currency != null">
-currency_ = #{currency},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO platform_cash_account
+        (id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time)
+        VALUES(#{id},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount">
+        UPDATE platform_cash_account
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+            <if test="frozenAmount != null">
+                frozen_amount_ = #{frozenAmount},
+            </if>
+            <if test="balance != null">
+                balance_ = #{balance},
+            </if>
+            <if test="marginBalance != null">
+                margin_balance_ = #{marginBalance},
+            </if>
+            <if test="currency != null">
+                currency_ = #{currency},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM platform_cash_account WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="PlatformCashAccount" parameterType="map">
-		SELECT * FROM platform_cash_account ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="PlatformCashAccount" parameterType="map">
+        SELECT * FROM platform_cash_account ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM platform_cash_account
 	</select>
 </mapper>

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

@@ -39,7 +39,7 @@
         -->
         INSERT INTO school
         (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_,longitude_latitude_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},#{createTime},#{updateTime},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude})
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -5,84 +5,84 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.StudentApplyRefundsDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentApplyRefunds" id="StudentApplyRefunds">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="order_no_" property="orderNo" />
-		<result column="status_" property="status" />
-		<result column="expect_amount_" property="expectAmount" />
-		<result column="actual_amount_" property="actualAmount" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="orig_payment_order_id_" property="origPaymentOrderId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentApplyRefunds" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.StudentApplyRefunds" id="StudentApplyRefunds">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="order_no_" property="orderNo"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="expect_amount_" property="expectAmount"/>
+        <result column="actual_amount_" property="actualAmount"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="orig_payment_order_id_" property="origPaymentOrderId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="StudentApplyRefunds">
 		SELECT * FROM student_apply_refunds WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentApplyRefunds">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="StudentApplyRefunds">
 		SELECT * FROM student_apply_refunds ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_apply_refunds (id_,user_id_,order_no_,status_,expect_amount_,actual_amount_,create_time_,update_time_,orig_payment_order_id_) VALUES(#{id},#{userId},#{orderNo},#{status},#{expectAmount},#{actualAmount},#{createTime},#{updateTime},#{origPaymentOrderId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds">
-		UPDATE student_apply_refunds <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="expectAmount != null">
-expect_amount_ = #{expectAmount},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="origPaymentOrderId != null">
-orig_payment_order_id_ = #{origPaymentOrderId},
-</if>
-<if test="actualAmount != null">
-actual_amount_ = #{actualAmount},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO student_apply_refunds
+        (id_,user_id_,order_no_,status_,expect_amount_,actual_amount_,create_time_,update_time_,orig_payment_order_id_)
+        VALUES(#{id},#{userId},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},now(),now(),#{origPaymentOrderId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentApplyRefunds">
+        UPDATE student_apply_refunds
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="expectAmount != null">
+                expect_amount_ = #{expectAmount},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="origPaymentOrderId != null">
+                orig_payment_order_id_ = #{origPaymentOrderId},
+            </if>
+            <if test="actualAmount != null">
+                actual_amount_ = #{actualAmount},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM student_apply_refunds WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentApplyRefunds" parameterType="map">
-		SELECT * FROM student_apply_refunds ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="StudentApplyRefunds" parameterType="map">
+        SELECT * FROM student_apply_refunds ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_apply_refunds
 	</select>
 </mapper>

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

@@ -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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{remark})
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark})
     </insert>
 
     <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
@@ -129,7 +129,7 @@
         WHERE cgsm.class_group_id_=#{classId}
 	</select>
 
-    <select id="countStudentStatus" resultType="com.ym.mec.web.dal.utilEntity.StudentStatusCountUtilEntity">
+    <select id="countStudentStatus" resultType="com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity">
         SELECT
             status_ studentStatus,
             COUNT(user_id_) numberOfStudent