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

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

@@ -0,0 +1,59 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.MusicGroup;
+import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.web.service.MusicGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+
+@RequestMapping("musicGroup")
+@Api(tags = "乐团服务")
+@RestController
+public class MusicGroupController extends BaseController {
+
+    @Autowired
+    private MusicGroupService musicGroupService;
+
+    @ApiOperation(value = "新增乐团")
+    @PostMapping("/add")
+    public Object add(MusicGroup musicGroup){
+        Date date = new Date();
+        musicGroup.setCreateTime(date);
+        musicGroup.setUpdateTime(date);
+        musicGroupService.insert(musicGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除乐团")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") String id){
+        musicGroupService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改乐团")
+    @PutMapping("/update")
+    public Object update(MusicGroup musicGroup){
+        musicGroup.setUpdateTime(new Date());
+        musicGroupService.update(musicGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据乐团编号查询乐团")
+    @DeleteMapping("/get/{id}")
+    public Object update(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") String id){
+        return succeed(musicGroupService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询乐团列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(MusicGroupQueryInfo queryInfo){
+        return succeed(musicGroupService.queryPage(queryInfo));
+    }
+
+}

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

@@ -0,0 +1,62 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.MusicGroup;
+import com.ym.mec.web.dal.entity.School;
+import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.web.dal.page.SchoolQueryInfo;
+import com.ym.mec.web.service.MusicGroupService;
+import com.ym.mec.web.service.SchoolService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RequestMapping("school")
+@Api(tags = "学校(教学点)服务")
+@RestController
+public class SchoolController extends BaseController {
+
+    @Autowired
+    private SchoolService schoolService;
+
+    @ApiOperation(value = "新增学校")
+    @PostMapping("/add")
+    public Object add(School school){
+        Date date = new Date();
+        school.setCreateTime(date);
+        school.setUpdateTime(date);
+        schoolService.insert(school);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除学校")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
+        schoolService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改学校")
+    @PutMapping("/update")
+    public Object update(School school){
+        school.setUpdateTime(new Date());
+        schoolService.update(school);
+        return succeed();
+    }
+
+    @ApiOperation(value = "根据学校编号查询学校")
+    @DeleteMapping("/get/{id}")
+    public Object update(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
+        return succeed(schoolService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询学校列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(SchoolQueryInfo queryInfo){
+        return succeed(schoolService.queryPage(queryInfo));
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -59,7 +60,7 @@ public class MusicGroup {
 	
 	/** 状态（报名中、缴费中、筹备中、进行中、取消） */
 	@ApiModelProperty(value = "乐团状态（报名中、缴费中、筹备中、进行中、取消）",required = false)
-	private String status;
+	private MusicGroupStatusEnum status;
 	
 	/** 缴费截止日期 */
 	@ApiModelProperty(value = "乐团缴费截止日期",required = false)
@@ -172,15 +173,15 @@ public class MusicGroup {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setStatus(String status){
-		this.status = status;
+
+	public MusicGroupStatusEnum getStatus() {
+		return status;
 	}
-	
-	public String getStatus(){
-		return this.status;
+
+	public void setStatus(MusicGroupStatusEnum status) {
+		this.status = status;
 	}
-			
+
 	public void setPaymentExpireDate(java.util.Date paymentExpireDate){
 		this.paymentExpireDate = paymentExpireDate;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,15 +12,19 @@ public class School {
 	private Integer id;
 	
 	/**  */
+	@ApiModelProperty(value = "学校名称",required = false)
 	private String name;
 	
 	/**  */
+	@ApiModelProperty(value = "所属机构编号",required = false)
 	private Integer organId;
 	
 	/**  */
+	@ApiModelProperty(value = "地址",required = false)
 	private String adress;
 	
 	/**  */
+	@ApiModelProperty(value = "联系电话",required = false)
 	private String contactPhone;
 	
 	/**  */
@@ -29,9 +34,11 @@ public class School {
 	private java.util.Date updateTime;
 	
 	/**  */
+	@ApiModelProperty(value = "是否删除",required = false)
 	private String delFlag;
 	
 	/** 联系人 */
+	@ApiModelProperty(value = "联系人",required = false)
 	private String contactName;
 	
 	public void setId(Integer id){

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

@@ -0,0 +1,12 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum DelFlagEnum implements BaseEnum<String,DelFlagEnum> {
+    ;
+
+    @Override
+    public String getCode() {
+        return null;
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnum> {
+
+    APPLY("0","报名中"),
+    PAY("1","缴费中"),
+    PREPARE("2","筹备中"),
+    UNDERWAY("3","进行中"),
+    CANCEL("9","取消");
+
+    private String code;
+    private String msg;
+
+    MusicGroupStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/page/MusicGroupQueryInfo.java

@@ -0,0 +1,6 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class MusicGroupQueryInfo extends QueryInfo {
+}

mec-web/src/main/java/com/ym/mec/web/dal/page/SchoolQueryInfo.java

@@ -0,0 +1,6 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class SchoolQueryInfo extends QueryInfo {
+}

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

@@ -20,7 +20,7 @@
         <result column="free_class_period_" property="freeClassPeriod"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="status_" property="status"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="payment_expire_date_" property="paymentExpireDate"/>
         <result column="bill_start_date_" property="billStartDate"/>
     </resultMap>
@@ -45,7 +45,7 @@
         -->
         INSERT INTO music_group
         (id_,name_,organ_id_,school_id_,apply_expire_date_,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_)
-        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status},#{paymentExpireDate},#{billStartDate})
+        VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseGroupId},#{classPeriod},#{freeClassPeriod},#{createTime},#{updateTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{paymentExpireDate},#{billStartDate})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -53,7 +53,7 @@
         UPDATE music_group
         <set>
             <if test="status != null">
-                status_ = #{status},
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="organId != null">
                 organ_id_ = #{organId},