Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -8,6 +8,8 @@ import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.config.FeignConfiguration;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "auth-server", configuration = FeignConfiguration.class, fallback = SysUserFeignServiceFallback.class)
 public interface SysUserFeignService {
@@ -15,6 +17,12 @@ public interface SysUserFeignService {
 	@GetMapping(value = "query/{username}")
 	public SysUserInfo getUser(@PathVariable("username") String username);
 
+	@GetMapping(value = "user/queryUserByPhone")
+	public SysUser getUserByMobile(@RequestParam("mobile") String mobile);
+
+	@GetMapping(value = "user/add")
+	public Object addUser(@RequestBody SysUser user);
+
 	@GetMapping(value = "task/test")
 	public Object test();
 

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Component;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @Component
 public class SysUserFeignServiceFallback implements SysUserFeignService {
@@ -24,4 +25,13 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return new SysUser();
 	}
 
+	@Override
+	public SysUser getUserByMobile(String mobile) {
+		return new SysUser();
+	}
+
+	public Object addUser(SysUser user){
+		return false;
+	}
+
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MenuQueryInfo.java

@@ -3,7 +3,7 @@ package com.ym.mec.auth.api.dto;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
-public class MenuQueryInfo extends QueryInfo {
+public class MenuQueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
     private Integer parentId = 0;
 

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

@@ -41,11 +41,9 @@ public class SysUser {
 	private Integer organId;
 
 	/** 创建时间 */
-//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date createTime;
 
 	/** 修改时间 */
-//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date updateTime;
 
 	/** 0-正常，9-锁定 */
@@ -74,7 +72,6 @@ public class SysUser {
 	@ApiModelProperty(value = "民族",required = false)
 	private String nation;
 
-//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	@ApiModelProperty(value = "生日",required = false)
 	private Date birthdate;
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysMenuDao.java

@@ -2,9 +2,11 @@ package com.ym.mec.auth.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
 
@@ -37,4 +39,18 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
      * @return
      */
     List<SysMenu> findByParentId(@Param("parentId") Integer menuId,@Param("delFlag") String delFlag,@Param("userId") Integer userId);
+
+    /**
+     * 获取所有菜单列表
+     * @param menuId
+     * @param delFlag
+     * @return
+     */
+    List<SysMenu> findList(@Param("parentId") Integer menuId,@Param("delFlag") String delFlag);
+
+    /**
+     * 批量删除菜单列表
+     * @param collect
+     */
+    void batchDel(List<Integer> collect);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -1,7 +1,9 @@
 package com.ym.mec.auth.dal.dao;
 
+import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface SysUserDao extends BaseDAO<Integer, SysUser> {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysMenuService.java

@@ -21,7 +21,7 @@ public interface SysMenuService extends BaseService<Integer, SysMenu> {
      * @param menuQueryInfo
      * @return
      */
-    PageInfo<SysMenu> findByUser(MenuQueryInfo menuQueryInfo);
+    List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo);
 
     /**
      * 根据权限标识查菜单
@@ -29,4 +29,10 @@ public interface SysMenuService extends BaseService<Integer, SysMenu> {
      * @return
      */
     SysMenu findMenuByPermission(String permission);
+
+    /**
+     * 删除菜单列表，包含所有子节点
+     * @param id
+     */
+    void recursiveDel(Integer id);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -1,24 +1,33 @@
 package com.ym.mec.auth.service.impl;
 
 import com.ym.mec.auth.api.dto.MenuQueryInfo;
-import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.common.page.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.auth.api.entity.SysMenu;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.enums.SysUserType;
+import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.auth.dal.dao.SysMenuDao;
+import com.ym.mec.auth.dal.dao.SysUserDao;
 import com.ym.mec.auth.service.SysMenuService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  implements SysMenuService {
 	
 	@Autowired
 	private SysMenuDao sysMenuDao;
+	@Autowired
+	private SysUserDao sysUserDao;
 
 	@Override
 	public BaseDAO<Integer, SysMenu> getDAO() {
@@ -31,18 +40,30 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	}
 
 	@Override
-	public PageInfo<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
-		PageInfo<SysMenu> pageInfo = queryPage(menuQueryInfo);
-		for (SysMenu menu:pageInfo.getRows()) {
+	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
+		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
+		List<SysMenu> sysMenus = null;
+		if(sysUser.getUserType() == SysUserType.SYSTEM){
+			menuQueryInfo.setUserId(null);
+			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag());
+		}else {
+			sysMenus = sysMenuDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId());
+		}
+		for (SysMenu menu:sysMenus) {
 			menu = getTree(menu,menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId());
 		}
-		return pageInfo;
+		return sysMenus;
 	}
 
 	private SysMenu getTree(SysMenu menu, String delFlag,Integer userId){
 		//得到根节点对象
 		//获取子节点list
-		List<SysMenu> sysMenus = sysMenuDao.findByParentId(menu.getId(),delFlag,userId);
+		List<SysMenu> sysMenus = null;
+		if(userId == null){
+			sysMenus = sysMenuDao.findList(menu.getId(),delFlag);
+		}else {
+			sysMenus = sysMenuDao.findByParentId(menu.getId(),delFlag,userId);
+		}
 		//如果存在子节点
 		if(sysMenus != null && sysMenus.size() > 0) {
 			//将子节点list放入父节点对象
@@ -59,4 +80,19 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	public SysMenu findMenuByPermission(String permission){
 		return sysMenuDao.findMenuByPermission(permission);
 	}
+
+	@Override
+	public void recursiveDel(Integer parentId) {
+		List<SysMenu> sysMenus = sysMenuDao.findList(parentId, "0");
+		for (SysMenu menu:sysMenus) {
+			menu = getTree(menu,"0",null);
+		}
+		List<Integer> collect = sysMenus.stream().map(sysMenu -> sysMenu.getId()).collect(Collectors.toList());
+		if(collect == null || collect.size() <= 0){
+			sysMenuDao.delete(parentId);
+			return;
+		}
+		collect.add(parentId);
+		sysMenuDao.batchDel(collect);
+	}
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -29,16 +29,14 @@ public class MenuController extends BaseController {
         if(menuByPermission != null){
             return failed("权限标识不能重复");
         }
-        Date date = new Date();
-        sysMenu.setUpdateTime(date);
-        sysMenu.setCreateTime(date);
         return succeed(sysMenuService.insert(sysMenu));
     }
 
     @ApiOperation("根据菜单id删除菜单")
     @DeleteMapping("/del/{id}")
     public Object delMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
-        return succeed(sysMenuService.delete(id));
+        sysMenuService.recursiveDel(id);
+        return succeed();
     }
 
     @ApiOperation("根据菜单id修改菜单")
@@ -67,6 +65,7 @@ public class MenuController extends BaseController {
             if(menuQueryInfo == null){
                 menuQueryInfo = new MenuQueryInfo();
             }
+
             menuQueryInfo.setUserId(user.getUserId());
             return succeed(sysMenuService.findByUser(menuQueryInfo));
         }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -59,6 +59,11 @@ public class UserController extends BaseController {
 		return failed();
 	}
 
+	@GetMapping("/queryUserByPhone")
+	public SysUser queryUserByPhone(String mobile) {
+		return sysUserService.queryByPhone(mobile);
+	}
+
 	@ApiOperation(value = "新增用户")
 	@PostMapping("/add")
 	public Object add(@RequestBody SysUser sysUser) {

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

@@ -41,8 +41,8 @@
         </selectKey>
         -->
         INSERT INTO sys_menu
-        (id_,name_,permission_,path,parent_id_,icon_,component_,sort,keep_alive_,type_,create_time_,update_time_,del_flag_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},#{createTime},#{updateTime},#{delFlag})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -87,9 +87,16 @@
     </update>
 
     <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM sys_menu WHERE id_ = #{id}
-	</delete>
+    <update id="delete">
+		UPDATE sys_menu SET del_flag_ = 1 WHERE id_ = #{id}
+	</update>
+
+    <update id="batchDel" parameterType="java.util.List">
+        UPDATE sys_menu SET del_flag_ = 1 WHERE id_ IN
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+    </update>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysMenu" parameterType="map">
@@ -97,12 +104,14 @@
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
+--         GROUP BY sm.id_
+        ORDER BY sm.sort_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(sm.id_) FROM sys_user_role sur
+        SELECT COUNT(DISTINCT sm.id_) FROM sys_user_role sur
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
@@ -124,7 +133,7 @@
 
     <!-- 根据权限标识查菜单 -->
     <select id="findMenuByPermission" resultMap="SysMenu">
-        SELECT * FROM `sys_role_menu` WHERE `permission_` = #{permission} AND sm.del_flag_ = 0
+        SELECT * FROM `sys_menu` WHERE `permission_` = #{permission} AND del_flag_ = 0
     </select>
     <sql id="queryTree">
         <where>
@@ -145,5 +154,11 @@
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
+--         GROUP BY sm.id_
+        ORDER BY sm.sort_
+    </select>
+
+    <select id="findList" resultMap="SysMenu">
+        SELECT * FROM sys_menu WHERE del_flag_ = #{delFlag} AND parent_id_ = #{parentId} ORDER BY sort_ DESC
     </select>
 </mapper>

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

@@ -34,8 +34,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,del_flag_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},#{createTime},#{updateTime},#{delFlag})
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_role WHERE id_ = #{id}
+		UPDATE sys_role SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

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

@@ -63,8 +63,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
-        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
+        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_)
+        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{nation},#{birthdate},#{email})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -128,7 +128,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_user WHERE id_ = #{id}
+		UPDATE sys_user SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-client-api/pom.xml

@@ -0,0 +1,26 @@
+<?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>
+  <groupId>com.ym</groupId>
+  <artifactId>mec-client-api</artifactId>
+  <version>1.0</version>
+  <name>mec-client-api</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

mec-client-api/src/main/java/com/ym/App.java

@@ -0,0 +1,13 @@
+package com.ym;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

mec-client-api/src/test/java/com/ym/AppTest.java

@@ -0,0 +1,38 @@
+package com.ym;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

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

@@ -22,29 +22,29 @@ public class ChargeTypeController extends BaseController {
 
     @ApiOperation(value = "新增收费类型")
     @PostMapping("/add")
-    public Object add(@RequestBody ChargeType chargeType) {
+    public Object add(ChargeType chargeType) {
         chargeTypeService.insert(chargeType);
         return succeed();
     }
 
     @ApiOperation(value = "删除收费类型")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
         chargeTypeService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改收费类型")
-    @PutMapping("/update")
-    public Object update(@RequestBody ChargeType chargeType) {
+    @PostMapping("/update")
+    public Object update(ChargeType chargeType) {
         chargeType.setUpdateTime(new Date());
         chargeTypeService.update(chargeType);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询收费类型列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(chargeTypeService.queryPage(queryInfo));
     }
 

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

@@ -6,13 +6,11 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.web.dal.dto.HighClassGroup;
 import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.web.service.ClassGroupService;
 import com.ym.mec.web.service.ClassGroupTeacherMapperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import jdk.nashorn.internal.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -54,23 +52,23 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "删除班级")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "班级编号", required = true) @PathVariable("id") Integer id) {
         classGroupService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改班级")
-    @PutMapping("/update")
-    public Object update(@RequestBody ClassGroup classGroup) {
+    @PostMapping("/update")
+    public Object update(ClassGroup classGroup) {
         classGroup.setUpdateTime(new Date());
         classGroupService.update(classGroup);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询班级列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(classGroupService.queryPage(queryInfo));
     }
 

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

@@ -22,13 +22,13 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "新增合作单位(教学点)")
     @PostMapping("/add")
-    public Object add(@RequestBody CooperationOrgan cooperationOrgan) {
+    public Object add(CooperationOrgan cooperationOrgan) {
         cooperationOrganService.insert(cooperationOrgan);
         return succeed();
     }
 
     @ApiOperation(value = "删除合作单位(教学点)")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "合作单位(教学点)编号", required = true) @PathVariable("id") Integer id) {
         cooperationOrganService.delete(id);
         return succeed();
@@ -36,21 +36,21 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "修改合作单位(教学点)")
     @PutMapping("/update")
-    public Object update(@RequestBody CooperationOrgan cooperationOrgan) {
+    public Object update(CooperationOrgan cooperationOrgan) {
         cooperationOrgan.setUpdateTime(new Date());
         cooperationOrganService.update(cooperationOrgan);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询合作单位(教学点)列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(cooperationOrganService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
     @GetMapping("/queryByOrganId")
-    public Object queryByOrganId(@RequestParam Integer organId){
+    public Object queryByOrganId(Integer organId){
         return succeed(cooperationOrganService.queryByOrganId(organId));
     }
 }

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

@@ -29,7 +29,7 @@ public class CourseScheduleController extends BaseController {
     private StudentAttendanceService studentAttendanceService;
 
     @ApiOperation(value = "排课")
-    @PutMapping("/batchAddCourseSchedule/{musicGroupID}")
+    @PostMapping("/batchAddCourseSchedule/{musicGroupID}")
     public Object batchAddCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                          @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         String s = scheduleService.batchAddCourseSchedule(courseSchedules);
@@ -41,7 +41,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "批量跟新排课")
-    @PutMapping("/batchUpdateCourseSchedule/{musicGroupID}")
+    @PostMapping("/batchUpdateCourseSchedule/{musicGroupID}")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                             @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         String s = scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);

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

@@ -1,27 +1,15 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.web.dal.entity.Subject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.GoodsCategory;
 import com.ym.mec.web.dal.page.GoodsCategoryQueryInfo;
 import com.ym.mec.web.service.GoodsCategoryService;
 import com.ym.mec.web.service.GoodsService;
+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.*;
 
 @RequestMapping("category")
 @Api(tags = "商品分类服务")
@@ -35,7 +23,7 @@ public class GoodsCategoryController extends BaseController {
     private GoodsService goodsService;
 
     @ApiOperation(value = "删除商品分类")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "商品分类编号", required = true) @PathVariable("id") Integer id) {
         int num = goodsService.findGoodsNumByCategoryId(id);
         if (num > 0) {
@@ -54,10 +42,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询商品分类列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) GoodsCategoryQueryInfo queryInfo) {
-        if(queryInfo == null){
-            queryInfo = new GoodsCategoryQueryInfo();
-        }
+    public Object queryPage(GoodsCategoryQueryInfo queryInfo) {
         return succeed(goodsCategoryService.queryPage(queryInfo));
     }
 

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

@@ -20,21 +20,21 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "新增商品(教材、辅件)")
     @PostMapping("/add")
-    public Object add(@RequestBody Goods goods){
+    public Object add(Goods goods){
         goodsService.insert(goods);
         return succeed();
     }
 
     @ApiOperation(value = "删除商品(教材、辅件)")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         goodsService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改商品(教材、辅件)")
-    @PutMapping("/update")
-    public Object update(@RequestBody Goods goods){
+    @PostMapping("/update")
+    public Object update(Goods goods){
         goods.setUpdateTime(new Date());
         goodsService.update(goods);
         return succeed();
@@ -48,10 +48,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) GoodsQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new GoodsQueryInfo();
-        }
+    public Object queryPage(GoodsQueryInfo queryInfo){
         return succeed(goodsService.queryPage(queryInfo));
     }
 

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

@@ -0,0 +1,54 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.entity.LeaveCategory;
+import com.ym.mec.web.service.LeaveCategoryService;
+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.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+@RequestMapping("leaveCategory")
+@Api(tags = "请假类型服务")
+@RestController
+public class LeaveCategoryController extends BaseController {
+
+    @Autowired
+    private LeaveCategoryService leaveCategoryService;
+
+    @ApiOperation(value = "新增请假类型")
+    @PostMapping("/add")
+    public Object add(LeaveCategory leaveCategory) {
+        leaveCategoryService.insert(leaveCategory);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除请假类型")
+    @PostMapping("/del/{id}")
+    public Object del(@ApiParam(value = "请假类型编号", required = true) @PathVariable("id") Integer id) {
+        leaveCategoryService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改请假类型")
+    @PostMapping("/update")
+    public Object update(LeaveCategory leaveCategory) {
+        leaveCategory.setUpdateTime(new Date());
+        leaveCategoryService.update(leaveCategory);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询请假类型列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(leaveCategoryService.queryPage(queryInfo));
+    }
+
+}

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

@@ -8,7 +8,6 @@ import com.ym.mec.web.service.MusicGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +21,7 @@ public class MusicGroupController extends BaseController {
     @Autowired
     private MusicGroupService musicGroupService;
 
-    @ApiOperation(value = "新增乐团")
+/*    @ApiOperation(value = "新增乐团")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroup musicGroup){
         if(musicGroup != null){
@@ -34,18 +33,18 @@ public class MusicGroupController extends BaseController {
             return succeed();
         }
         return failed();
-    }
+    }*/
 
     @ApiOperation(value = "删除乐团")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/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(@RequestBody MusicGroup musicGroup){
+    @PostMapping("/update")
+    public Object update(MusicGroup musicGroup){
         musicGroup.setUpdateTime(new Date());
         musicGroupService.update(musicGroup);
         return succeed();
@@ -58,12 +57,12 @@ public class MusicGroupController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询乐团列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody MusicGroupQueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryPage(queryInfo));
     }
 
-    @ApiOperation(value = "建团申请数据提交")
+    @ApiOperation(value = "新增乐团  建团申请数据提交")
     @PostMapping("/createGroup")
     public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
         musicGroupService.createGroup(subFeeSettingDto);

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderController.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;
 import java.util.List;
 
@@ -22,7 +23,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicGroupPaymentCalender musicGroupPaymentCalender) {
+    public Object add(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalenderService.insert(musicGroupPaymentCalender);
         return succeed();
     }
@@ -35,23 +36,23 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     }
 
     @ApiOperation(value = "删除乐团缴费日历")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团缴费日历编号", required = true) @PathVariable("id") Long id) {
         musicGroupPaymentCalenderService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改乐团缴费日历")
-    @PutMapping("/update")
-    public Object update(@RequestBody MusicGroupPaymentCalender musicGroupPaymentCalender) {
+    @PostMapping("/update")
+    public Object update(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalender.setUpdateTime(new Date());
         musicGroupPaymentCalenderService.update(musicGroupPaymentCalender);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询乐团缴费日历列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo) {
         return succeed(musicGroupPaymentCalenderService.queryPage(queryInfo));
     }
 

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

@@ -23,7 +23,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "新增乐团付费主体")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+    public Object add(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntitiesService.insert(musicGroupPaymentEntities);
         return succeed();
     }
@@ -36,23 +36,23 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
     }
 
     @ApiOperation(value = "删除乐团付费主体")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团付费主体编号", required = true) @PathVariable("id") Integer id){
         musicGroupPaymentEntitiesService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改乐团付费主体")
-    @PutMapping("/update")
-    public Object update(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
+    @PostMapping("/update")
+    public Object update(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntities.setUpdateTime(new Date());
         musicGroupPaymentEntitiesService.update(musicGroupPaymentEntities);
         return succeed();
     }
 
     @ApiOperation(value = "分页查询乐团付费主体")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody QueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(QueryInfo queryInfo){
         return succeed(musicGroupPaymentEntitiesService.queryPage(queryInfo));
     }
 }

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

@@ -1,21 +1,15 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.web.dal.dao.MusicGroupDao;
-import com.ym.mec.web.dal.dto.SubFeeSettingDto;
-import com.ym.mec.web.dal.entity.MusicGroup;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.web.dal.page.MusicGroupQueryInfo;
-import com.ym.mec.web.service.MusicGroupService;
 import com.ym.mec.web.service.MusicGroupSubjectPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("musicGroupSubjectPlan")
 @Api(tags = "乐团声部计划服务")
@@ -32,7 +26,7 @@ public class MusicGroupSubjectPlanController extends BaseController {
     }
 
     @ApiOperation(value = "乐团声部分班情况")
-    @PostMapping("/getMusicSubjectClass")
+    @GetMapping("/getMusicSubjectClass")
     public Object getMusicSubjectClass(@ApiParam(value = "乐团编号", required = true) int musicGroupId) {
         return succeed(musicGroupSubjectPlanService.getMusicSubjectClassPlan(musicGroupId));
     }

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

@@ -13,49 +13,42 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 
 @RequestMapping("organization")
-@Api(tags = "组织机构服务")
+@Api(tags = "分部服务")
 @RestController
 public class OrganizationController extends BaseController {
 
     @Autowired
     private OrganizationService organizationService;
 
-    @ApiOperation(value = "分页查询组织机构树状列表")
-    @PostMapping("/queryPage")
+    @ApiOperation(value = "分页查询分部列表")
+    @GetMapping("/queryPage")
     public Object queryPage(OrganizationQueryInfo queryInfo){
-        return succeed(organizationService.queryTreePage(queryInfo));
+        return succeed(organizationService.queryPage(queryInfo));
     }
 
-    @ApiOperation(value = "新增机构")
+    @ApiOperation(value = "新增分部")
     @PostMapping("/add")
-    public Object add(@RequestBody Organization organization){
-        Organization organizationByCode = organizationService.findByCode(organization.getCode());
-        if(organizationByCode != null){
-            return failed("组织机构代码已经存在,请更改");
-        }
+    public Object add(Organization organization){
         return succeed(organizationService.insert(organization));
     }
 
-    @ApiOperation(value = "根据机构编号删除机构")
-    @DeleteMapping("/del/{id}")
-    public Object del(@ApiParam(value = "组织编号", required = true) @PathVariable("id") Integer id){
+    @ApiOperation(value = "根据分部编号删除分部")
+    @PostMapping("/del/{id}")
+    public Object del(@ApiParam(value = "分部编号", required = true) @PathVariable("id") Integer id){
         return succeed(organizationService.delete(id));
     }
 
-    @ApiOperation(value = "修改机构信息")
-    @PutMapping("/update")
-    public Object update(@RequestBody Organization organization){
-        Organization organizationByCode = organizationService.findByCode(organization.getCode());
-        if(organizationByCode != null && !organizationByCode.getId().equals(organization.getId())){
-            return failed("组织机构代码已存在,请更改");
-        }
+    @ApiOperation(value = "修改分部信息")
+    @PostMapping("/update")
+    public Object update(Organization organization){
         organization.setUpdateTime(new Date());
         return succeed(organizationService.update(organization));
     }
 
-    @ApiOperation(value = "根据机构编号查询机构详情")
+    @ApiOperation(value = "根据分部编号查询分部详情")
     @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "组织编号", required = true) @PathVariable("id") Integer id){
+    @ApiParam(value = "分部编号", required = true)
+    public Object get( @PathVariable("id") Integer id){
         return succeed(organizationService.get(id));
     }
 }

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

@@ -22,21 +22,21 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "新增学校")
     @PostMapping("/add")
-    public Object add(@RequestBody School school){
+    public Object add(School school){
         schoolService.insert(school);
         return succeed();
     }
 
     @ApiOperation(value = "删除学校")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/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(@RequestBody School school){
+    @PostMapping("/update")
+    public Object update(School school){
         school.setUpdateTime(new Date());
         schoolService.update(school);
         return succeed();
@@ -49,8 +49,8 @@ public class SchoolController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询学校列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody SchoolQueryInfo queryInfo){
+    @GetMapping("/queryPage")
+    public Object queryPage(SchoolQueryInfo queryInfo){
         return succeed(schoolService.queryPage(queryInfo));
     }
 

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

@@ -2,7 +2,6 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.StudentRegistration;
-import com.ym.mec.web.dal.page.StudentApplyDetailQueryInfo;
 import com.ym.mec.web.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.web.service.StudentRegistrationService;
 import io.swagger.annotations.*;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
-import java.util.HashMap;
 
 @RequestMapping("studentRegistration")
 @Api(tags = "学生报名信息服务")
@@ -23,40 +21,38 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
-    public Object add(@RequestBody StudentRegistration studentRegistration) {
+    public Object add(StudentRegistration studentRegistration) {
         studentRegistrationService.insert(studentRegistration);
         return succeed();
     }
 
     @ApiOperation(value = "删除学生报名信息")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "学生报名信息编号", required = true) @PathVariable("id") Long id) {
         studentRegistrationService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改学生报名信息")
-    @PutMapping("/update")
-    public Object update(@RequestBody StudentRegistration studentRegistration) {
+    @PostMapping("/update")
+    public Object update(StudentRegistration studentRegistration) {
         studentRegistration.setUpdateTime(new Date());
         studentRegistrationService.update(studentRegistration);
         return succeed();
     }
 
     @ApiOperation(value = "批量调剂学生报名专业")
-    @PutMapping("/batchUpdateSubject")
-    public Object batchUpdateSubject(@RequestBody HashMap<String, String> param) {
-        String userId = param.get("userId");
-        String subId = param.get("subId");
-        if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(subId)) {
+    @PostMapping("/batchUpdateSubject")
+    public Object batchUpdateSubject(String userId,Integer subId) {
+        if (StringUtils.isEmpty(userId) || subId == null) {
             return failed();
         }
-        return succeed(studentRegistrationService.batchUpdateSubject(userId, Integer.parseInt(subId)));
+        return succeed(studentRegistrationService.batchUpdateSubject(userId, subId));
     }
 
     @ApiOperation(value = "乐团【报名中、缴费中】 学生详情列表分页查询")
-    @PostMapping("/queryStudentApplyDetail")
-    public Object queryStudentApplyDetail(@RequestBody StudentRegistrationQueryInfo queryInfo) {
+    @GetMapping("/queryStudentApplyDetail")
+    public Object queryStudentApplyDetail(StudentRegistrationQueryInfo queryInfo) {
         return succeed(studentRegistrationService.queryStudentDetailPage(queryInfo));
     }
 
@@ -64,9 +60,7 @@ public class StudentRegistrationController extends BaseController {
     @GetMapping("/queryFeeDetail")
     @ApiImplicitParams({@ApiImplicitParam(name = "studentId", value = "学生编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
-    public Object queryFeeDetail(@RequestBody HashMap<String, String> param) {
-        String studentId = param.get("studentId");
-        String musicGroupId = param.get("musicGroupId");
+    public Object queryFeeDetail(String studentId,String musicGroupId) {
         if (StringUtils.isEmpty(studentId) || StringUtils.isEmpty(musicGroupId)) {
             return succeed(studentRegistrationService.queryFeeDetail(Integer.parseInt(studentId), musicGroupId));
         }

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

@@ -3,14 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.web.dal.entity.Subject;
 import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
-import com.ym.mec.web.dal.page.GoodsQueryInfo;
 import com.ym.mec.web.dal.page.SubjectQueryInfo;
 import com.ym.mec.web.service.SubjectService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 @RequestMapping("subject")
@@ -36,33 +34,27 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "分页查询科目列表")
     @GetMapping("/queryPage")
-    public Object queryPage(@RequestBody(required = false) SubjectQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new SubjectQueryInfo();
-        }
+    public Object queryPage(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "分页查询科目树状列表")
     @GetMapping("/queryPageTree")
-    public Object queryPageTree(@RequestBody(required = false) SubjectQueryInfo queryInfo){
-        if(queryInfo == null){
-            queryInfo = new SubjectQueryInfo();
-        }
+    public Object queryPageTree(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPageTree(queryInfo));
     }
 
     @ApiOperation(value = "通过乐团编号查询乐团科目规划")
     @GetMapping("/querySubByMusicGroupId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubByMusicGroupId(@RequestParam Integer musicGroupId){
+    public Object findSubByMusicGroupId(Integer musicGroupId){
         return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
     }
 
     @ApiOperation(value = "通过乐团收费类型，获取默认的声部列表")
     @GetMapping("/findDefaultSubByGroupId")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findDefaultSubByGroupId(@RequestParam Integer musicGroupId){
+    public Object findDefaultSubByGroupId(Integer musicGroupId){
         return succeed(subjectService.findDefaultSubByGroupId(musicGroupId));
     }
 
@@ -76,7 +68,7 @@ public class SubjectController extends BaseController {
     @ApiOperation(value = "通过乐团编号获取声部列表以及声部报名、缴费、计划人数")
     @GetMapping("/findSubApplyDetail")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object findSubApplyDetail(@RequestParam Integer musicGroupId){
+    public Object findSubApplyDetail(Integer musicGroupId){
         return succeed(subjectService.findSubApplyDetail(musicGroupId));
     }
 }

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

@@ -0,0 +1,61 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.dto.TreeDto;
+import com.ym.mec.web.service.SysAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("area")
+@Api(tags = "区域服务")
+@RestController
+public class SysAreaController extends BaseController {
+
+    @Autowired
+    private SysAreaService sysAreaService;
+
+    @ApiOperation(value = "根据父节点查询区域树状列表（递归）")
+    @GetMapping("/queryTree")
+    public Object queryPage(TreeDto treeDto){
+        if(treeDto.getParentId() == 0){
+            return failed("非法参数");
+        }
+        return succeed(sysAreaService.queryTreePage(treeDto));
+    }
+
+    @ApiOperation(value = "根据父节点查询下一级子节点列表（不递归）")
+    @GetMapping("/queryChild")
+    public Object queryChild(TreeDto treeDto){
+        return succeed(sysAreaService.queryChild(treeDto));
+    }
+/*
+    @ApiOperation(value = "新增区域")
+    @PostMapping("/add")
+    public Object add(SysArea area){
+        return succeed(sysAreaService.insert(area));
+    }
+
+    @ApiOperation(value = "根据区域编号删除区域")
+    @PostMapping("/del/{id}")
+    public Object del(@ApiParam(value = "区域编号", required = true) @PathVariable("id") Integer id){
+        return succeed(sysAreaService.delete(id));
+    }
+
+    @ApiOperation(value = "修改区域信息")
+    @PostMapping("/update")
+    public Object update(SysArea area){
+        area.setUpdateTime(new Date());
+        return succeed(sysAreaService.update(area));
+    }
+
+    @ApiOperation(value = "根据区域编号查询区域详情")
+    @GetMapping("/get/{id}")
+    @ApiParam(value = "区域编号", required = true)
+    public Object get( @PathVariable("id") Integer id){
+        return succeed(sysAreaService.get(id));
+    }*/
+}

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

@@ -27,35 +27,32 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "新增教师")
     @PostMapping("/add")
-    public Object add(@RequestBody Teacher teacher) {
-        Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
-        if (teacherServiceByCertificateNum != null) {
-            return failed("系统已存在该证件号的老师，请核查");
-        }
-        Integer organId = SecurityUtils.getUser().getOrganId();
-        if(organId != null){
-            teacher.setOrganId(organId);
+    public Object add(Teacher teacher) {
+        try {
+            teacherService.add(teacher);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage());
         }
-        teacherService.insert(teacher);
         return succeed();
     }
 
     @ApiOperation(value = "删除教师")
-    @DeleteMapping("/del/{id}")
+    @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
         teacherService.delete(id);
         return succeed();
     }
 
     @ApiOperation(value = "修改教师")
-    @PutMapping("/update")
-    public Object update(@RequestBody Teacher teacher) {
+    @PostMapping("/update")
+    public Object update(Teacher teacher) {
         Integer organId = SecurityUtils.getUser().getOrganId();
         if(organId != null){
             teacher.setOrganId(organId);
         }
         Teacher teacherServiceByCertificateNum = teacherService.findByCertificateNum(teacher.getCertificateNum());
-        if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getUserId().equals(teacher.getUserId())) {
+        if (teacherServiceByCertificateNum != null && !teacherServiceByCertificateNum.getId().equals(teacher.getId())) {
             return failed("系统已存在该证件号的老师，请核查");
         }
         teacher.setUpdateTime(new Date());
@@ -65,19 +62,21 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "根据教师编号查询教师")
     @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
+    @ApiParam(value = "教师编号", required = true)
+    public Object get(@PathVariable("id") Integer id) {
         return succeed(teacherService.get(id));
     }
 
     @ApiOperation(value = "分页查询教师列表")
-    @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody TeacherQueryInfo queryInfo) {
+    @GetMapping("/queryPage")
+    public Object queryPage(TeacherQueryInfo queryInfo) {
         return succeed(teacherService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据教师编号查询教师课程班列表")
     @GetMapping("/getClass/{id}")
-    public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
+    @ApiParam(value = "教师编号", required = true)
+    public Object getClassGroup(@PathVariable("id") Integer id) {
         return succeed(classGroupService.findClassGroup4Teacher(id));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkController.java

@@ -7,10 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author Joburgess
@@ -25,8 +22,11 @@ public class CourseHomeworkController extends BaseController {
     private CourseHomeworkService courseHomeworkService;
 
     @ApiOperation(value = "分页查询作业列表")
-    @PostMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object queryPage(@RequestBody CourseHomeworkQueryInfo queryInfo){
+    @GetMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object queryPage(@RequestBody(required = false) CourseHomeworkQueryInfo queryInfo){
+        if(queryInfo == null){
+            queryInfo = new CourseHomeworkQueryInfo();
+        }
         return succeed(courseHomeworkService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentCourseHomeworkController.java

@@ -48,8 +48,11 @@ public class StudentCourseHomeworkController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询作业列表")
-    @PostMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object queryPage(@RequestBody CourseHomeworkQueryInfo queryInfo){
+    @GetMapping(value = "/queryPage",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object queryPage(@RequestBody(required = false) CourseHomeworkQueryInfo queryInfo){
+        if(queryInfo == null){
+            queryInfo = new CourseHomeworkQueryInfo();
+        }
         return succeed(studentCourseHomeworkService.queryPage(queryInfo));
     }
 

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

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

@@ -15,11 +15,4 @@ 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/SysAreaDao.java

@@ -1,9 +1,20 @@
 package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.dto.TreeDto;
 import com.ym.mec.web.dal.entity.SysArea;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysAreaDao extends BaseDAO<Integer, SysArea> {
 
-	
+    /**
+     * 根据父节点获取子节点列表
+     * @param parentId
+     * @param delFlag
+     * @return
+     */
+    List<SysArea> findRootList(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
 }

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

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

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

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

@@ -0,0 +1,168 @@
+package com.ym.mec.web.dal.dto;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.web.dal.enums.JobNatureEnum;
+import com.ym.mec.web.dal.enums.JobTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class TeacherUserDto extends SysUser {
+
+    @ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）", required = false)
+    private JobTypeEnum jobType;
+
+    @ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）", required = false)
+    private JobNatureEnum jobNature;
+
+    @ApiModelProperty(value = "是否试用期1是，0否", required = false)
+    private YesOrNoEnum isProbationPeriod;
+
+    @ApiModelProperty(value = "学历", required = false)
+    private String educationBackground;
+
+    @ApiModelProperty(value = "毕业学校", required = false)
+    private String graduateSchool;
+
+    /** 技术职称 */
+    @ApiModelProperty(value = "技术职称", required = false)
+    private String technicalTitles;
+
+    @ApiModelProperty(value = "工作单位", required = false)
+    private String workUnit;
+
+    @ApiModelProperty(value = "专业技能（支持多个，用|分隔），对应科目表编号", required = false)
+    private String subjectId;
+
+    /** 入职时间 */
+    @ApiModelProperty(value = "入职时间", required = false)
+    private java.util.Date entryDate;
+
+    @ApiModelProperty(value = "证件类型", required = false)
+    private String certificateType;
+
+    @ApiModelProperty(value = "证件号码", required = false)
+    private String certificateNum;
+
+    @ApiModelProperty(value = "流动范围(多个用|分开)", required = false)
+    private String flowOrganRange;
+
+    @ApiModelProperty(value = "老师介绍", required = false)
+    private String introduction;
+
+    @ApiModelProperty(value = "离职时间", required = false)
+    private Date demissionDate;
+
+    public JobTypeEnum getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(JobTypeEnum jobType) {
+        this.jobType = jobType;
+    }
+
+    public JobNatureEnum getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(JobNatureEnum jobNature) {
+        this.jobNature = jobNature;
+    }
+
+    public YesOrNoEnum getIsProbationPeriod() {
+        return isProbationPeriod;
+    }
+
+    public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+        this.isProbationPeriod = isProbationPeriod;
+    }
+
+    public String getEducationBackground() {
+        return educationBackground;
+    }
+
+    public void setEducationBackground(String educationBackground) {
+        this.educationBackground = educationBackground;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getTechnicalTitles() {
+        return technicalTitles;
+    }
+
+    public void setTechnicalTitles(String technicalTitles) {
+        this.technicalTitles = technicalTitles;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    public void setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public String getCertificateType() {
+        return certificateType;
+    }
+
+    public void setCertificateType(String certificateType) {
+        this.certificateType = certificateType;
+    }
+
+    public String getCertificateNum() {
+        return certificateNum;
+    }
+
+    public void setCertificateNum(String certificateNum) {
+        this.certificateNum = certificateNum;
+    }
+
+    public String getFlowOrganRange() {
+        return flowOrganRange;
+    }
+
+    public void setFlowOrganRange(String flowOrganRange) {
+        this.flowOrganRange = flowOrganRange;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public Date getDemissionDate() {
+        return demissionDate;
+    }
+
+    public void setDemissionDate(Date demissionDate) {
+        this.demissionDate = demissionDate;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.ym.mec.web.dal.dto;
+
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TreeDto {
+    @ApiModelProperty(value = "父节点编号，默认0",required = false)
+    private Integer parentId = 0;
+
+    @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
+    private YesOrNoEnum delFlag = YesOrNoEnum.NO;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public YesOrNoEnum getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(YesOrNoEnum delFlag) {
+        this.delFlag = delFlag;
+    }
+}

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

@@ -13,25 +13,25 @@ import com.ym.mec.web.dal.enums.YesOrNoEnum;
 public class ClassGroup {
 
 	/**  */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer id;
-	
+
 	/**  */
-	@ApiModelProperty(value = "乐团编号",required = true)
+	@ApiModelProperty(value = "乐团编号", required = true)
 	private Integer musicGroupId;
-	
+
 	/**  */
-	@ApiModelProperty(value = "科目编号(多个,号分割)",required = true)
+	@ApiModelProperty(value = "科目编号(多个,号分割)", required = true)
 	private String subjectIdList;
 
-	@ApiModelProperty(value = "学生编号(多个,号分割)",required = true)
+	@ApiModelProperty(value = "学生编号(多个,号分割)", required = true)
 	private String userIds;
 
-	@ApiModelProperty(value = "科目名称",required = false,hidden = true)
+	@ApiModelProperty(value = "科目名称", required = false, hidden = true)
 	private String subjectName;
 
 	/** 班级名称 */
-	@ApiModelProperty(value = "班级名称",required = true)
+	@ApiModelProperty(value = "班级名称", required = true)
 	private String name;
 
 	/** 子班级名称列表 */
@@ -41,23 +41,23 @@ public class ClassGroup {
 	/** 预计招生人数 */
 	@ApiModelProperty(value = "预计招生人数",hidden = true)
 	private Integer expectStudentNum;
-	
+
 	/** 学生数 */
-	@ApiModelProperty(value = "学生数量",required = false)
+	@ApiModelProperty(value = "学生数量", required = false)
 	private Integer studentNum;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级、试听课)", required = true)
 	private ClassGroupTypeEnum type;
 
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "是否删除，1是 0否",required = false)
+	@ApiModelProperty(value = "是否删除，1是 0否", required = false)
 	private YesOrNoEnum delFlag;
 
 	public YesOrNoEnum getDelFlag() {
@@ -68,22 +68,22 @@ public class ClassGroup {
 		this.delFlag = delFlag;
 	}
 
-	public void setId(Integer id){
+	public void setId(Integer id) {
 		this.id = id;
 	}
-	
-	public Integer getId(){
+
+	public Integer getId() {
 		return this.id;
 	}
-			
-	public void setMusicGroupId(Integer musicGroupId){
+
+	public void setMusicGroupId(Integer musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
-	
-	public Integer getMusicGroupId(){
+
+	public Integer getMusicGroupId() {
 		return this.musicGroupId;
 	}
-			
+
 	public String getSubjectIdList() {
 		return subjectIdList;
 	}
@@ -92,35 +92,35 @@ public class ClassGroup {
 		this.subjectIdList = subjectIdList;
 	}
 
-	public void setName(String name){
+	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getName(){
+
+	public String getName() {
 		return this.name;
 	}
-			
-	public void setStudentNum(Integer studentNum){
+
+	public void setStudentNum(Integer studentNum) {
 		this.studentNum = studentNum;
 	}
-	
-	public Integer getStudentNum(){
+
+	public Integer getStudentNum() {
 		return this.studentNum;
 	}
-			
-	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 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;
 	}
 

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

@@ -1,9 +1,12 @@
 package com.ym.mec.web.dal.entity;
 
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.web.dal.enums.CourseStatusEnum;
+import com.ym.mec.web.dal.enums.TeachModeEnum;
+
 /**
  * 对应数据库表(course_schedule):
  */
@@ -11,58 +14,62 @@ public class CourseSchedule {
 
 	/**  */
 	private Long id;
-	
+
 	/** 班级编号 */
-	@ApiModelProperty(value = "班级编号",required = false)
+	@ApiModelProperty(value = "班级编号", required = false)
 	private Integer classGroupId;
-	
+
 	/** 课程状态 */
-	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退",required = false)
+	@ApiModelProperty(value = "课程状态  NOT_START未开始，SIGN_IN已签到，SIGN_OUT已签退", required = false)
 	private CourseStatusEnum status;
-	
+
 	/** 补贴 */
-	@ApiModelProperty(value = "补贴",required = false)
+	@ApiModelProperty(value = "补贴", required = false)
 	private long subsidy;
-	
+
 	/** 上课日期 */
-	@ApiModelProperty(value = "上课日期",required = false)
+	@ApiModelProperty(value = "上课日期", required = false)
 	private java.util.Date classDate;
-	
+
 	/** 上课时间 */
-	@ApiModelProperty(value = "上课时间",required = false)
+	@ApiModelProperty(value = "上课时间", required = false)
 	private java.util.Date startClassTime;
-	
+
 	/** 结束时间 */
-	@ApiModelProperty(value = "结束时间",required = false)
+	@ApiModelProperty(value = "结束时间", required = false)
 	private java.util.Date endClassTime;
-	
+
 	/** 上课教师 */
-	@ApiModelProperty(value = "上课教师",required = false)
+	@ApiModelProperty(value = "上课教师", required = false)
 	private Long teacherId;
-	
+
 	/** 实际上课教师 */
-	@ApiModelProperty(value = "实际上课教师",required = false)
+	@ApiModelProperty(value = "实际上课教师", required = false)
 	private Long actualTeacherId;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
-	public void setId(Long id){
+
+	private TeachModeEnum teachMode;
+
+	private boolean complaintStatus;
+
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setClassGroupId(Integer classGroupId){
+
+	public void setClassGroupId(Integer classGroupId) {
 		this.classGroupId = classGroupId;
 	}
-	
-	public Integer getClassGroupId(){
+
+	public Integer getClassGroupId() {
 		return this.classGroupId;
 	}
 
@@ -74,35 +81,35 @@ public class CourseSchedule {
 		this.status = status;
 	}
 
-	public void setSubsidy(long subsidy){
+	public void setSubsidy(long subsidy) {
 		this.subsidy = subsidy;
 	}
-	
-	public long getSubsidy(){
+
+	public long getSubsidy() {
 		return this.subsidy;
 	}
-			
-	public void setClassDate(java.util.Date classDate){
+
+	public void setClassDate(java.util.Date classDate) {
 		this.classDate = classDate;
 	}
-	
-	public java.util.Date getClassDate(){
+
+	public java.util.Date getClassDate() {
 		return this.classDate;
 	}
-			
-	public void setStartClassTime(java.util.Date startClassTime){
+
+	public void setStartClassTime(java.util.Date startClassTime) {
 		this.startClassTime = startClassTime;
 	}
-	
-	public java.util.Date getStartClassTime(){
+
+	public java.util.Date getStartClassTime() {
 		return this.startClassTime;
 	}
-			
-	public void setEndClassTime(java.util.Date endClassTime){
+
+	public void setEndClassTime(java.util.Date endClassTime) {
 		this.endClassTime = endClassTime;
 	}
-	
-	public java.util.Date getEndClassTime(){
+
+	public java.util.Date getEndClassTime() {
 		return this.endClassTime;
 	}
 
@@ -122,22 +129,38 @@ public class CourseSchedule {
 		this.actualTeacherId = actualTeacherId;
 	}
 
-	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 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 TeachModeEnum getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(TeachModeEnum teachMode) {
+		this.teachMode = teachMode;
+	}
+
+	public boolean isComplaintStatus() {
+		return complaintStatus;
+	}
+
+	public void setComplaintStatus(boolean complaintStatus) {
+		this.complaintStatus = complaintStatus;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,103 @@
+package com.ym.mec.web.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(course_schedule_teacher_salary):
+ */
+public class CourseScheduleTeacherSalary {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Long courseScheduleId;
+	
+	/** 老师角色（主教、助教） */
+	private String teacherRole;
+	
+	/**  */
+	private Integer userId;
+	
+	/** 薪水 */
+	private long salary;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date createUpdate;
+	
+	/** 补贴 */
+	private long subsidy;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setCourseScheduleId(Long courseScheduleId){
+		this.courseScheduleId = courseScheduleId;
+	}
+	
+	public Long getCourseScheduleId(){
+		return this.courseScheduleId;
+	}
+			
+	public void setTeacherRole(String teacherRole){
+		this.teacherRole = teacherRole;
+	}
+	
+	public String getTeacherRole(){
+		return this.teacherRole;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setSalary(long salary){
+		this.salary = salary;
+	}
+	
+	public long getSalary(){
+		return this.salary;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setCreateUpdate(java.util.Date createUpdate){
+		this.createUpdate = createUpdate;
+	}
+	
+	public java.util.Date getCreateUpdate(){
+		return this.createUpdate;
+	}
+			
+	public void setSubsidy(long subsidy){
+		this.subsidy = subsidy;
+	}
+	
+	public long getSubsidy(){
+		return this.subsidy;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -19,9 +19,9 @@ public class Organization {
 	@ApiModelProperty(value = "机构名称",required = false)
 	private String name;
 	
-	/** 机构编码 */
-	@ApiModelProperty(value = "机构编码",required = false)
-	private Integer code;
+	/** 区域编码 */
+	@ApiModelProperty(value = "区域编码",required = false)
+	private Integer areaId;
 	
 	/** 创建时间 */
 	private Date createTime;
@@ -32,10 +32,6 @@ public class Organization {
 	/** 是否删除  -1：已删除  0：正常 */
 	@ApiModelProperty(value = "是否删除  1：已删除  0：正常",required = false)
 	private YesOrNoEnum delFlag;
-	
-	/** 父节点编号 */
-	@ApiModelProperty(value = "父节点编号",required = false)
-	private Integer parentOrganId;
 
 	@ApiModelProperty(value = "成立日期",required = false)
 	private Date registerDate;
@@ -76,14 +72,6 @@ public class Organization {
 		return this.name;
 	}
 			
-	public void setCode(Integer code){
-		this.code = code;
-	}
-	
-	public Integer getCode(){
-		return this.code;
-	}
-			
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
@@ -108,12 +96,12 @@ public class Organization {
 		this.delFlag = delFlag;
 	}
 
-	public void setParentOrganId(Integer parentOrganId){
-		this.parentOrganId = parentOrganId;
+	public Integer getAreaId() {
+		return areaId;
 	}
-	
-	public Integer getParentOrganId(){
-		return this.parentOrganId;
+
+	public void setAreaId(Integer areaId) {
+		this.areaId = areaId;
 	}
 
 	public Date getRegisterDate() {

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

@@ -2,8 +2,11 @@ package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.catalina.LifecycleState;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.List;
+
 /**
  * 对应数据库表(sys_area):
  */
@@ -33,7 +36,18 @@ public class SysArea {
 	/** 父节点编号 */
 	@ApiModelProperty(value = "父节点编号",required = false)
 	private Integer parentOrganId;
-	
+
+	@ApiModelProperty(value = "子节点列表",required = false)
+	private List<SysArea> areas;
+
+	public List<SysArea> getAreas() {
+		return areas;
+	}
+
+	public void setAreas(List<SysArea> areas) {
+		this.areas = areas;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -13,14 +14,7 @@ import com.ym.mec.web.dal.enums.YesOrNoEnum;
 /**
  * 对应数据库表(teacher):
  */
-public class Teacher {
-
-	/**  */
-	private Integer userId;
-
-	/**  */
-	@ApiModelProperty(value = "机构编号", required = false)
-	private Integer organId;
+public class Teacher extends SysUser {
 
 	/** 职务类型（指导老师、教务老师、教学主管） */
 	@ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）", required = false)
@@ -70,34 +64,12 @@ public class Teacher {
 	@ApiModelProperty(value = "流动范围(多个用|分开)", required = false)
 	private String flowOrganRange;
 
-	/**  */
-	private java.util.Date updateTime;
-
-	/**  */
-	private java.util.Date createTime;
-
 	@ApiModelProperty(value = "老师介绍", required = false)
 	private String introduction;
 	
 	@ApiModelProperty(value = "离职时间", required = false)
 	private Date demissionDate;
 
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public Integer getUserId() {
-		return this.userId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
-
-	public Integer getOrganId() {
-		return this.organId;
-	}
-
 	public JobTypeEnum getJobType() {
 		return jobType;
 	}
@@ -194,22 +166,6 @@ public class Teacher {
 		return this.flowOrganRange;
 	}
 
-	public void setUpdateTime(java.util.Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public java.util.Date getUpdateTime() {
-		return this.updateTime;
-	}
-
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
 	public String getIntroduction() {
 		return introduction;
 	}

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

@@ -0,0 +1,121 @@
+package com.ym.mec.web.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(teacher_school):
+ */
+public class TeacherSchool {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	@ApiModelProperty(value = "用户编号",required = false)
+	private Integer userId;
+	
+	/** 省 */
+	@ApiModelProperty(value = "省份",required = false)
+	private String province;
+	
+	/** 市 */
+	@ApiModelProperty(value = "市",required = false)
+	private String city;
+	
+	/** 区 */
+	@ApiModelProperty(value = "区",required = false)
+	private String district;
+	
+	/** 地址 */
+	@ApiModelProperty(value = "地址",required = false)
+	private String address;
+	
+	/** 经纬度 */
+	@ApiModelProperty(value = "经纬度",required = false)
+	private String longitudeLatitude;
+	
+	/**  */
+	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 setProvince(String province){
+		this.province = province;
+	}
+	
+	public String getProvince(){
+		return this.province;
+	}
+			
+	public void setCity(String city){
+		this.city = city;
+	}
+	
+	public String getCity(){
+		return this.city;
+	}
+			
+	public void setDistrict(String district){
+		this.district = district;
+	}
+	
+	public String getDistrict(){
+		return this.district;
+	}
+			
+	public void setAddress(String address){
+		this.address = address;
+	}
+	
+	public String getAddress(){
+		return this.address;
+	}
+			
+	public void setLongitudeLatitude(String longitudeLatitude){
+		this.longitudeLatitude = longitudeLatitude;
+	}
+	
+	public String getLongitudeLatitude(){
+		return this.longitudeLatitude;
+	}
+			
+	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/VipGroup.java

@@ -0,0 +1,147 @@
+package com.ym.mec.web.dal.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(vip_group):
+ */
+public class VipGroup {
+
+	/**  */
+	private Long id;
+
+	/**  */
+	@ApiModelProperty(value = "用户编号", required = false)
+	private Integer userId;
+
+	/** 单节课时 */
+	@ApiModelProperty(value = "单节课时", required = false)
+	private Integer singleClassMinutes;
+
+	/** 缴费截止时间 */
+	@ApiModelProperty(value = "缴费截止时间", required = false)
+	private java.util.Date paymentExpireDate;
+
+	/** 课程结束日期 */
+	@ApiModelProperty(value = "课程结束日期", required = false)
+	private java.util.Date coursesExpireDate;
+
+	@ApiModelProperty(value = "报名开始时间", required = false)
+	private Date registrationStartTime;
+
+	/**  */
+	private java.util.Date createTime;
+
+	/**  */
+	private java.util.Date updateTime;
+
+	/** 教学点 */
+	@ApiModelProperty(value = "教学点", required = false)
+	private Long teacherSchoolId;
+
+	/** 线上课课时数 */
+	@ApiModelProperty(value = "线上课课时数", required = false)
+	private Integer onlineClassesNum;
+
+	/** 线下课课时数 */
+	@ApiModelProperty(value = "线下课课时数", required = false)
+	private Integer offlineClassesNum;
+
+	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 setSingleClassMinutes(Integer singleClassMinutes) {
+		this.singleClassMinutes = singleClassMinutes;
+	}
+
+	public Integer getSingleClassMinutes() {
+		return this.singleClassMinutes;
+	}
+
+	public void setPaymentExpireDate(java.util.Date paymentExpireDate) {
+		this.paymentExpireDate = paymentExpireDate;
+	}
+
+	public java.util.Date getPaymentExpireDate() {
+		return this.paymentExpireDate;
+	}
+
+	public void setCoursesExpireDate(java.util.Date coursesExpireDate) {
+		this.coursesExpireDate = coursesExpireDate;
+	}
+
+	public java.util.Date getCoursesExpireDate() {
+		return this.coursesExpireDate;
+	}
+
+	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 setTeacherSchoolId(Long teacherSchoolId) {
+		this.teacherSchoolId = teacherSchoolId;
+	}
+
+	public Long getTeacherSchoolId() {
+		return this.teacherSchoolId;
+	}
+
+	public void setOnlineClassesNum(Integer onlineClassesNum) {
+		this.onlineClassesNum = onlineClassesNum;
+	}
+
+	public Integer getOnlineClassesNum() {
+		return this.onlineClassesNum;
+	}
+
+	public void setOfflineClassesNum(Integer offlineClassesNum) {
+		this.offlineClassesNum = offlineClassesNum;
+	}
+
+	public Integer getOfflineClassesNum() {
+		return this.offlineClassesNum;
+	}
+
+	public Date getRegistrationStartTime() {
+		return registrationStartTime;
+	}
+
+	public void setRegistrationStartTime(Date registrationStartTime) {
+		this.registrationStartTime = registrationStartTime;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,62 @@
+package com.ym.mec.web.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(vip_group_class_group_mapper):
+ */
+public class VipGroupClassGroupMapper {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	@ApiModelProperty(value = "vip课编号",required = false)
+	private Long vipGroupId;
+	
+	/**  */
+	@ApiModelProperty(value = "班级编号编号",required = false)
+	private Integer classGroupId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setVipGroupId(Long vipGroupId){
+		this.vipGroupId = vipGroupId;
+	}
+	
+	public Long getVipGroupId(){
+		return this.vipGroupId;
+	}
+			
+	public void setClassGroupId(Integer classGroupId){
+		this.classGroupId = classGroupId;
+	}
+	
+	public Integer getClassGroupId(){
+		return this.classGroupId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -3,10 +3,10 @@ package com.ym.mec.web.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
- * 班级类型(普通班级、合奏班级)
+ * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "小课");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), TRIAL("trial", "试听课");
 
 	private String code;
 

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

@@ -0,0 +1,33 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum TeachModeEnum implements BaseEnum<String, TeachModeEnum> {
+	ONLINE("ONLINE", "线上"), OFFLINE("OFFLINE", "线下");
+
+	private String code;
+
+	private String msg;
+
+	TeachModeEnum(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/service/CourseScheduleTeacherSalaryService.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.CourseScheduleTeacherSalary;
+
+public interface CourseScheduleTeacherSalaryService extends BaseService<Long, CourseScheduleTeacherSalary> {
+
+}

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

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

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

@@ -1,8 +1,25 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.dto.TreeDto;
 import com.ym.mec.web.dal.entity.SysArea;
+import com.ym.mec.web.dal.page.OrganizationQueryInfo;
+
+import java.util.List;
 
 public interface SysAreaService extends BaseService<Integer, SysArea> {
 
+    /**
+     * 获取区域列表
+     * @param treeDto
+     * @return
+     */
+    List<SysArea> queryTreePage(TreeDto treeDto);
+
+    /**
+     * 根据父节点查询下一级子节点列表（不递归）
+     * @param treeDto
+     * @return
+     */
+    List<SysArea> queryChild(TreeDto treeDto);
 }

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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.dto.TeacherUserDto;
 import com.ym.mec.web.dal.entity.Teacher;
 
 public interface TeacherService extends BaseService<Integer, Teacher> {
@@ -11,4 +12,10 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @return Teacher 老师信息
      */
     Teacher findByCertificateNum(String certificateNum);
+
+    /**
+     * 新增教师
+     * @param teacher
+     */
+    void add(Teacher teacher) throws Exception;
 }

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

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

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

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

@@ -50,10 +50,4 @@ 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/SysAreaServiceImpl.java

@@ -3,11 +3,16 @@ package com.ym.mec.web.service.impl;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.SysAreaDao;
+import com.ym.mec.web.dal.dto.TreeDto;
+import com.ym.mec.web.dal.entity.Organization;
 import com.ym.mec.web.dal.entity.SysArea;
+import com.ym.mec.web.dal.page.OrganizationQueryInfo;
 import com.ym.mec.web.service.SysAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class SysAreaServiceImpl extends BaseServiceImpl<Integer, SysArea> implements SysAreaService {
 	
@@ -18,5 +23,34 @@ public class SysAreaServiceImpl extends BaseServiceImpl<Integer, SysArea> implem
 	public BaseDAO<Integer, SysArea> getDAO() {
 		return sysAreaDao;
 	}
-	
+
+	@Override
+	public List<SysArea> queryTreePage(TreeDto treeDto) {
+		List<SysArea> sysAreas = sysAreaDao.findRootList(treeDto.getParentId(),treeDto.getDelFlag());
+		for (SysArea sysArea : sysAreas) {
+			sysArea = getTree(sysArea);
+		}
+		return sysAreas;
+	}
+
+	@Override
+	public List<SysArea> queryChild(TreeDto treeDto) {
+		return sysAreaDao.findRootList(treeDto.getParentId(),treeDto.getDelFlag());
+	}
+
+	private SysArea getTree(SysArea area){
+		//得到根节点对象
+		//获取子节点list
+		List<SysArea> sysAreas = sysAreaDao.findRootList(area.getId(), area.getDelFlag());
+		//如果存在子节点
+		if(sysAreas != null && sysAreas.size() > 0) {
+			//将子节点list放入父节点对象
+			area.setAreas(sysAreas);
+			//遍历子节点....
+			for (SysArea sysArea : sysAreas) {
+				getTree(sysArea);
+			}
+		}
+		return area;
+	}
 }

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

@@ -0,0 +1,22 @@
+package com.ym.mec.web.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.web.dal.dao.TeacherSchoolDao;
+import com.ym.mec.web.dal.entity.TeacherSchool;
+import com.ym.mec.web.service.TeacherSchoolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TeacherSchoolServiceImpl extends BaseServiceImpl<Long, TeacherSchool> implements TeacherSchoolService {
+	
+	@Autowired
+	private TeacherSchoolDao teacherSchoolDao;
+
+	@Override
+	public BaseDAO<Long, TeacherSchool> getDAO() {
+		return teacherSchoolDao;
+	}
+	
+}

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

@@ -1,19 +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.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.TeacherDao;
 import com.ym.mec.web.dal.entity.Teacher;
 import com.ym.mec.web.service.TeacherService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  implements TeacherService {
 	
 	@Autowired
 	private TeacherDao teacherDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Integer, Teacher> getDAO() {
@@ -25,4 +29,19 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		return teacherDao.findByCertificateNum(certificateNum);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void add(Teacher teacher) throws Exception {
+		SysUser user = sysUserFeignService.getUserByMobile(teacher.getPhone());
+		if(user != null){
+			throw new Exception("系统已存在该手机号的老师，请核查");
+		}
+		//保存用户表信息
+		sysUserFeignService.addUser(teacher);
+		//注册到融云
+
+		//保存教师表数据
+		teacherDao.insert(teacher);
+	}
+
 }

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

@@ -0,0 +1,22 @@
+package com.ym.mec.web.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.web.dal.dao.VipGroupClassGroupMapperDao;
+import com.ym.mec.web.dal.entity.VipGroupClassGroupMapper;
+import com.ym.mec.web.service.VipGroupClassGroupMapperService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class VipGroupClassGroupMapperServiceImpl extends BaseServiceImpl<Long, VipGroupClassGroupMapper> implements VipGroupClassGroupMapperService {
+	
+	@Autowired
+	private VipGroupClassGroupMapperDao vipGroupClassGroupMapperDao;
+
+	@Override
+	public BaseDAO<Long, VipGroupClassGroupMapper> getDAO() {
+		return vipGroupClassGroupMapperDao;
+	}
+	
+}

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

@@ -0,0 +1,22 @@
+package com.ym.mec.web.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.web.dal.dao.VipGroupDao;
+import com.ym.mec.web.dal.entity.VipGroup;
+import com.ym.mec.web.service.VipGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> implements VipGroupService {
+	
+	@Autowired
+	private VipGroupDao vipGroupDao;
+
+	@Override
+	public BaseDAO<Long, VipGroup> getDAO() {
+		return vipGroupDao;
+	}
+	
+}

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

@@ -29,8 +29,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeType" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO charge_type (id_,name_,del_flag_,description_,course_form_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{description},#{courseForm},now(),now())
+        INSERT INTO charge_type (id_,name_,description_,course_form_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{description},#{courseForm},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,7 +58,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM charge_type WHERE id_ = #{id} 
+		UPDATE charge_type SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

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

@@ -15,6 +15,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="expect_student_num_" property="expectStudentNum"/>
         <!--<association property="musicGroupId" javaType="com.ym.mec.web.dal.entity.MusicGroup" >-->
         <!--<result column="name_" property="name"/>-->
         <!--<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->
@@ -47,6 +48,7 @@
             <if test="createTime!=null">create_time_,</if>
             <if test="updateTime!=null">update_time_,</if>
             <if test="type!=null">type_,</if>
+            <if test="expectStudentNum!=null">expect_student_num_,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,6 +60,7 @@
             <if test="createTime!=null">#{createTime},</if>
             <if test="updateTime!=null">#{updateTime},</if>
             <if test="type!=null">#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},</if>
+            <if test="expectStudentNum!=null">#{expectStudentNum},</if>
         </trim>
     </insert>
 
@@ -95,13 +98,16 @@
             <if test="name != null">
                 name_ = #{name},
             </if>
+            <if test="expectStudentNum != null">
+                expect_student_num_ = #{expectStudentNum},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-        DELETE FROM class_group WHERE id_ = #{id}
+        UPDATE class_group SET del_flag_ = 1 WHERE id_ = #{id}
     </delete>
 
     <!-- 分页查询 -->

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

@@ -5,98 +5,98 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.CourseHomeworkTemplateDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" id="CourseHomeworkTemplate">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="content_" property="content" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="class_group_type_" property="classGroupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="subject_id_" property="subjectId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseHomeworkTemplate" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" id="CourseHomeworkTemplate">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="content_" property="content"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="class_group_type_" property="classGroupType"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="subject_id_" property="subjectId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="CourseHomeworkTemplate">
 		SELECT * FROM course_homework_template WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseHomeworkTemplate">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="CourseHomeworkTemplate">
 		SELECT * FROM course_homework_template ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_homework_template (id_,name_,content_,del_flag_,create_time_,update_time_,class_group_type_,subject_id_) VALUES(#{id},#{name},#{content},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate">
-		UPDATE course_homework_template <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="subjectId != null">
-subject_id_ = #{subjectId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = now(),
-</if>
-<if test="content != null">
-content_ = #{content},
-</if>
-<if test="classGroupType != null">
-class_group_type_ = #{classGroupType},
-</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 course_homework_template WHERE id_ = #{id} 
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO course_homework_template
+        (id_,name_,content_,create_time_,update_time_,class_group_type_,subject_id_)
+        VALUES(#{id},#{name},#{content},now(),now(),#{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate">
+        UPDATE course_homework_template
+        <set>
+            <if test="delFlag != null">
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = now(),
+            </if>
+            <if test="content != null">
+                content_ = #{content},
+            </if>
+            <if test="classGroupType != null">
+                class_group_type_ = #{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="name != null">
+                name_ = #{name},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+		UPDATE course_homework_template SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
-	<sql id="queryCondition">
-		<where>
-			<if test="subjectIDs != null">
-				and subject_id_ IN
-				<foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
-					#{subjectID}
-				</foreach>
-			</if>
-		</where>
-	</sql>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
-		SELECT * FROM course_homework_template
-		<include refid="queryCondition"/>
-		ORDER BY id_
-		<include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+    <sql id="queryCondition">
+        <where>
+            <if test="subjectIDs != null">
+                and subject_id_ IN
+                <foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
+                    #{subjectID}
+                </foreach>
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
+        SELECT * FROM course_homework_template
+        <include refid="queryCondition"/>
+        ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM course_homework_template
 	</select>
 
-	<select id="getSubjectIDs" resultType="java.lang.String">
+    <select id="getSubjectIDs" resultType="java.lang.String">
 		SELECT
 			cg.subject_id_list_
 		FROM

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

@@ -18,6 +18,8 @@
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaint_status_" property="complaintStatus"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.web.dal.dto.CourseScheduleDto" id="courseScheduleDto">
@@ -32,6 +34,8 @@
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="complaint_status_" property="complaintStatus"/>
         <result column="name_" property="classGroupName"/>
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -55,16 +59,16 @@
         </selectKey>
         -->
         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},now(),now())
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_)
+        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{complaintStatus})
     </insert>
 
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         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_)
+        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,teach_mode_,complaint_status_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now())
+            (#{course.id},#{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},#{course.actualTeacherId},now(),now(),#{course.teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.complaintStatus})
         </foreach>
     </insert>
 
@@ -99,6 +103,12 @@
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>
+            <if test="teachMode != null">
+                teach_mode_ = #{teachMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="complaintStatus != null">
+                complaint_status_ = #{complaintStatus},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-web/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.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.CourseScheduleTeacherSalaryDao">
+	
+	<resultMap type="com.ym.mec.web.dal.entity.CourseScheduleTeacherSalary" id="CourseScheduleTeacherSalary">
+		<result column="id_" property="id" />
+		<result column="course_schedule_id_" property="courseScheduleId" />
+		<result column="teacher_role_" property="teacherRole" />
+		<result column="user_id_" property="userId" />
+		<result column="salary_" property="salary" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_update_" property="createUpdate" />
+		<result column="subsidy_" property="subsidy" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CourseScheduleTeacherSalary" >
+		SELECT * FROM course_schedule_teacher_salary WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CourseScheduleTeacherSalary">
+		SELECT * FROM course_schedule_teacher_salary ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseScheduleTeacherSalary" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO course_schedule_teacher_salary (id_,course_schedule_id_,teacher_role_,user_id_,salary_,create_time_,create_update_,subsidy_) VALUES(#{id},#{courseScheduleId},#{teacherRole},#{userId},#{salary},#{createTime},#{createUpdate},#{subsidy})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseScheduleTeacherSalary">
+		UPDATE course_schedule_teacher_salary <set>
+<if test="userId != null">
+user_id_ = #{userId},
+</if>
+<if test="subsidy != null">
+subsidy_ = #{subsidy},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="courseScheduleId != null">
+course_schedule_id_ = #{courseScheduleId},
+</if>
+<if test="salary != null">
+salary_ = #{salary},
+</if>
+<if test="teacherRole != null">
+teacher_role_ = #{teacherRole},
+</if>
+<if test="createUpdate != null">
+create_update_ = #{createUpdate},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM course_schedule_teacher_salary WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CourseScheduleTeacherSalary" parameterType="map">
+		SELECT * FROM course_schedule_teacher_salary ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM course_schedule_teacher_salary
+	</select>
+</mapper>

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

@@ -33,8 +33,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO leave_category (id_,name_,del_flag_,remark_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now(),now())
+        INSERT INTO leave_category (id_,name_,remark_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{remark},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -59,7 +59,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM leave_category WHERE id_ = #{id} 
+		UPDATE leave_category SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

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

@@ -9,11 +9,10 @@
     <resultMap type="com.ym.mec.web.dal.entity.Organization" id="Organization">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
-        <result column="code_" property="code"/>
+        <result column="area_id_" property="areaId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="parent_organ_id_" property="parentOrganId"/>
         <result column="register_date_" property="registerDate"/>
         <result column="linkman_" property="linkman"/>
         <result column="mobile_" property="mobile"/>
@@ -33,13 +32,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO organization (id_,name_,code_,create_time_,update_time_,del_flag_,parent_organ_id_,register_date_,linkman_,mobile_,address_)
-        VALUES(#{id},#{name},#{code},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId},#{registerDate},#{linkman},#{mobile},#{address})
+        INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,register_date_,linkman_,mobile_,address_)
+        VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -49,11 +43,8 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="parentOrganId != null">
-                parent_organ_id_ = #{parentOrganId},
-            </if>
-            <if test="code != null">
-                code_ = #{code},
+            <if test="areaId != null">
+                area_id_ = #{areaId},
             </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
@@ -79,16 +70,13 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM organization WHERE id_ = #{id} 
+		UPDATE organization SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <sql id="queryPageSql">
         <where>
-            <if test="parentId != null">
-                parent_organ_id_ = #{parentId}
-            </if>
             <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
     </sql>
@@ -109,8 +97,4 @@
     <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/SchoolMapper.xml

@@ -39,8 +39,8 @@
         </selectKey>
         -->
         INSERT INTO school
-        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,del_flag_,contact_name_,longitude_latitude_,subsidy_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{contactName},#{longitudeLatitude},#{subsidy})
+        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_)
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -80,7 +80,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM school WHERE id_ = #{id} 
+		UPDATE school SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

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

@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM subject WHERE id_ = #{id} AND parent_subject_id_ = #{id}
+		UPDATE `subject` SET del_flag_ = 1 WHERE id_ = #{id} AND parent_subject_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

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

@@ -34,8 +34,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO sys_area (id_,name_,code_,create_time_,update_time_,del_flag_,parent_organ_id_)
-        VALUES(#{id},#{name},#{code},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{parentOrganId})
+        INSERT INTO sys_area (id_,name_,code_,create_time_,update_time_,parent_organ_id_)
+        VALUES(#{id},#{name},#{code},now(),now(),#{parentOrganId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_area WHERE id_ = #{id} 
+		UPDATE sys_area SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->
@@ -76,4 +76,8 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_area
 	</select>
+    <select id="findRootList" resultMap="SysArea">
+        SELECT * FROM sys_area WHERE parent_organ_id_ = #{parentId}
+        AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+    </select>
 </mapper>

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

@@ -7,7 +7,7 @@
 <mapper namespace="com.ym.mec.web.dal.dao.TeacherDao">
 
     <resultMap type="com.ym.mec.web.dal.entity.Teacher" id="Teacher">
-        <result column="user_id_" property="userId"/>
+        <result column="id_" property="id"/>
         <result column="organ_id_" property="organId"/>
         <result column="job_type_" property="jobType"/>
         <result column="job_nature_" property="jobNature"/>
@@ -46,8 +46,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_,demission_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},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_)
+        VALUES(#{id},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -0,0 +1,88 @@
+<?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.TeacherSchoolDao">
+
+    <resultMap type="com.ym.mec.web.dal.entity.TeacherSchool" id="TeacherSchool">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="province_" property="province"/>
+        <result column="city_" property="city"/>
+        <result column="district_" property="district"/>
+        <result column="address_" property="address"/>
+        <result column="longitude_latitude_" property="longitudeLatitude"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="TeacherSchool">
+		SELECT * FROM teacher_school WHERE id_ = #{id} 
+	</select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="TeacherSchool">
+		SELECT * FROM teacher_school ORDER BY id_
+	</select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherSchool" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO teacher_school
+        (id_,user_id_,province_,city_,district_,address_,longitude_latitude_,create_time_,update_time_)
+        VALUES(#{id},#{userId},#{province},#{city},#{district},#{address},#{longitudeLatitude},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherSchool">
+        UPDATE teacher_school
+        <set>
+            <if test="city != null">
+                city_ = #{city},
+            </if>
+            <if test="address != null">
+                address_ = #{address},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="longitudeLatitude != null">
+                longitude_latitude_ = #{longitudeLatitude},
+            </if>
+            <if test="district != null">
+                district_ = #{district},
+            </if>
+            <if test="province != null">
+                province_ = #{province},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+		DELETE FROM teacher_school WHERE id_ = #{id} 
+	</delete>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="TeacherSchool" parameterType="map">
+        SELECT * FROM teacher_school ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM teacher_school
+	</select>
+</mapper>

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

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

mec-web/src/main/resources/config/mybatis/VipGroupMapper.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.VipGroupDao">
+
+    <resultMap type="com.ym.mec.web.dal.entity.VipGroup" id="VipGroup">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="single_class_minutes_" property="singleClassMinutes"/>
+        <result column="payment_expire_date_" property="paymentExpireDate"/>
+        <result column="courses_expire_date_" property="coursesExpireDate"/>
+        <result column="registration_start_time_" property="registrationStartTime"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="teacher_school_id_" property="teacherSchoolId"/>
+        <result column="online_classes_num_" property="onlineClassesNum"/>
+        <result column="offline_classes_num_" property="offlineClassesNum"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="VipGroup">
+		SELECT * FROM vip_group WHERE id_ = #{id} 
+	</select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="VipGroup">
+		SELECT * FROM vip_group ORDER BY id_
+	</select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.VipGroup" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO vip_group
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.VipGroup">
+        UPDATE vip_group
+        <set>
+            <if test="paymentExpireDate != null">
+                payment_expire_date_ = #{paymentExpireDate},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="offlineClassesNum != null">
+                offline_classes_num_ = #{offlineClassesNum},
+            </if>
+            <if test="onlineClassesNum != null">
+                online_classes_num_ = #{onlineClassesNum},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="singleClassMinutes != null">
+                single_class_minutes_ = #{singleClassMinutes},
+            </if>
+            <if test="teacherSchoolId != null">
+                teacher_school_id_ = #{teacherSchoolId},
+            </if>
+            <if test="coursesExpireDate != null">
+                courses_expire_date_ = #{coursesExpireDate},
+            </if>
+            <if test="registrationStartTime != null">
+                registration_start_time_ = #{registrationStartTime},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
+		DELETE FROM vip_group WHERE id_ = #{id} 
+	</delete>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="VipGroup" parameterType="map">
+        SELECT * FROM vip_group ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM vip_group
+	</select>
+</mapper>

pom.xml

@@ -23,7 +23,7 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!--支持Spring Boot 2.1.X -->
+			<!--支锟斤拷Spring Boot 2.1.X -->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
@@ -80,7 +80,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
 				<version>${zipkin.version}</version>
-				<!--排除log4j2 避免和logback冲突警告 -->
+				<!--锟脚筹拷log4j2 锟斤拷锟斤拷锟絣ogback锟斤拷突锟斤拷锟斤拷 -->
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework.boot</groupId>
@@ -95,14 +95,14 @@
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 使用消息的方式收集数据（使用rabbitmq） -->
+			<!-- 使锟斤拷锟斤拷息锟侥凤拷式锟秸硷拷锟斤拷锟捷ｏ拷使锟斤拷rabbitmq锟斤拷 -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-collector-rabbitmq</artifactId>
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 采用 elasticsearch 存储数据 -->
+			<!-- 锟斤拷锟斤拷 elasticsearch 锟芥储锟斤拷锟斤拷 -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-storage-elasticsearch-http</artifactId>
@@ -205,12 +205,12 @@
 	</pluginRepositories>
 
 	<dependencies>
-		<!-- SpringBoot整合Web组件 -->
+		<!-- SpringBoot锟斤拷锟斤拷Web锟斤拷锟� -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<!--自省和监控的集成功能 -->
+		<!--锟斤拷省锟酵硷拷氐募锟斤拷晒锟斤拷锟� -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -221,13 +221,13 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- SpringBoot整合config组件 -->
+		<!-- SpringBoot锟斤拷锟斤拷config锟斤拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
 			</dependency> -->
-		<!--注册中心 -->
+		<!--注锟斤拷锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> 
 			</dependency> -->
-		<!--断路器 -->
+		<!--锟斤拷路锟斤拷 -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
@@ -236,19 +236,19 @@
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> 
 			</dependency> -->
 
-		<!--集群监控消息队列 -->
+		<!--锟斤拷群锟斤拷锟斤拷锟较�拷锟斤拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-hystrix-stream</artifactId> 
 			</dependency> -->
-		<!--日志跟踪 -->
+		<!--锟斤拷志锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-zipkin</artifactId> 
 			</dependency> -->
-		<!--消息总线 -->
+		<!--锟斤拷息锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-bus-amqp</artifactId> 
 			</dependency> -->
-		<!--热加载 -->
+		<!--锟饺硷拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
 			<scope>runtime</scope> <optional>true</optional> </dependency> -->
-		<!--测试框架 -->
+		<!--锟斤拷锟皆匡拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> 
 			<scope>test</scope> </dependency> -->
 		<dependency>
@@ -319,5 +319,6 @@
 		<module>workflowy</module>
 	  <module>mec-workflow</module>
     <module>mec-thirdpart</module>
+    <module>mec-client-api</module>
   </modules>
 </project>