yonge 5 years ago
parent
commit
c561fe41de
56 changed files with 0 additions and 6245 deletions
  1. 0 74
      mec-web/src/main/resources/config/mybatis/ChargeTypeMapper.xml
  2. 0 69
      mec-web/src/main/resources/config/mybatis/ChargeTypeSubjectMapperMapper.xml
  3. 0 233
      mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml
  4. 0 78
      mec-web/src/main/resources/config/mybatis/ClassGroupRelationMapper.xml
  5. 0 74
      mec-web/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml
  6. 0 100
      mec-web/src/main/resources/config/mybatis/ClassGroupTeacherMapperMapper.xml
  7. 0 91
      mec-web/src/main/resources/config/mybatis/CooperationOrganMapper.xml
  8. 0 147
      mec-web/src/main/resources/config/mybatis/CourseHomeworkMapper.xml
  9. 0 108
      mec-web/src/main/resources/config/mybatis/CourseHomeworkTemplateMapper.xml
  10. 0 227
      mec-web/src/main/resources/config/mybatis/CourseScheduleMapper.xml
  11. 0 84
      mec-web/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml
  12. 0 172
      mec-web/src/main/resources/config/mybatis/EmployeeMapper.xml
  13. 0 21
      mec-web/src/main/resources/config/mybatis/Global.mapper.xml
  14. 0 82
      mec-web/src/main/resources/config/mybatis/GoodsCategoryMapper.xml
  15. 0 146
      mec-web/src/main/resources/config/mybatis/GoodsMapper.xml
  16. 0 87
      mec-web/src/main/resources/config/mybatis/GoodsOrderItemMapper.xml
  17. 0 111
      mec-web/src/main/resources/config/mybatis/GoodsOrderMapper.xml
  18. 0 112
      mec-web/src/main/resources/config/mybatis/GoodsOrderPaymentMapper.xml
  19. 0 72
      mec-web/src/main/resources/config/mybatis/HotWordsLabelMapper.xml
  20. 0 75
      mec-web/src/main/resources/config/mybatis/LeaveCategoryMapper.xml
  21. 0 76
      mec-web/src/main/resources/config/mybatis/MusicGroupBuildLogMapper.xml
  22. 0 135
      mec-web/src/main/resources/config/mybatis/MusicGroupMapper.xml
  23. 0 75
      mec-web/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml
  24. 0 76
      mec-web/src/main/resources/config/mybatis/MusicGroupPaymentEntitiesMapper.xml
  25. 0 75
      mec-web/src/main/resources/config/mybatis/MusicGroupPurchaseListMapper.xml
  26. 0 70
      mec-web/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml
  27. 0 108
      mec-web/src/main/resources/config/mybatis/MusicGroupSubjectGoodsGroupMapper.xml
  28. 0 100
      mec-web/src/main/resources/config/mybatis/MusicGroupSubjectPlanMapper.xml
  29. 0 103
      mec-web/src/main/resources/config/mybatis/OrganizationMapper.xml
  30. 0 107
      mec-web/src/main/resources/config/mybatis/SchoolMapper.xml
  31. 0 88
      mec-web/src/main/resources/config/mybatis/StudentApplyRefundsMapper.xml
  32. 0 210
      mec-web/src/main/resources/config/mybatis/StudentAttendanceMapper.xml
  33. 0 202
      mec-web/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml
  34. 0 113
      mec-web/src/main/resources/config/mybatis/StudentCourseHomeworkReplyMapper.xml
  35. 0 283
      mec-web/src/main/resources/config/mybatis/StudentManageDao.xml
  36. 0 80
      mec-web/src/main/resources/config/mybatis/StudentPaymentOrderDetailMapper.xml
  37. 0 116
      mec-web/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml
  38. 0 100
      mec-web/src/main/resources/config/mybatis/StudentRechargeMapper.xml
  39. 0 215
      mec-web/src/main/resources/config/mybatis/StudentRegistrationMapper.xml
  40. 0 100
      mec-web/src/main/resources/config/mybatis/StudentWithdrawMapper.xml
  41. 0 79
      mec-web/src/main/resources/config/mybatis/SubjectGoodsMapperMapper.xml
  42. 0 137
      mec-web/src/main/resources/config/mybatis/SubjectMapper.xml
  43. 0 83
      mec-web/src/main/resources/config/mybatis/SysAreaMapper.xml
  44. 0 76
      mec-web/src/main/resources/config/mybatis/SysMessageConfigMapper.xml
  45. 0 105
      mec-web/src/main/resources/config/mybatis/SysMessageMapper.xml
  46. 0 75
      mec-web/src/main/resources/config/mybatis/SysSuggestionMapper.xml
  47. 0 96
      mec-web/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml
  48. 0 87
      mec-web/src/main/resources/config/mybatis/SysUserCashAccountMapper.xml
  49. 0 149
      mec-web/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml
  50. 0 90
      mec-web/src/main/resources/config/mybatis/TeacherDefaultMusicGroupSalaryMapper.xml
  51. 0 83
      mec-web/src/main/resources/config/mybatis/TeacherLeaveRecordMapper.xml
  52. 0 232
      mec-web/src/main/resources/config/mybatis/TeacherMapper.xml
  53. 0 88
      mec-web/src/main/resources/config/mybatis/TeacherSchoolMapper.xml
  54. 0 80
      mec-web/src/main/resources/config/mybatis/VipGroupCategoryMapper.xml
  55. 0 70
      mec-web/src/main/resources/config/mybatis/VipGroupClassGroupMapperMapper.xml
  56. 0 120
      mec-web/src/main/resources/config/mybatis/VipGroupMapper.xml

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

@@ -1,74 +0,0 @@
-<?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.ChargeTypeDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.ChargeType" id="ChargeType">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="description_" property="description"/>
-        <result column="course_form_" property="courseForm"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ChargeType">
-		SELECT * FROM charge_type WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ChargeType">
-		SELECT * FROM charge_type ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeType" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO charge_type (id_,name_,description_,course_form_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{description},#{courseForm},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeType">
-        UPDATE charge_type
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="courseForm != null">
-                course_form_ = #{courseForm},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		UPDATE charge_type SET del_flag_ = 1 WHERE id_ = #{id}
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ChargeType" parameterType="map">
-        SELECT * FROM charge_type ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM charge_type
-	</select>
-</mapper>

+ 0 - 69
mec-web/src/main/resources/config/mybatis/ChargeTypeSubjectMapperMapper.xml

@@ -1,69 +0,0 @@
-<?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.ChargeTypeSubjectMapperDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper" id="ChargeTypeSubjectMapper">
-        <result column="id_" property="id"/>
-        <result column="charge_type_id_" property="chargeTypeId"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="kit_group_purchase_type_" property="kitGroupPurchaseTypeEnum" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="deposit_fee_" property="depositFee"/>
-        <result column="fee_" property="fee"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ChargeTypeSubjectMapper">
-		SELECT * FROM charge_type_subject_mapper WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ChargeTypeSubjectMapper">
-		SELECT * FROM charge_type_subject_mapper ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO charge_type_subject_mapper (id_,charge_type_id_,subject_id_,kit_group_purchase_type_,deposit_fee_,fee_,create_time_,update_time_)
-        VALUES(#{id},#{chargeTypeId},#{subjectId},#{kitGroupPurchaseTypeEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},#{fee},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper">
-        UPDATE charge_type_subject_mapper
-        <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="chargeTypeId != null">
-                charge_type_id_ = #{chargeTypeId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM charge_type_subject_mapper WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ChargeTypeSubjectMapper" parameterType="map">
-        SELECT * FROM charge_type_subject_mapper ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM charge_type_subject_mapper
-	</select>
-</mapper>

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

@@ -1,233 +0,0 @@
-<?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.ClassGroupDao">
-    <resultMap type="com.ym.mec.web.dal.entity.ClassGroup" id="ClassGroup">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_list_" property="subjectIdList"/>
-        <result column="name_" property="name"/>
-        <result column="student_num_" property="studentNum"/>
-        <result column="create_time_" property="createTime"/>
-        <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"/>
-        <result column="total_class_times_" property="totalClassTimes"/>
-        <!--<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"/>-->
-        <!--</association>-->
-    </resultMap>
-
-    <resultMap type="com.ym.mec.web.dal.entity.ClassGroup4Teacher" id="ClassGroup4Teacher">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_list_" property="subjectIdList"/>
-        <result column="subject_name" property="subjectName"/>
-        <result column="name_" property="name"/>
-        <result column="student_num_" property="studentNum"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="name_" property="musicGroupName"/>
-        <result column="status" property="musicGroupStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO class_group
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!=null">id_,</if>
-            <if test="musicGroupId!=null">music_group_id_,</if>
-            <if test="subjectIdList!=null">subject_id_list_,</if>
-            <if test="name!=null">name_,</if>
-            <if test="studentNum!=null">student_num_,</if>
-            <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>
-            <if test="totalClassTimes!=null">total_class_times_,</if>
-        </trim>
-        VALUES
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id!=null">#{id},</if>
-            <if test="musicGroupId!=null">#{musicGroupId},</if>
-            <if test="subjectIdList!=null">#{subjectIdList},</if>
-            <if test="name!=null">#{name},</if>
-            <if test="studentNum!=null">#{studentNum},</if>
-            <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>
-            <if test="totalClassTimes!=null">#{totalClassTimes},</if>
-        </trim>
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ClassGroup">
-        UPDATE class_group SET WHERE id_ = #{id}
-    </select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ClassGroup">
-        SELECT *
-        FROM class_group
-        ORDER BY id_
-    </select>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroup">
-        UPDATE class_group
-        <set>
-            <if test="subjectIdList != null">
-                subject_id_list_ = #{subjectIdList},
-            </if>
-            <if test="studentNum != null">
-                student_num_ = #{studentNum},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-            <if test="type != null">
-                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="expectStudentNum != null">
-                expect_student_num_ = #{expectStudentNum},
-            </if>
-            <if test="totalClassTimes != null">
-                total_class_times_ = #{totalClassTimes},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        UPDATE class_group SET del_flag_ = 1 WHERE id_ = #{id}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ClassGroup" parameterType="map">
-        SELECT * FROM class_group ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM class_group
-    </select>
-
-    <!-- 查询根据主教助教查询班级信息 -->
-    <select id="findClassGroup4Teacher" resultMap="ClassGroup4Teacher">
-        SELECT
-        c.*,
-        m.*
-        FROM
-        class_group c,
-        music_group m
-        WHERE
-        c.main_teacher_id_ = #{teacherId}
-        OR
-        c.assistant_teacher_id_ = #{teacherId}
-    </select>
-    <select id="findAllMixClassGroup" resultMap="ClassGroup">
-        SELECT
-        *
-        FROM
-        class_group cg
-        WHERE cg.type_="MIX" AND cg.music_group_id_=#{musicGroupId} AND del_flag_='0'
-    </select>
-    <select id="findMixClassChildClassGroup" resultMap="ClassGroup">
-        SELECT
-        cg.*
-        FROM
-        class_group_relation cgr
-        LEFT JOIN class_group cg ON cgr.class_group_id_=cg.id_
-        WHERE cgr.sub_class_group_id_=#{mixClassGroupId} AND del_flag_='0'
-    </select>
-
-    <!-- 根据乐团id获取单技班信息 -->
-    <select id="findAllNormalClassGroupByMusicGroupId" resultMap="ClassGroup">
-        SELECT
-        cg.*,
-        (SELECT group_concat(sb.name_) FROM subject sb WHERE FIND_IN_SET(sb.id_,cg.subject_id_list_)) AS subject_name
-        FROM
-        class_group cg
-        WHERE cg.music_group_id_=#{musicGroupId} AND cg.type_='NORMAL' AND cg.del_flag_='0'
-    </select>
-
-    <!-- 查询合奏班包含子班名字信息 -->
-    <select id="findMixClassChildClassGroupNames" resultMap="ClassGroup">
-        SELECT
-        group_concat(cg.name_) as name_
-        FROM
-        class_group_relation cgr
-        LEFT JOIN class_group cg ON cgr.sub_class_group_id_=cg.id_
-        WHERE cgr.class_group_id_=#{classGroupId} AND del_flag_='0'
-    </select>
-
-    <!-- 根据ids查询班级列表 -->
-    <select id="findClassGroupByIds" resultMap="ClassGroup">
-        SELECT * FROM class_group WHERE FIND_IN_SET(id_,#{ids})
-    </select>
-
-    <resultMap type="com.ym.mec.web.dal.dto.TeacherMusicClassInfoDto" id="getTeaCourseInfosMap">
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="music_group_name_" property="musicGroupName"/>
-        <!--<result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->
-        <result column="educational_teacher_id_" property="educationalTeacherId"/>
-        <result column="team_teacher_id_" property="teamTeacherId"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <collection property="classGroupNames" javaType="java.lang.String" column="class_group_name_"/>
-    </resultMap>
-    <select id="queryGroupCourses" resultMap="getTeaCourseInfosMap">
-        SELECT mg.id_ music_group_id_,mg.name_ music_group_name_,
-        mg.team_teacher_id_,mg.educational_teacher_id_,cg.name_ class_group_name_,mg.status_
-        FROM class_group_teacher_mapper cgtm
-        LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
-        LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
-        WHERE cgtm.user_id_ = #{userId}
-    </select>
-
-
-    <resultMap type="com.ym.mec.web.dal.dto.TeacherVipClassInfoDto" id="getTeacherVipClassMap">
-        <result column="price_" property="vipClassFee"/>
-        <result column="vip_group_id_" property="vipClassId"/>
-        <result column="student_num_" property="studentNum"/>
-        <result column="courses_expire_date_" property="coursesExpireDate"/>
-        <result column="payment_expire_date_" property="paymentExpireDate"/>
-        <result column="create_time_" property="createDate"/>
-        <result column="current_class_times_" property="currentClassTimes"/>
-        <result column="total_class_times_" property="totalClassTimes"/>
-        <result column="vip_group_name_" property="vipClassName"/>
-        <result column="audit_status_" property="auditStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-    <select id="getTeacherVipClass" resultMap="getTeacherVipClassMap">
-        SELECT vg.id_ vip_group_id_,vg.name_ vip_group_name_,vg.audit_status_,cs.status_,
-        cg.student_num_,vg.price_,vg.payment_expire_date_,vg.courses_expire_date_,vg.create_time_,
-        cs.current_class_times_,cg.total_class_times_
-        FROM vip_group vg
-        LEFT JOIN sys_user su ON vg.user_id_ = su.id_
-        LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_ = vgcgm.vip_group_id_
-        LEFT JOIN class_group cg ON vgcgm.class_group_id_ = cg.id_
-        LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        WHERE vg.user_id_ = #{teacherId}
-        <include refid="global.limit"/>
-    </select>
-    <select id="countTeacherVipClass" resultType="java.lang.Integer">
-        SELECT COUNT(vg.id_) FROM vip_group vg
-        WHERE vg.user_id_ = #{teacherId}
-    </select>
-</mapper>

+ 0 - 78
mec-web/src/main/resources/config/mybatis/ClassGroupRelationMapper.xml

@@ -1,78 +0,0 @@
-<?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.ClassGroupRelationDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.ClassGroupRelation" id="ClassGroupRelation">
-        <result column="id_" property="id"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="sub_class_group_id_" property="subClassGroupId"/>
-        <result column="create_time_" property="createTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ClassGroupRelation">
-        SELECT * FROM class_group_relation WHERE id_ = #{id}
-    </select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ClassGroupRelation">
-        SELECT *
-        FROM class_group_relation
-        ORDER BY id_
-    </select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroupRelation" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO class_group_relation (id_,class_group_id_,sub_class_group_id_,create_time_)
-        VALUES(#{id},#{classGroupId},#{subClassGroupId},now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroupRelation">
-        UPDATE class_group_relation
-        <set>
-            <if test="subClassGroupId != null">
-                sub_class_group_id_ = #{subClassGroupId},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        DELETE FROM class_group_relation WHERE id_ = #{id}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ClassGroupRelation" parameterType="map">
-        SELECT * FROM class_group_relation ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM class_group_relation
-    </select>
-
-    <!-- 班级关系批量插入 -->
-    <insert id="classGroupRelationsInsert" parameterType="java.util.List">
-        INSERT INTO class_group_relation (id_,class_group_id_,sub_class_group_id_,create_time_)
-        <foreach collection="classGroupRelationList" item="item" index="index" separator=",">
-            (#{item.id},#{item.classGroupId},#{item.subClassGroupId},#{item.createTime})
-        </foreach>
-    </insert>
-</mapper>

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

@@ -1,74 +0,0 @@
-<?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.ClassGroupStudentMapperDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.ClassGroupStudentMapper" id="ClassGroupStudentMapper">
-        <result column="id_" property="id"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="user_id_" property="userId"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ClassGroupStudentMapper">
-		SELECT * FROM class_group_student_mapper WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ClassGroupStudentMapper">
-		SELECT * FROM class_group_student_mapper ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroupStudentMapper" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO class_group_student_mapper (id_,class_group_id_,user_id_,status_,create_time_)
-        VALUES(#{id},#{classGroupId},#{userId},#{status},now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroupStudentMapper">
-        UPDATE class_group_student_mapper
-        <set>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM class_group_student_mapper WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ClassGroupStudentMapper" parameterType="map">
-        SELECT * FROM class_group_student_mapper ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM class_group_student_mapper
-	</select>
-
-    <!-- 班级学生批量插入 -->
-    <insert id="classGroupStudentsInsert" parameterType="java.util.List">
-        INSERT INTO class_group_student_mapper (id_,class_group_id_,user_id_,status_,create_time_)
-        <foreach collection="classGroupStudentMapperList" item="item" index="index" separator=",">
-            (#{item.id},#{item.classGroupId},#{item.userId},#{item.status},#{item.createTime})
-        </foreach>
-    </insert>
-</mapper>

+ 0 - 100
mec-web/src/main/resources/config/mybatis/ClassGroupTeacherMapperMapper.xml

@@ -1,100 +0,0 @@
-<?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.ClassGroupTeacherMapperDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.ClassGroupTeacherMapper"
-               id="ClassGroupTeacherMapper">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <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="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="ClassGroupTeacherMapper">
-        SELECT *
-        FROM class_group_teacher_mapper WHERE id_ = #{id}
-    </select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="ClassGroupTeacherMapper">
-        SELECT *
-        FROM class_group_teacher_mapper
-        ORDER BY id_
-    </select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.ClassGroupTeacherMapper"
-            useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
-            AS ID FROM DUAL </selectKey> -->
-        INSERT INTO class_group_teacher_mapper
-        (id_,music_group_id_,class_group_id_,teacher_role_,user_id_,salary_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{classGroupId},#{teacherRole},#{userId},#{salary},#{createTime},#{updateTime})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.ClassGroupTeacherMapper">
-        UPDATE class_group_teacher_mapper
-        <set>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="id != null">
-                id_ = #{id},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="salary != null">
-                salary_ = #{salary},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="teacherRole != null">
-                teacher_role_ = #{teacherRole},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        DELETE FROM class_group_teacher_mapper WHERE
-        id_ = #{id}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ClassGroupTeacherMapper"
-            parameterType="map">
-        SELECT * FROM class_group_teacher_mapper ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM class_group_teacher_mapper
-    </select>
-
-    <!-- 批量插入班级老师 -->
-    <insert id="classGroupTeachersInsert" parameterType="java.util.List">
-        INSERT INTO class_group_teacher_mapper
-        (id_,music_group_id_,class_group_id_,teacher_role_,user_id_,salary_,create_time_,update_time_)
-        <foreach collection="classGroupTeacherMapperList" item="item" index="index" separator=",">
-            (#{item.id},#{item.musicGroupId},#{item.classGroupId},#{item.teacherRole},#{item.userId},#{item.salary},#{item.createTime},#{item.updateTime})
-        </foreach>
-    </insert>
-</mapper>

+ 0 - 91
mec-web/src/main/resources/config/mybatis/CooperationOrganMapper.xml

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

+ 0 - 147
mec-web/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -1,147 +0,0 @@
-<?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.CourseHomeworkDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseHomework" id="CourseHomework">
-		<result column="id_" property="id" />
-		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="attachments_" property="attachments" />
-		<result column="content_" property="content" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="completed_num_" property="completedNum" />
-		<result column="expect_num_" property="expectNum" />
-		<result column="next_class_date_" property="expiryDate" />
-	</resultMap>
-
-	<resultMap type="com.ym.mec.web.dal.dto.CourseHomeworkListDto" id="CourseHomeworkDto">
-		<result column="id_" property="id" />
-		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="content_" property="content" />
-		<result column="create_time_" property="createTime" />
-		<result column="start_class_time_" property="startClassTime" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="music_group_name_" property="musicGroupName" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="class_group_name_" property="classGroupName" />
-		<result column="completed_num_" property="completedNum" />
-		<result column="expect_num_" property="expectNum" />
-		<result column="next_class_date_" property="expiryDate" />
-		<result column="remark_" property="remark" />
-		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseHomework" >
-		SELECT * FROM course_homework WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseHomework">
-		SELECT * FROM course_homework ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseHomework" 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 (id_,course_schedule_id_,attachments_,content_,create_time_,update_time_,music_group_id_,class_group_id_,completed_num_,expect_num_) VALUES(#{id},#{courseScheduleId},#{attachments},#{content},now(),now(),#{musicGroupId},#{classGroupId},#{completedNum},#{expectNum})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomework">
-		UPDATE course_homework <set>
-		<if test="attachments != null">
-			attachments_ = #{attachments},
-		</if>
-		<if test="id != null">
-		id_ = #{id},
-		</if>
-		<if test="classGroupId != null">
-		class_group_id_ = #{classGroupId},
-		</if>
-		<if test="courseScheduleId != null">
-		course_schedule_id_ = #{courseScheduleId},
-		</if>
-		<if test="completedNum != null">
-			completed_num_ = #{completedNum},
-		</if>
-
-		<if test="expectNum != null">
-			expect_num_ = #{expectNum},
-		</if>
-		<if test="updateTime != null">
-		update_time_ = #{updateTime},
-		</if>
-		<if test="content != null">
-		content_ = #{content},
-		</if>
-		<if test="musicGroupId != null">
-		music_group_id_ = #{musicGroupId},
-		</if>
-		<if test="createTime != null">
-		create_time_ = #{createTime},
-		</if>
-		</set> WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM course_homework WHERE id_ = #{id} 
-	</delete>
-
-	<sql id="queryCondition">
-		<where>
-			<if test="createTime != null">
-				DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
-			</if>
-			<if test="musicGroupId != null">
-				and ch.music_group_id_ = #{musicGroupId}
-			</if>
-			<if test="classGroupId != null">
-				and ch.class_group_id_ = #{classGroupId}
-			</if>
-			<if test="userId != null">
-				and cs.actual_teacher_id_ = #{userId}
-			</if>
-		</where>
-	</sql>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseHomeworkDto" parameterType="map">
-		SELECT
-			ch.*,
-			mg.name_ music_group_name_,
-			cg.name_ class_group_name_,
-			temp.next_class_date_
-		FROM course_homework ch
-		LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
-		LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
-		LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-		LEFT JOIN (SELECT
-					class_group_id_,
-					MIN(CONCAT( class_date_, ' ', start_class_time_ )) next_class_date_
-					FROM
-					course_schedule
-					WHERE CONCAT( class_date_, ' ', start_class_time_ )>now()
-					GROUP BY class_group_id_) temp ON ch.class_group_id_=temp.class_group_id_
-		<include refid="queryCondition"/>
-		ORDER BY ch.id_
-		<include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_homework
-	</select>
-</mapper>

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

@@ -1,108 +0,0 @@
-<?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.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">
-		SELECT * FROM course_homework_template WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <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_,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">
-		SELECT COUNT(*) FROM course_homework_template
-	</select>
-
-    <select id="getSubjectIDs" resultType="java.lang.String">
-		SELECT
-			cg.subject_id_list_
-		FROM
-			course_schedule cs
-		LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-		WHERE cs.id_=#{courseScheduleID}
-	</select>
-
-</mapper>

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

@@ -1,227 +0,0 @@
-<?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.CourseScheduleDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.CourseSchedule" id="CourseSchedule">
-        <result column="id_" property="id"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="subsidy_" property="subsidy"/>
-        <result column="class_date_" property="classDate"/>
-        <result column="start_class_time_" property="startClassTime"/>
-        <result column="end_class_time_" property="endClassTime"/>
-        <result column="teacher_id_" property="teacherId"/>
-        <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="current_class_times_" property="currentClassTimes"/>
-    </resultMap>
-
-    <resultMap type="com.ym.mec.web.dal.dto.CourseScheduleDto" id="courseScheduleDto" extends="CourseSchedule">
-        <result column="name_" property="classGroupName"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="CourseSchedule">
-		SELECT * FROM course_schedule WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="CourseSchedule">
-		SELECT * FROM course_schedule ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseSchedule" 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
-        (id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,teacher_id_,actual_teacher_id_,create_time_,update_time_,current_class_times_)
-        VALUES(#{id},#{classGroupId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},#{endClassTime},#{teacherId},#{actualTeacherId},now(),now(),#{currentClassTimes})
-    </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_,current_class_times_)
-        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(),#{currentClassTimes})
-        </foreach>
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.CourseSchedule">
-        UPDATE course_schedule
-        <set>
-            <if test="classDate != null">
-                class_date_ = #{classDate},
-            </if>
-            <if test="endClassTime != null">
-                end_class_time_ = #{endClassTime},
-            </if>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="actualTeacherId != null">
-                actual_teacher_id_ = #{actualTeacherId},
-            </if>
-            <if test="subsidy != null">
-                subsidy_ = #{subsidy},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="startClassTime != null">
-                start_class_time_ = #{startClassTime},
-            </if>
-            <if test="teacherId != null">
-                teacher_id_ = #{teacherId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="currentClassTimes!=null">
-                current_class_times_=#{currentClassTimes}
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM course_schedule WHERE id_ = #{id} 
-	</delete>
-
-    <delete id="deleteCourseSchedulesByMusicGroupID">
-        DELETE
-          cs
-        FROM
-            course_schedule cs
-        INNER JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cg.music_group_id_=#{musicGroupID}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="CourseSchedule" parameterType="map">
-        SELECT * FROM course_schedule ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_schedule
-	</select>
-
-    <resultMap type="com.ym.mec.web.dal.dto.TeacherAttendanceDto" id="TeacherAttendanceViewUtilEntity">
-        <result property="courseScheduleId" column="id_"/>
-        <result property="classDate" column="class_date_"/>
-        <result property="startClassTime" column="start_class_time_"/>
-        <result property="endClassTime" column="end_class_time_"/>
-        <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="classId" column="class_id"/>
-        <result property="className" column="class_name"/>
-        <result property="classType" column="class_type"/>
-        <result property="musicGroupId" column="music_group_id"/>
-        <result property="musicGroupName" column="music_group_name"/>
-        <result property="schoolId" column="school_id_"/>
-        <result property="address" column="address_"/>
-        <result property="longitudeAndLatitude" column="longitude_latitude_"/>
-    </resultMap>
-
-    <select id="getCurrentCourseDetail"
-            resultMap="TeacherAttendanceViewUtilEntity">
-        SELECT
-            cs.id_ ,
-            cs.class_date_,
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            cs.end_class_time_,
-            cs.status_ course_status_,
-            cg.id_ class_id,
-            cg.name_ class_name,
-            cg.type_ class_type,
-            mg.id_ music_group_id,
-            mg.name_ music_group_name,
-            s.id_ school_id_,
-            s.address_,
-            s.longitude_latitude_
-        FROM
-            course_schedule cs
-        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-        LEFT JOIN school s ON mg.school_id_=s.id_
-        WHERE cs.id_= #{courseID}
-    </select>
-
-    <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.web.dal.dto.StudentAttendanceViewDto">
-        <result property="classGroupId" column="class_group_id_"/>
-        <result property="studentId" column="student_id_"/>
-        <result property="userName" column="username_"/>
-        <result property="musicGroupId" column="music_group_id_"/>
-        <result property="subjectId" column="subject_id_"/>
-        <result property="subjectName" column="subject_name_"/>
-        <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <select id="getCurrentCourseStudents" resultMap="studentAttendanceViewUtilEntity">
-        SELECT
-            cgsm.class_group_id_,
-            su.id_ student_id_,
-            su.username_,
-            mg.id_ music_group_id_,
-            s.id_ subject_id_,
-            s.name_ subject_name_,
-            cgsm.status_
-        FROM
-            class_group cg
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-        LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-        LEFT JOIN `subject` s ON cg.subject_id_=s.id_
-        WHERE cgsm.class_group_id_=#{classID} AND cgsm.status_!="DROP_OUT"
-    </select>
-
-    <select id="countStudentInClass" resultType="java.lang.Integer">
-        SELECT
-            COUNT(class_group_id_)
-        FROM
-            class_group_student_mapper cgsm
-        WHERE class_group_id_ IN
-        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        GROUP BY user_id_
-    </select>
-
-    <select id="getCourseSchedulesWithDate" resultMap="courseScheduleDto">
-        SELECT
-            cg.*,
-            cs.class_date_,
-            cs.start_class_time_
-        FROM
-            course_schedule cs
-        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cs.class_date_=DATE_FORMAT(#{classDate},'%Y%m%d')
-    </select>
-
-    <select id="getCourseScheduleDateByMonth" resultType="java.util.Date">
-        SELECT
-            cs.class_date_
-        FROM
-            course_schedule cs
-        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE DATE_FORMAT(cs.class_date_,'%Y%m')=DATE_FORMAT(#{month},'%Y%m')
-        AND cg.music_group_id_=#{musicGroupID}
-        GROUP BY cs.class_date_
-    </select>
-</mapper>

+ 0 - 84
mec-web/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -1,84 +0,0 @@
-<?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>

+ 0 - 172
mec-web/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -1,172 +0,0 @@
-<?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.EmployeeDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.Employee" id="Employee">
-		<result column="user_id_" property="userId" />
-		<result column="organ_id_" property="organId" />
-		<result column="job_nature_" property="jobNature" />
-		<result column="is_probation_period_" property="isProbationPeriod" />
-		<result column="education_background_" property="educationBackground" />
-		<result column="graduate_school_" property="graduateSchool" />
-		<result column="technical_titles_" property="technicalTitles" />
-		<result column="entry_date_" property="entryDate" />
-		<result column="certificate_type_" property="certificateType" />
-		<result column="certificate_num_" property="certificateNum" />
-		<result column="update_time_" property="updateTime" />
-		<result column="create_time_" property="createTime" />
-		<result column="introduction_" property="introduction" />
-		<result column="demission_date_" property="demissionDate" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="Employee" >
-		SELECT * FROM employee WHERE user_id_ = #{userId} 
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="Employee">
-		SELECT * FROM employee ORDER BY user_id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.Employee" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO employee (user_id_,organ_id_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_) VALUES(#{userId},#{organId},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.Employee">
-		UPDATE employee <set>
-        <if test="isProbationPeriod != null">
-        is_probation_period_ = #{isProbationPeriod},
-        </if>
-        <if test="graduateSchool != null">
-        graduate_school_ = #{graduateSchool},
-        </if>
-        <if test="organId != null">
-        organ_id_ = #{organId},
-        </if>
-        <if test="introduction != null">
-        introduction_ = #{introduction},
-        </if>
-        <if test="technicalTitles != null">
-        technical_titles_ = #{technicalTitles},
-        </if>
-        <if test="entryDate != null">
-        entry_date_ = #{entryDate},
-        </if>
-        <if test="jobNature != null">
-        job_nature_ = #{jobNature},
-        </if>
-        <if test="createTime != null">
-        create_time_ = #{createTime},
-        </if>
-        <if test="userId != null">
-        user_id_ = #{userId},
-        </if>
-        <if test="certificateType != null">
-        certificate_type_ = #{certificateType},
-        </if>
-        <if test="updateTime != null">
-        update_time_ = #{updateTime},
-        </if>
-        <if test="educationBackground != null">
-        education_background_ = #{educationBackground},
-        </if>
-        <if test="certificateNum != null">
-        certificate_num_ = #{certificateNum},
-        </if>
-        <if test="demissionDate != null">
-        demission_date_ = #{demissionDate},
-        </if>
-        </set> WHERE user_id_ = #{userId}
-	</update>
-
-    <update id="updatePassword">
-        UPDATE sys_user SET password_ = #{password} WHERE id_ = #{userID}
-    </update>
-
-    <update id="updateUserLockStatus">
-		UPDATE sys_user SET lock_flag_ = IF(lock_flag_=0,9,0) WHERE id_=#{userID}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM employee WHERE user_id_ = #{userId} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="Employee" parameterType="map">
-		SELECT * FROM employee ORDER BY user_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM employee
-	</select>
-
-    <resultMap type="com.ym.mec.web.dal.dto.EmployeeDto" id="EmployeeDto">
-        <result property="id" column="id_" />
-        <result property="username" column="username_" />
-        <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="phone" column="phone_" />
-        <result property="lockFlag" column="role_name_" />
-        <result property="roleName" column="lock_flag_" />
-        <result property="jobNature" column="job_nature_" />
-        <result property="entryDate" column="entry_date_" />
-        <result property="demissionDate" column="demission_date_" />
-    </resultMap>
-
-    <sql id="queryCondition">
-        <where>
-            <if test="organId != null">
-                and su.organ_id_ = #{organId}
-            </if>
-            <if test="roleId != null">
-                and sr.id_ = #{roleId}
-            </if>
-            <if test="userNameOrPhone != null">
-                and (su.username_ like LIKE CONCAT('%',#{userNameOrPhone},'%')
-                or su.phone_ like LIKE CONCAT('%',#{userNameOrPhone},'%') or )
-            </if>
-        </where>
-    </sql>
-
-    <select id="queryEmployByOrganId" resultMap="EmployeeDto">
-        SELECT
-        su.id_,
-        su.username_,
-        su.gender_,
-        su.phone_,
-        sr.role_name_,
-        su.lock_flag_,
-        e.job_nature_,
-        e.entry_date_,
-        e.demission_date_
-        FROM
-        sys_user su
-        LEFT JOIN employee e ON su.id_=e.user_id_
-        LEFT JOIN sys_user_role sur ON su.id_=sur.user_id_
-        LEFT JOIN sys_role sr ON sur.role_id_=sr.id_
-        <include refid="queryCondition"/>
-    </select>
-
-    <select id="queryEmployByOrganIdCount" resultType="java.lang.Integer">
-		SELECT
-			count(*)
-		FROM
-			sys_user su
-		LEFT JOIN employee e ON su.id_=e.user_id_
-		LEFT JOIN sys_user_role sur ON su.id_=sur.user_id_
-		LEFT JOIN sys_role sr ON sur.role_id_=sr.id_
-	</select>
-</mapper>

+ 0 - 21
mec-web/src/main/resources/config/mybatis/Global.mapper.xml

@@ -1,21 +0,0 @@
-<?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="global">
-
-	<sql id="limit">
-		<if test="offset != null">
-			 limit #{offset},#{rows}
-		</if>
-	</sql>
-
-	<sql id="orderby">
-		<if test="sort != null and sort != ''">
-			 ORDER BY ${sort}
-			 <if test="order != null and order != ''">
-			 	${order}
-			 </if>
-		</if>
-	</sql>	
- </mapper>

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

@@ -1,82 +0,0 @@
-<?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.GoodsCategoryDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.GoodsCategory" id="GoodsCategory">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="img_" property="img"/>
-        <result column="parent_id_" property="parentId"/>
-        <result column="order_no_" property="orderNo"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="desc_" property="desc"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="create_time_" property="createTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="GoodsCategory">
-		SELECT * FROM goods_category WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="GoodsCategory">
-		SELECT * FROM goods_category ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsCategory" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO goods_category (id_,name_,img_,parent_id_,order_no_,desc_,update_time_,create_time_)
-        VALUES(#{id},#{name},#{img},#{parentId},#{orderNo},#{desc},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsCategory">
-        UPDATE goods_category
-        <set>
-            <if test="parentId != null">
-                parent_id_ = #{parentId},
-            </if>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="orderNo != null">
-                order_no_ = #{orderNo},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="img != null">
-                img_ = #{img},
-            </if>
-            <if test="desc != null">
-                desc_ = #{desc},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM goods_category WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="GoodsCategory" parameterType="map">
-        SELECT * FROM goods_category ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM goods_category
-	</select>
-</mapper>

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

@@ -1,146 +0,0 @@
-<?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.GoodsDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.Goods" id="Goods">
-        <result column="id_" property="id"/>
-        <result column="goods_category_id_" property="goodsCategoryId"/>
-        <result column="sn_" property="sn"/>
-        <result column="name_" property="name"/>
-        <result column="brand_" property="brand"/>
-        <result column="specification_" property="specification"/>
-        <result column="image_" property="image"/>
-        <result column="stock_count_" property="stockCount"/>
-        <result column="sell_count_" property="sellCount"/>
-        <result column="market_price_" property="marketPrice"/>
-        <result column="discount_price_" property="discountPrice"/>
-        <result column="group_purchase_price_" property="groupPurchasePrice"/>
-        <result column="brief_" property="brief"/>
-        <result column="desc_" property="desc"/>
-        <result column="is_new_" property="isNew" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="is_top_" property="isTop" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="memo_" property="memo"/>
-        <result column="publish_time_" property="publishTime"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="complement_goods_id_list_" property="complementGoodsIdList"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="Goods">
-		SELECT * FROM goods WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="Goods">
-		SELECT * FROM goods ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Goods" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO goods
-        (id_,goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,sell_count_,market_price_,discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,complement_goods_id_list_,update_time_,create_time_)
-        VALUES(#{id},#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{sellCount},#{marketPrice},#{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
-        #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{publishTime},#{complementGoodsIdList},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.Goods">
-        UPDATE goods
-        <set>
-            <if test="specification != null">
-                specification_ = #{specification},
-            </if>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="isTop != null">
-                is_top_ = #{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="sn != null">
-                sn_ = #{sn},
-            </if>
-            <if test="marketPrice != null">
-                market_price_ = #{marketPrice},
-            </if>
-            <if test="memo != null">
-                memo_ = #{memo},
-            </if>
-            <if test="isNew != null">
-                is_new_ = #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="groupPurchasePrice != null">
-                group_purchase_price_ = #{groupPurchasePrice},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="stockCount != null">
-                stock_count_ = #{stockCount},
-            </if>
-            <if test="goodsCategoryId != null">
-                goods_category_id_ = #{goodsCategoryId},
-            </if>
-            <if test="brand != null">
-                brand_ = #{brand},
-            </if>
-            <if test="brief != null">
-                brief_ = #{brief},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="discountPrice != null">
-                discount_price_ = #{discountPrice},
-            </if>
-            <if test="sellCount != null">
-                sell_count_ = #{sellCount},
-            </if>
-            <if test="image != null">
-                image_ = #{image},
-            </if>
-            <if test="desc != null">
-                desc_ = #{desc},
-            </if>
-            <if test="publishTime != null">
-                publish_time_ = #{publishTime},
-            </if>
-            <if test="complementGoodsIdList != null">
-                complement_goods_id_list_ = #{complementGoodsIdList},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM goods WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="Goods" parameterType="map">
-        SELECT * FROM goods ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM goods
-	</select>
-
-    <select id="findGoodsBySubId" resultMap="Goods">
-        SELECT g.* FROM subject_goods_mapper sgm LEFT JOIN goods g ON sgm.goods_id_ = g.id_
-        WHERE sgm.subject_id_ =  #{subjectId} AND g.goods_category_id_ = #{goodsCategoryId}
-    </select>
-
-    <!-- 根据 -->
-    <select id="findGoodsNumByCategoryId" resultType="int">
-        SELECT COUNT(*) FROM goods WHERE goods_category_id_ = #{goodsCategoryId}
-    </select>
-</mapper>

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

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.web.dal.dao.GoodsOrderItemDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrderItem"
-		id="GoodsOrderItem">
-		<result column="id_" property="id" />
-		<result column="goods_order_id_" property="goodsOrderId" />
-		<result column="goods_id_" property="goodsId" />
-		<result column="market_price_" property="marketPrice" />
-		<result column="discount_price_" property="discountPrice" />
-		<result column="goods_quantity_" property="goodsQuantity" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="GoodsOrderItem">
-		SELECT * FROM
-		goods_order_item WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="GoodsOrderItem">
-		SELECT * FROM goods_order_item
-		ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrderItem"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO goods_order_item
-		(id_,goods_order_id_,goods_id_,market_price_,discount_price_,goods_quantity_,create_time_,update_time_)
-		VALUES(#{id},#{goodsOrderId},#{goodsId},#{marketPrice},#{discountPrice},#{goodsQuantity},now(),now())
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrderItem">
-		UPDATE goods_order_item
-		<set>
-			<if test="goodsQuantity != null">
-				goods_quantity_ = #{goodsQuantity},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="marketPrice != null">
-				market_price_ = #{marketPrice},
-			</if>
-			<if test="discountPrice != null">
-				discount_price_ = #{discountPrice},
-			</if>
-			<if test="goodsOrderId != null">
-				goods_order_id_ = #{goodsOrderId},
-			</if>
-			<if test="goodsId != null">
-				goods_id_ = #{goodsId},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM goods_order_item WHERE id_ =
-		#{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="GoodsOrderItem" parameterType="map">
-		SELECT * FROM goods_order_item ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		goods_order_item
-	</select>
-</mapper>

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

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.web.dal.dao.GoodsOrderDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrder" id="GoodsOrder">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="total_amount_" property="totalAmount" />
-		<result column="coupon_amount_" property="couponAmount" />
-		<result column="goods_quantity_" property="goodsQuantity" />
-		<result column="user_note_" property="userNote" />
-		<result column="order_no_" property="orderNo" />
-		<result column="order_source_" property="orderSource" />
-		<result column="receiver_id_" property="receiverId" />
-		<result column="express_company_code_" property="expressCompanyCode" />
-		<result column="express_num_" property="expressNum" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="GoodsOrder">
-		SELECT * FROM
-		goods_order WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="GoodsOrder">
-		SELECT * FROM goods_order ORDER
-		BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrder"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO goods_order
-		(id_,user_id_,status_,total_amount_,coupon_amount_,goods_quantity_,user_note_,order_no_,order_source_,receiver_id_,express_company_code_,express_num_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{totalAmount},#{couponAmount},#{goodsQuantity},#{userNote},#{orderNo},#{orderSource},#{receiverId},#{expressCompanyCode},#{expressNum},now(),now())
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrder">
-		UPDATE goods_order
-		<set>
-			<if test="status != null">
-				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="goodsQuantity != null">
-				goods_quantity_ = #{goodsQuantity},
-			</if>
-			<if test="orderNo != null">
-				order_no_ = #{orderNo},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-			<if test="receiverId != null">
-				receiver_id_ = #{receiverId},
-			</if>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-			<if test="userNote != null">
-				user_note_ = #{userNote},
-			</if>
-			<if test="orderSource != null">
-				order_source_ = #{orderSource},
-			</if>
-			<if test="totalAmount != null">
-				total_amount_ = #{totalAmount},
-			</if>
-			<if test="couponAmount != null">
-				coupon_amount_ = #{couponAmount},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="expressCompanyCode != null">
-				express_company_code_ = #{expressCompanyCode},
-			</if>
-			<if test="expressNum != null">
-				express_num_ = #{expressNum},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM goods_order WHERE id_ = #{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="GoodsOrder" parameterType="map">
-		SELECT * FROM goods_order ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		goods_order
-	</select>
-</mapper>

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

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.web.dal.dao.GoodsOrderPaymentDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.GoodsOrderPayment"
-		id="GoodsOrderPayment">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="goods_order_id_" property="goodsOrderId" />
-		<result column="payment_channel_" property="paymentChannel" />
-		<result column="payment_business_channel_" property="paymentBusinessChannel" />
-		<result column="payment_account_no_" property="paymentAccountNo" />
-		<result column="amount_" property="amount" />
-		<result column="trans_no_" property="transNo" />
-		<result column="order_no_" property="orderNo" />
-		<result column="pay_status_" property="payStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="arrival_time_" property="arrivalTime" />
-		<result column="remark_" property="remark" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="GoodsOrderPayment">
-		SELECT * FROM
-		goods_order_payment WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="GoodsOrderPayment">
-		SELECT * FROM goods_order_payment
-		ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.GoodsOrderPayment"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO goods_order_payment
-		(id_,user_id_,goods_order_id_,payment_channel_,payment_business_channel_,payment_account_no_,amount_,trans_no_,order_no_,pay_status_,arrival_time_,remark_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{goodsOrderId},#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{amount},#{transNo},#{orderNo},#{payStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{arrivalTime},#{remark},now(),now())
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.GoodsOrderPayment">
-		UPDATE goods_order_payment
-		<set>
-			<if test="payStatus != null">
-				pay_status_ = #{payStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="orderNo != null">
-				order_no_ = #{orderNo},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="amount != null">
-				amount_ = #{amount},
-			</if>
-			<if test="arrivalTime != null">
-				arrival_time_ = #{arrivalTime},
-			</if>
-			<if test="paymentChannel != null">
-				payment_channel_ = #{paymentChannel},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-			<if test="remark != null">
-				remark_ = #{remark},
-			</if>
-			<if test="paymentAccountNo != null">
-				payment_account_no_ = #{paymentAccountNo},
-			</if>
-			<if test="paymentBusinessChannel != null">
-				payment_business_channel_ = #{paymentBusinessChannel},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="goodsOrderId != null">
-				goods_order_id_ = #{goodsOrderId},
-			</if>
-			<if test="transNo != null">
-				trans_no_ = #{transNo},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM goods_order_payment WHERE id_ =
-		#{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="GoodsOrderPayment"
-		parameterType="map">
-		SELECT * FROM goods_order_payment ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		goods_order_payment
-	</select>
-</mapper>

+ 0 - 72
mec-web/src/main/resources/config/mybatis/HotWordsLabelMapper.xml

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

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

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

+ 0 - 76
mec-web/src/main/resources/config/mybatis/MusicGroupBuildLogMapper.xml

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

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

@@ -1,135 +0,0 @@
-<?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.MusicGroupDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroup" id="MusicGroup">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="organ_id_" property="organId" />
-		<result column="school_id_" property="schoolId" />
-		<result column="apply_expire_date_" property="applyExpireDate" />
-		<result column="team_teacher_id_" property="teamTeacherId" />
-		<result column="educational_teacher_id_" property="educationalTeacherId" />
-		<result column="charge_type_id_" property="chargeTypeId" />
-		<result column="course_form_" property="courseForm" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="status_" property="status" />
-		<result column="bill_start_date_" property="billStartDate" />
-		<result column="improvent_classes_num_" property="improventClassesNum" />
-		<result column="enroll_classes_" property="enrollClasses" />
-		<result column="payment_expire_date_" property="paymentExpireDate" />
-		<result column="is_extra_class_" property="isExtraClass" />
-		<result column="cooperation_organ_id_" property="cooperationOrganId" />
-		<result column="enlightenment_course_time_" property="enlightenmentCourseTime" />
-		<result column="parent_meeting_time_" property="parentMeetingTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroup">
-		SELECT * FROM
-		music_group WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroup">
-		SELECT * FROM music_group ORDER
-		BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroup"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO music_group
-		(id_,name_,organ_id_,school_id_,apply_expire_date_,team_teacher_id_,educational_teacher_id_,charge_type_id_,course_form_,create_time_,update_time_,status_,bill_start_date_,improvent_classes_num_,enroll_classes_,payment_expire_date_,is_extra_class_,cooperation_organ_id_,enlightenment_course_time_,parent_meeting_time_)
-		VALUES(#{id},#{name},#{organId},#{schoolId},#{applyExpireDate},#{teamTeacherId},#{educationalTeacherId},#{chargeTypeId},#{courseForm},#{createTime},#{updateTime},#{status},#{billStartDate},#{improventClassesNum},#{enrollClasses},#{paymentExpireDate},#{isExtraClass},#{cooperationOrganId},#{enlightenmentCourseTime},#{parentMeetingTime})
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroup">
-		UPDATE music_group
-		<set>
-			<if test="status != null">
-				status_ = #{status},
-			</if>
-			<if test="organId != null">
-				organ_id_ = #{organId},
-			</if>
-			<if test="improventClassesNum != null">
-				improvent_classes_num_ = #{improventClassesNum},
-			</if>
-			<if test="id != null">
-				id_ = #{id},
-			</if>
-			<if test="courseForm != null">
-				course_form_ = #{courseForm},
-			</if>
-			<if test="chargeTypeId != null">
-				charge_type_id_ = #{chargeTypeId},
-			</if>
-			<if test="educationalTeacherId != null">
-				educational_teacher_id_ = #{educationalTeacherId},
-			</if>
-			<if test="enrollClasses != null">
-				enroll_classes_ = #{enrollClasses},
-			</if>
-			<if test="name != null">
-				name_ = #{name},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-			<if test="isExtraClass != null">
-				is_extra_class_ = #{isExtraClass},
-			</if>
-			<if test="paymentExpireDate != null">
-				payment_expire_date_ = #{paymentExpireDate},
-			</if>
-			<if test="schoolId != null">
-				school_id_ = #{schoolId},
-			</if>
-			<if test="applyExpireDate != null">
-				apply_expire_date_ = #{applyExpireDate},
-			</if>
-			<if test="billStartDate != null">
-				bill_start_date_ = #{billStartDate},
-			</if>
-			<if test="cooperationOrganId != null">
-				cooperation_organ_id_ = #{cooperationOrganId},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="enlightenmentCourseTime != null">
-				enlightenment_course_time_ = #{enlightenmentCourseTime},
-			</if>
-			<if test="teamTeacherId != null">
-				team_teacher_id_ = #{teamTeacherId},
-			</if>
-			<if test="parentMeetingTime != null">
-				parent_meeting_time_ = #{parentMeetingTime},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM music_group WHERE id_ = #{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroup" parameterType="map">
-		SELECT * FROM music_group ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		music_group
-	</select>
-</mapper>

+ 0 - 75
mec-web/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -1,75 +0,0 @@
-<?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.MusicGroupPaymentCalenderDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender" id="MusicGroupPaymentCalender">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="payment_month_" property="paymentMonth"/>
-        <result column="start_payment_date_" property="startPaymentDate"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="MusicGroupPaymentCalender">
-		SELECT * FROM music_group_payment_calender WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="MusicGroupPaymentCalender">
-		SELECT * FROM music_group_payment_calender ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO music_group_payment_calender
-        (id_,music_group_id_,payment_month_,start_payment_date_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{paymentMonth},#{startPaymentDate},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentCalender">
-        UPDATE music_group_payment_calender
-        <set>
-            <if test="startPaymentDate != null">
-                start_payment_date_ = #{startPaymentDate},
-            </if>
-            <if test="paymentMonth != null">
-                payment_month_ = #{paymentMonth},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM music_group_payment_calender WHERE id_ = #{id} 
-	</delete>
-
-    <delete id="delByGroupId">
-        DELETE FROM music_group_payment_calender WHERE music_group_id_ = #{musicGroupId}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="MusicGroupPaymentCalender" parameterType="map">
-        SELECT * FROM music_group_payment_calender ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender
-	</select>
-</mapper>

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

@@ -1,76 +0,0 @@
-<?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.MusicGroupPaymentEntitiesDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities" id="MusicGroupPaymentEntities">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="name_" property="name" />
-		<result column="payment_method_" property="paymentMethod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="amount_" property="amount" />
-		<result column="memo_" property="memo" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroupPaymentEntities" >
-		SELECT * FROM music_group_payment_entities WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroupPaymentEntities">
-		SELECT * FROM music_group_payment_entities ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now())
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupPaymentEntities">
-		UPDATE music_group_payment_entities
-		<set>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="amount != null">
-				amount_ = #{amount},
-			</if>
-			<if test="memo != null">
-				memo_ = #{memo},
-			</if>
-			<if test="paymentMethod != null">
-				payment_method_ = #{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="musicGroupId != null">
-				music_group_id_ = #{musicGroupId},
-			</if>
-			<if test="name != null">
-				name_ = #{name},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_group_payment_entities WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupPaymentEntities" parameterType="map">
-		SELECT * FROM music_group_payment_entities ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_entities
-	</select>
-</mapper>

+ 0 - 75
mec-web/src/main/resources/config/mybatis/MusicGroupPurchaseListMapper.xml

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

+ 0 - 70
mec-web/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

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

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

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.web.dal.dao.MusicGroupSubjectGoodsGroupDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup"
-		id="MusicGroupSubjectGoodsGroup">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="goods_id_list_" property="goodsIdList" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="price_" property="price" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicGroupSubjectGoodsGroup">
-		SELECT
-		* FROM music_group_subject_goods_group WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicGroupSubjectGoodsGroup">
-		SELECT * FROM
-		music_group_subject_goods_group ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert"
-		parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_subject_goods_group
-		(id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_)
-		VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price})
-	</insert>
-
-    <insert id="batchInsert" parameterType="java.util.List">
-		INSERT INTO music_group_subject_goods_group (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_) VALUES
-		<foreach collection="mappers" item="item" index="index" separator=",">
-			VALUES(#{item.id},#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.musicGroupId},#{item.subjectId},#{item.goodsIdList},NOW(),NOW(),#{item.price})
-		</foreach>
-	</insert>
-
-    <!-- 根据主键查询一条记录 -->
-	<update id="update"
-		parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup">
-		UPDATE music_group_subject_goods_group
-		<set>
-			<if test="price != null">
-				price_ = #{price},
-			</if>
-			<if test="subjectId != null">
-				subject_id_ = #{subjectId},
-			</if>
-			<if test="goodsIdList != null">
-				goods_id_list_ = #{goodsIdList},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="type != null">
-				type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="musicGroupId != null">
-				music_group_id_ = #{musicGroupId},
-			</if>
-			<if test="name != null">
-				name_ = #{name},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM music_group_subject_goods_group
-		WHERE id_ = #{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicGroupSubjectGoodsGroup"
-		parameterType="map">
-		SELECT * FROM music_group_subject_goods_group ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		music_group_subject_goods_group
-	</select>
-
-	<resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup" id="findGoodsGroupMap">
-		<result column="name_" property="name" />
-		<result column="type_" property="type" />
-		<result column="price_" property="price" />
-		<result column="id_" property="id" />
-		<collection property="goodsName" column="goods_name_" ofType="java.lang.String" javaType="java.util.List"/>
-	</resultMap>
-    <select id="findGoodsGroup" resultMap="findGoodsGroupMap">
-		SELECT mgs.name_,mgs.type_,mgs.price_,g.name_ goods_name_,mgs.id_ FROM music_group_subject_goods_group mgs
-		LEFT JOIN goods g ON g.id_ IN (mgs.goods_id_list_)
-		WHERE mgs.music_group_id_ = #{musicGroupId} AND mgs.subject_id_ = #{subId}
-	</select>
-</mapper>

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

@@ -1,100 +0,0 @@
-<?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.MusicGroupSubjectPlanDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" id="MusicGroupSubjectPlan">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="expected_student_num_" property="expectedStudentNum"/>
-        <result column="apply_student_num_" property="applyStudentNum"/>
-        <result column="fee_" property="fee"/>
-        <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="deposit_fee_" property="depositFee"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="MusicGroupSubjectPlan">
-        SELECT * FROM music_group_subject_plan WHERE id_ = #{id}
-    </select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="MusicGroupSubjectPlan">
-        SELECT *
-        FROM music_group_subject_plan
-        ORDER BY id_
-    </select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO music_group_subject_plan
-        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.MusicGroupSubjectPlan">
-        UPDATE music_group_subject_plan
-        <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="applyStudentNum != null">
-                apply_student_num_ = #{applyStudentNum},
-            </if>
-            <if test="fee != null">
-                fee_ = #{fee},
-            </if>
-            <if test="kitGroupPurchaseType != null">
-                kit_group_purchase_type_ =
-                #{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="depositFee != null">
-                deposit_fee_ = #{depositFee},
-            </if>
-            <if test="expectedStudentNum != null">
-                expected_student_num_ = #{expectedStudentNum},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        DELETE FROM music_group_subject_plan WHERE id_ = #{id}
-    </delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="MusicGroupSubjectPlan" parameterType="map">
-        SELECT * FROM music_group_subject_plan ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM music_group_subject_plan
-    </select>
-
-    <!-- 查询乐团科目计划表 -->
-    <select id="getMusicSubjectClassPlan" resultMap="MusicGroupSubjectPlan">
-        SELECT sp.*, sb.name_
-        FROM music_group_subject_plan sp
-        LEFT JOIN subject sb ON sb.id_ = sp.subject_id_
-        WHERE sp.music_group_id_=#{musicGroupId}
-    </select>
-</mapper>

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

@@ -1,103 +0,0 @@
-<?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.OrganizationDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.Organization" id="Organization">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <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="register_date_" property="registerDate"/>
-        <result column="linkman_" property="linkman"/>
-        <result column="mobile_" property="mobile"/>
-        <result column="address_" property="address"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="Organization">
-		SELECT * FROM organization WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="Organization">
-		SELECT * FROM organization ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        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>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.Organization">
-        UPDATE organization
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="areaId != null">
-                area_id_ = #{areaId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="registerDate != null">
-                register_date_ = #{registerDate},
-            </if>
-            <if test="linkman != null">
-                linkman_ = #{linkman},
-            </if>
-            <if test="mobile != null">
-                mobile_ = #{mobile},
-            </if>
-            <if test="address != null">
-                address_ = #{address},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		UPDATE organization SET del_flag_ = 1 WHERE id_ = #{id}
-	</delete>
-
-    <sql id="queryPageSql">
-        <where>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="Organization" parameterType="map">
-        SELECT * FROM organization
-        <include refid="queryPageSql"/>
-         ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM organization <include refid="queryPageSql"/>
-	</select>
-
-    <select id="findByParentId" resultMap="Organization">
-        SELECT * FROM organization <include refid="queryPageSql"/>
-    </select>
-    <select id="findByOrganIds" resultType="java.lang.String">
-        SELECT name_ FROM organization IN (#{organIds}) WHERE del_flag_ = 0
-    </select>
-</mapper>

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

@@ -1,107 +0,0 @@
-<?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.SchoolDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.School" id="School">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="address_" property="address"/>
-        <result column="contact_phone_" property="contactPhone"/>
-        <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="contact_name_" property="contactName"/>
-        <result column="longitude_latitude_" property="longitudeLatitude"/>
-        <result column="subsidy_" property="subsidy"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="School">
-		SELECT * FROM school WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="School">
-		SELECT * FROM school ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.School" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO school
-        (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>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.School">
-        UPDATE school
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="contactPhone != null">
-                contact_phone_ = #{contactPhone},
-            </if>
-            <if test="longitudeLatitude != null">
-                longitude_latitude_ = #{longitudeLatitude},
-            </if>
-            <if test="address != null">
-                address_ = #{address},
-            </if>
-            <if test="contactName != null">
-                contact_name_ = #{contactName},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="subsidy != null">
-                subsidy_ = #{subsidy},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		UPDATE school SET del_flag_ = 1 WHERE id_ = #{id}
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="School" parameterType="map">
-        SELECT * FROM school ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM school
-	</select>
-    <select id="queryByOrganId" resultMap="School">
-        SELECT * FROM school
-        <where>
-            <if test="organId != null">
-                organ_id_ = #{organId}
-            </if>
-            <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-        </where>
-    </select>
-</mapper>

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

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

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

@@ -1,210 +0,0 @@
-<?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.StudentAttendanceDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentAttendance" id="StudentAttendance">
-        <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="course_schedule_id_" property="courseScheduleId"/>
-        <result column="user_id_" property="userId"/>
-        <result column="teacher_id_" property="teacherId"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="remark_" property="remark"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentAttendance">
-		SELECT * FROM student_attendance WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentAttendance">
-		SELECT * FROM student_attendance ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentAttendance" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO student_attendance
-        (id_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
-        VALUES(#{id},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark})
-    </insert>
-
-    <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-      INSERT INTO student_attendance ( music_group_id_, class_group_id_, course_schedule_id_, user_id_, teacher_id_, status_, create_time_, remark_ )
-      VALUES
-	  <foreach collection="list" item="studentAttendance" separator=",">
-          (#{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},#{studentAttendance.userId},#{studentAttendance.teacherId},#{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.remark})
-      </foreach>
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentAttendance">
-        UPDATE student_attendance
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="remark != null">
-                remark_ = #{remark},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="teacherId != null">
-                teacher_id_ = #{teacherId},
-            </if>
-            <if test="courseScheduleId != null">
-                course_schedule_id_ = #{courseScheduleId},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM student_attendance WHERE id_ = #{id} 
-	</delete>
-
-    <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.web.dal.dto.StudentAttendanceViewDto">
-        <result property="classGroupId" column="class_group_id_"/>
-        <result property="studentId" column="student_id_"/>
-        <result property="userName" column="username_"/>
-        <result property="musicGroupId" column="music_group_id_"/>
-        <result property="subjectId" column="subject_id_"/>
-        <result property="subjectName" column="subject_name_"/>
-        <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="studentAttendanceViewUtilEntity" parameterType="map">
-        SELECT
-        cgsm.class_group_id_,
-        su.id_ student_id_,
-        su.username_,
-        mg.id_ music_group_id_,
-        s.id_ subject_id_,
-        s.name_ subject_name_,
-        cgsm.status_
-        FROM
-        class_group cg
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-        LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-        LEFT JOIN `subject` s ON cg.subject_id_=s.id_
-        WHERE cgsm.class_group_id_=#{classId}
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*)
-		FROM
-        class_group cg
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-        LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-        LEFT JOIN `subject` s ON cg.subject_id_=s.id_
-        WHERE cgsm.class_group_id_=#{classId}
-	</select>
-
-    <select id="countStudentStatus" resultType="com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity">
-        SELECT
-            status_ studentStatus,
-            COUNT(user_id_) numberOfStudent
-        FROM
-            class_group_student_mapper
-        WHERE class_group_id_=#{classId}
-        GROUP BY status_
-    </select>
-
-    <select id="getStudentAttendanceInfo" parameterType="com.ym.mec.web.dal.entity.StudentAttendance" resultMap="StudentAttendance">
-        SELECT
-            cgsm.class_group_id_,
-            su.id_ user_id_,
-            mg.id_ music_group_id_,
-            s.id_ subject_id_,
-            #{teacherId} teacher_id_,
-            #{status} status_,
-            #{remark} remark_,
-            #{courseScheduleId} course_schedule_id_
-        FROM
-            sys_user su
-            LEFT JOIN class_group_student_mapper cgsm ON cgsm.user_id_ = su.id_
-            LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
-            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-            LEFT JOIN `subject` s ON cg.subject_id_ = s.id_
-        WHERE
-            su.id_=#{userId}
-    </select>
-
-    <resultMap id="studentPersonalAttendance" type="com.ym.mec.web.dal.dto.StudentPersonalAttendanceDto">
-        <result property="classDate" column="class_date_"/>
-        <result property="startClassTime" column="start_class_time_"/>
-        <result property="type" column="type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="className" column="name_"/>
-        <result property="teacherName" column="username_"/>
-        <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <sql id="queryCondition">
-        <where>
-            <if test="studentID != null">
-                and sa.user_id_ = #{studentID}
-            </if>
-            <if test="musicGroupId != null">
-                and sa.music_group_id_ = #{musicGroupId}
-            </if>
-            <if test="classGroupId != null">
-                and sa.class_group_id_ = #{classGroupId}
-            </if>
-            <if test="status != null">
-                and sa.status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-        </where>
-    </sql>
-
-    <select id="queryStudentPersonalAttendances" resultMap="studentPersonalAttendance">
-        SELECT
-            cs.class_date_,
-            cs.start_class_time_,
-            cg.type_,
-            cg.name_,
-            su.username_,
-            sa.status_
-        FROM
-            student_attendance sa
-        LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-        LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_
-        LEFT JOIN sys_user su ON sa.teacher_id_=su.id_
-        <include refid="queryCondition"/>
-    </select>
-
-    <select id="queryStudentPersonalAttendancesCount" resultType="int">
-        SELECT
-        count(*)
-        FROM
-        student_attendance sa
-        LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-        LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_
-        LEFT JOIN sys_user su ON sa.teacher_id_=su.id_
-        <include refid="queryCondition"/>
-    </select>
-</mapper>

+ 0 - 202
mec-web/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -1,202 +0,0 @@
-<?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.StudentCourseHomeworkDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentCourseHomework" id="StudentCourseHomework">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId"/>
-		<result column="course_homework_id_" property="courseHomeworkId" />
-		<result column="attachments_" property="attachments" />
-		<result column="score_" property="score" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="remark_" property="remark" />
-		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-	</resultMap>
-
-	<resultMap type="com.ym.mec.web.dal.dto.CourseHomeworkStudentDetailDto" id="CourseHomeworkStudentDetailDto">
-		<result column="musicGroupName" property="musicGroupName" />
-		<result column="classGroupName" property="classGroupName"/>
-		<result column="id_" property="courseHomeworkId" />
-		<result column="content_" property="content" />
-		<result column="expiry_date_" property="expiryDate" />
-		<result column="completed_num_" property="completedNum" />
-		<result column="expect_num_" property="expectNum" />
-		<result column="attachments_" property="attachments" />
-		<result column="score_" property="score" />
-		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentCourseHomework" >
-		SELECT * FROM student_course_homework WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentCourseHomework">
-		SELECT * FROM student_course_homework ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentCourseHomework" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_course_homework (id_,user_id_,course_homework_id_,attachments_,score_,create_time_,update_time_,remark_,status_,is_replied_) VALUES(#{id},#{userId},#{courseHomeworkId},#{attachments},#{score},now(),now(),#{remark},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
-	</insert>
-
-	<insert id="batchInsertStudentCourseHomeworkRecord" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id_">
-		INSERT INTO student_course_homework (user_id_,course_homework_id_,attachments_,score_,create_time_,update_time_,remark_,status_,is_replied_)
-		VALUE
-		<foreach collection="list" item="homework" separator=",">
-			(#{homework.userId},#{homework.courseHomeworkId},#{homework.attachments},#{homework.score},now(),now(),#{homework.remark},#{homework.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
-		</foreach>
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentCourseHomework">
-		UPDATE student_course_homework
-		<set>
-			<if test="id != null">
-			id_ = #{id},
-			</if>
-			<if test="courseHomeworkId != null">
-			course_homework_id_ = #{courseHomeworkId},
-			</if>
-			<if test="updateTime != null">
-			update_time_ = #{updateTime},
-			</if>
-			<if test="score != null">
-			score_ = #{score},
-			</if>
-			<if test="attachments != null">
-			attachments_ = #{attachments},
-			</if>
-			<if test="createTime != null">
-			create_time_ = #{createTime},
-			</if>
-			<if test="remark != null">
-				remark_ = #{remark},
-			</if>
-			<if test="status != null">
-				status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="isReplied != null">
-				is_replied_ = #{isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-		</set> WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_course_homework WHERE id_ = #{id} 
-	</delete>
-
-	<resultMap type="com.ym.mec.web.dal.dto.CourseHomeworkListDto" id="CourseHomeworkDto">
-		<result column="id_" property="id" />
-		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="content_" property="content" />
-		<result column="create_time_" property="createTime" />
-		<result column="start_class_time_" property="startClassTime" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="music_group_name_" property="musicGroupName" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="class_group_name_" property="classGroupName" />
-		<result column="completed_num_" property="completedNum" />
-		<result column="expect_num_" property="expectNum" />
-		<result column="next_class_date_" property="expiryDate" />
-		<result column="remark_" property="remark" />
-		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-	</resultMap>
-
-	<sql id="queryCondition">
-		<where>
-			<if test="createTime != null">
-				DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
-			</if>
-			<if test="musicGroupId != null">
-				and ch.music_group_id_ = #{musicGroupId}
-			</if>
-			<if test="classGroupId != null">
-				and ch.class_group_id_ = #{classGroupId}
-			</if>
-			<if test="userId != null">
-				and sch.user_id_ = #{userId}
-			</if>
-		</where>
-	</sql>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseHomeworkDto" parameterType="map">
-		SELECT
-		ch.*,
-		mg.name_ music_group_name_,
-		cg.name_ class_group_name_,
-		temp.next_class_date_,
-		sch.remark_,
-		sch.status_,
-		sch.is_replied_
-		FROM student_course_homework sch
-		LEFT JOIN course_homework ch ON sch.course_homework_id_=ch.id_
-		LEFT JOIN course_schedule cs ON ch.course_schedule_id_=cs.id_
-		LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
-		LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-		LEFT JOIN (SELECT
-		class_group_id_,
-		MIN(CONCAT( class_date_, ' ', start_class_time_ )) next_class_date_
-		FROM
-		course_schedule
-		WHERE CONCAT( class_date_, ' ', start_class_time_ )>now()
-		GROUP BY class_group_id_) temp ON ch.class_group_id_=temp.class_group_id_
-		<include refid="queryCondition"/>
-		ORDER BY ch.id_
-		<include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_course_homework sch
-		<include refid="queryCondition"/>
-	</select>
-	<select id="findCourseHomeworkStudentDetail" resultMap="CourseHomeworkStudentDetailDto">
-		SELECT
-			mg.name_ musicGroupName,
-			cg.name_ classGroupName,
-			ch.id_ courseHomeworkId,
-			ch.content_,
-			ch.expiry_date_,
-			ch.completed_num_,
-			ch.expect_num_,
-			sch.attachments_,
-			sch.score_,
-			sch.status_,
-			sch.is_replied_
-		FROM
-			course_homework ch
-		LEFT JOIN student_course_homework sch ON ch.id_=sch.course_homework_id_
-		LEFT JOIN music_group mg ON ch.music_group_id_=mg.id_
-		LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
-		WHERE ch.course_schedule_id_=#{courseScheduleID} AND sch.user_id_=#{userID}
-	</select>
-	<select id="constructInitialStudentHomeworkRecords" resultMap="StudentCourseHomework">
-		SELECT
-			#{courseHomeworkID} course_homework_id_,
-			sa.user_id_,
-			0 status_,
-			0 is_replied_
-		FROM
-			student_attendance sa
-		WHERE
-			sa.course_schedule_id_ = #{courseScheduleID}
-			AND status_ = "NORMAL"
-	</select>
-</mapper>

+ 0 - 113
mec-web/src/main/resources/config/mybatis/StudentCourseHomeworkReplyMapper.xml

@@ -1,113 +0,0 @@
-<?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.StudentCourseHomeworkReplyDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentCourseHomeworkReply" id="StudentCourseHomeworkReply">
-        <result column="id_" property="id"/>
-        <result column="student_course_homework_id_" property="studentCourseHomeworkId"/>
-        <result column="user_id_" property="userId"/>
-        <result column="content_" property="content"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="parent_id_" property="parentId"/>
-    </resultMap>
-
-    <resultMap id="studentCourseHomeworkComment" type="com.ym.mec.web.dal.dto.StudentCourseHomeworkCommentDto">
-        <result property="replyId" column="comment_id_"></result>
-        <result property="userId" column="comment_user_id_"></result>
-        <result property="userName" column="comment_user_name_"></result>
-        <result property="content" column="comment_content_"></result>
-        <result property="createTime" column="comment_time"></result>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentCourseHomeworkReply">
-		SELECT * FROM student_course_homework_reply WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentCourseHomeworkReply">
-		SELECT * FROM student_course_homework_reply ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentCourseHomeworkReply" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO student_course_homework_reply
-        (id_,student_course_homework_id_,user_id_,content_,create_time_,parent_id_)
-        VALUES(#{id},#{studentCourseHomeworkId},#{userId},#{content},now(),#{parentId})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentCourseHomeworkReply">
-        UPDATE student_course_homework_reply
-        <set>
-            <if test="parentId != null">
-                parent_id_ = #{parentId},
-            </if>
-            <if test="studentCourseHomeworkId != null">
-                student_course_homework_id_ = #{studentCourseHomeworkId},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="content != null">
-                content_ = #{content},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM student_course_homework_reply WHERE id_ = #{id} 
-	</delete>
-
-    <delete id="batchDeleteReplys">
-      delete from student_course_homework_reply where id_ IN
-      <foreach collection="list" item="id" open="(" close=")" separator=",">
-          #{id}
-      </foreach>
-    </delete>
-
-    <sql id="queryCondition">
-        <where>
-            <if test="parentID!=null">
-                schr.parent_id_ = #{parentID}
-            </if>
-            <if test="parentID==null">
-                schr.parent_id_ IS NULL
-            </if>
-            <if test="studentCourseHomeworkId != null">
-               AND schr.student_course_homework_id_=#{studentCourseHomeworkId}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="studentCourseHomeworkComment" parameterType="map">
-        SELECT
-            schr.id_ comment_id_,
-            schr.user_id_ comment_user_id_,
-            suc.username_ comment_user_name_,
-            schr.content_ comment_content_,
-            schr.create_time_ comment_time
-        FROM
-        student_course_homework_reply schr
-        LEFT JOIN sys_user suc ON schr.user_id_=suc.id_
-        <include refid="queryCondition"/>
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_course_homework_reply schr
-		<include refid="queryCondition"/>
-	</select>
-    <select id="findAllReplyByStudentCourseHomeworkID" resultMap="StudentCourseHomeworkReply">
-        select id_,IF(parent_id_ IS NULL,0,parent_id_) parent_id_ from student_course_homework_reply where student_course_homework_id_=#{studentCourseHomeworkID}
-    </select>
-</mapper>

+ 0 - 283
mec-web/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -1,283 +0,0 @@
-<?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.StudentManageDao">
-
-    <resultMap id="studentManageListDto" type="com.ym.mec.web.dal.dto.StudentManageListDto">
-        <result property="userId" column="user_id_"/>
-        <result property="userName" column="username_"/>
-        <result property="phone" column="phone_"/>
-        <result property="gender" column="gender_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="schoolId" column="school_id_"/>
-        <result property="schoolName" column="school_name_"/>
-    </resultMap>
-
-    <resultMap id="musicGroup" type="com.ym.mec.web.dal.dto.StudentManageBaseInfoOfMusicGroupDto">
-        <result property="musicGroupId" column="music_group_id_"/>
-        <result property="musicGroupName" column="music_group_name_"/>
-        <result property="musicGroupStatus" column="music_group_status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="joinMusicGroupDate" column="join_date"/>
-        <result property="subjectId" column="subject_id_"/>
-        <result property="subjectName" column="subject_name_"/>
-        <result property="kitPurchaseMethod" column="kit_purchase_method_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="goodsIdList" column="goods_id_list_"/>
-        <result property="price" column="price_"/>
-        <result property="organId" column="organ_id_"/>
-        <result property="organName" column="organ_name_"/>
-    </resultMap>
-
-    <resultMap id="studentManageBaseInfo" type="com.ym.mec.web.dal.dto.StudentManageBaseDto" extends="studentManageListDto">
-        <result property="birthdate" column="birthdate_"/>
-        <result property="parentName" column="parents_name_"/>
-        <collection property="musicGroups" resultMap="musicGroup" javaType="list"/>
-    </resultMap>
-
-    <resultMap id="studentManageCourseListDto" type="com.ym.mec.web.dal.dto.StudentManageCourseListDto">
-        <result property="classGroupId" column="class_group_id_" />
-        <result property="classGroupName" column="class_group_name_" />
-        <result property="classGroupType" column="class_group_type_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="courseDate" column="course_date_" />
-        <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result property="teacherName" column="teacher_name_" />
-        <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.web.dal.dto.StudentManageAccountBaseInfoDto">
-        <result property="balance" column="balance_"/>
-        <result property="bankName" column="bank_name_"/>
-        <result property="cardNo" column="card_no_"/>
-    </resultMap>
-
-    <sql id="queryCondition">
-        <where>
-            cgsm.user_id_ IS NOT NULL
-            <if test="organID != null">
-              AND s.organ_id_=#{organID}
-            </if>
-            <if test="musicGroupId != null">
-                and mg.id_ = #{musicGroupId}
-            </if>
-            <if test="studentStatus != null">
-                and cgsm.status_ = #{studentStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="queryString != null">
-                and (su.username_ like CONCAT("%",#{queryString},"%")
-                    or su.phone_ like CONCAT("%",#{queryString},"%")
-                  )
-            </if>
-        </where>
-    </sql>
-
-    <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT
-            DISTINCT su.id_ user_id_,
-            su.username_,
-            su.gender_,
-            su.phone_,
-            s.id_ school_id_,
-            s.name_ school_name_
-        FROM
-            school s
-        LEFT JOIN music_group mg ON s.id_=mg.school_id_
-        LEFT JOIN class_group cg ON mg.id_=cg.music_group_id_
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-        <include refid="queryCondition"/>
-        ORDER BY su.id_
-        <include refid="global.limit"/>
-    </select>
-
-    <select id="countStudentByOrganId" resultType="java.lang.Integer">
-        SELECT
-            COUNT(DISTINCT su.id_)
-        FROM
-            school s
-        LEFT JOIN music_group mg ON s.id_=mg.school_id_
-        LEFT JOIN class_group cg ON mg.id_=cg.music_group_id_
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-        <include refid="queryCondition"/>
-    </select>
-    <select id="findStudentBaseInfoByUserID" resultMap="studentManageBaseInfo">
-      SELECT
-            su.id_ user_id_,
-            su.username_,
-            su.gender_,
-            su.birthdate_,
-            sr.parents_name_,
-            sr.parents_phone_,
-            sr.music_group_id_,
-            sr.create_time_ join_date,
-            mg.name_ music_group_name_,
-            mg.status_ music_group_status,
-            cg.id_ class_group_id_,
-            cg.name_ class_group_name_,
-            sr.subject_id_,
-            sj.name_ subject_name_,
-            sr.kit_purchase_method_,
-            spod.goods_id_list_,
-            spod.price_
-        FROM
-            sys_user su
-            LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
-            LEFT JOIN class_group cg ON sr.class_group_id_=cg.id_
-            LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-            LEFT JOIN `subject` sj ON sr.subject_id_=sj.id_
-            LEFT JOIN organization o ON mg.organ_id_ = o.id_
-            LEFT JOIN school s ON mg.school_id_ = s.id_
-            LEFT JOIN student_payment_order spo ON sr.user_id_=spo.user_id_ AND sr.music_group_id_=spo.music_group_id_
-            LEFT JOIN student_payment_order_detail spod ON spo.id_=spod.payment_order_id_
-        WHERE
-            su.id_ =#{userID}
-    </select>
-
-    <select id="findGoodsNamesByIds" resultType="string">
-      SELECT name_ FROM goods WHERE id_ IN
-      <foreach collection="ids" item="id" open="(" close=")" separator=",">
-          #{id}
-      </foreach>
-    </select>
-
-    <select id="findStudentMusicGroupsByUserId" resultMap="musicGroup">
-        SELECT
-            mg.id_ music_group_id_,
-            mg.name_ music_group_name_,
-            sr.create_time_ join_date,
-            mg.status_ music_group_status_,
-            s.name_ subject_name_,
-            sr.kit_purchase_method_,
-            cgsm.status_ student_status,
-            o.id_ organ_id_,
-            o.name_ organ_name_
-        FROM
-            student_registration sr
-        LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
-        LEFT JOIN organization o ON mg.organ_id_=o.id_
-        LEFT JOIN class_group_student_mapper cgsm ON sr.class_group_id_=cgsm.class_group_id_
-        LEFT JOIN `subject` s ON sr.subject_id_=s.id_
-        WHERE sr.user_id_=#{userID}
-    </select>
-
-    <sql id="studentManageCourseQueryCondition">
-        <where>
-            <if test="studentId!=null">
-                and cgsm.user_id_=#{studentId}
-            </if>
-            <if test="musicGroupId!=null">
-                and cg.music_group_id_=#{musicGroupId}
-            </if>
-            <if test="classGroupType!=null">
-                and cg.type_=#{classGroupType}
-            </if>
-            <if test="courseStatus!=null">
-                and cs.status_=#{courseStatus}
-            </if>
-            <if test="classGroupName!=null">
-                and cg.name_ like CONCAT("%",#{classGroupName},"%")
-            </if>
-            <if test="teacherName!=null">
-                and su.username_ like CONCAT("%",#{teacherName},"%")
-            </if>
-            <if test="vipGroupId!=null">
-                and vgcgm.vip_group_id_=#{vipGroupId}
-            </if>
-        </where>
-    </sql>
-
-    <select id="findStudentCourseList" resultMap="studentManageCourseListDto">
-        SELECT
-            cg.id_ class_group_id_,
-            cg.name_ class_group_name_,
-            cg.type_ class_group_type_,
-            CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
-            cs.status_ course_status_,
-            su.username_ teacher_name_
-        FROM
-            class_group cg
-            LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-            <if test="vipGroupId!=null">
-                LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_
-            </if>
-            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-            LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
-        <include refid="studentManageCourseQueryCondition"/>
-        ORDER BY course_date_
-        <include refid="global.limit"/>
-    </select>
-
-    <select id="countStudentCourses" resultType="int">
-        SELECT
-        count(*)
-        FROM
-        class_group cg
-        LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
-        <if test="vipGroupId!=null">
-            LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_
-        </if>
-        LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
-        <include refid="studentManageCourseQueryCondition"/>
-    </select>
-
-    <sql id="studentManageAttendanceQueryCondition">
-        <where>
-            <if test="studentId!=null">
-                and sa.user_id_=#{studentId}
-            </if>
-            <if test="classGroupType!=null">
-                and cg.type_=#{classGroupType}
-            </if>
-            <if test="attendanceStatus!=null">
-                and cs.status_=#{attendanceStatus}
-            </if>
-            <if test="classGroupName!=null">
-                and cg.name_ like CONCAT("%",#{classGroupName},"%")
-            </if>
-            <if test="teacherName!=null">
-                and sa.status_ like CONCAT("%",#{teacherName},"%")
-            </if>
-        </where>
-    </sql>
-
-    <select id="findStudentAttendances" resultMap="studentManageCourseListDto">
-        SELECT
-            cg.id_ class_group_id_,
-            cg.name_ class_group_name_,
-            cg.type_ class_group_type_,
-            CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
-            su.username_ teacher_name_,
-            sa.status_
-        FROM
-            student_attendance sa
-            LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_
-            LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-            LEFT JOIN sys_user su ON sa.teacher_id_=su.id_
-        <include refid="studentManageAttendanceQueryCondition"/>
-        ORDER BY sa.id_
-        <include refid="global.limit"/>
-    </select>
-
-    <select id="countStudentAttendances" resultType="int">
-        SELECT
-        count(*)
-        FROM
-        student_attendance sa
-        LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_
-        LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-        LEFT JOIN sys_user su ON sa.teacher_id_=su.id_
-        <include refid="studentManageAttendanceQueryCondition"/>
-    </select>
-
-    <select id="getStudentAccountBaseInfo" resultMap="studentManageAccountBaseInfo">
-        SELECT
-            suca.balance_,
-            subc.bank_name_,
-            subc.card_no_
-        FROM
-            sys_user_cash_account suca
-            LEFT JOIN sys_user_bank_card subc ON suca.user_id_ = subc.user_id_
-            AND subc.is_default_ = 1
-        WHERE
-            suca.user_id_ =#{userID}
-    </select>
-
-</mapper>

+ 0 - 80
mec-web/src/main/resources/config/mybatis/StudentPaymentOrderDetailMapper.xml

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

+ 0 - 116
mec-web/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1,116 +0,0 @@
-<?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.StudentPaymentOrderDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrder" id="StudentPaymentOrder">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="expect_amount_" property="expectAmount"/>
-        <result column="actual_amount_" property="actualAmount"/>
-        <result column="trans_no_" property="transNo"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="memo_" property="memo"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="payment_channel_" property="paymentChannel"/>
-        <result column="payment_business_channel_" property="paymentBusinessChannel"/>
-        <result column="payment_account_no_" property="paymentAccountNo"/>
-        <result column="order_no_" property="orderNo"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="class_group_id_" property="classGroupId"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentPaymentOrder">
-		SELECT * FROM student_payment_order WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentPaymentOrder">
-		SELECT * FROM student_payment_order ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO student_payment_order
-        (id_,user_id_,type_,expect_amount_,actual_amount_,trans_no_,status_,memo_,create_time_,update_time_,payment_channel_,payment_business_channel_,payment_account_no_,order_no_,music_group_id_,class_group_id_)
-        VALUES(#{id},#{userId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},now(),now(),#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{orderNo},#{musicGroupId},#{classGroupId})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder">
-        UPDATE student_payment_order
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="orderNo != null">
-                order_no_ = #{orderNo},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="expectAmount != null">
-                expect_amount_ = #{expectAmount},
-            </if>
-            <if test="memo != null">
-                memo_ = #{memo},
-            </if>
-            <if test="paymentChannel != null">
-                payment_channel_ = #{paymentChannel},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="paymentAccountNo != null">
-                payment_account_no_ = #{paymentAccountNo},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="paymentBusinessChannel != null">
-                payment_business_channel_ = #{paymentBusinessChannel},
-            </if>
-            <if test="transNo != null">
-                trans_no_ = #{transNo},
-            </if>
-            <if test="actualAmount != null">
-                actual_amount_ = #{actualAmount},
-            </if>
-            <if test="type != null">
-                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM student_payment_order WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="StudentPaymentOrder" parameterType="map">
-        SELECT * FROM student_payment_order ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_payment_order
-	</select>
-</mapper>

+ 0 - 100
mec-web/src/main/resources/config/mybatis/StudentRechargeMapper.xml

@@ -1,100 +0,0 @@
-<?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.StudentRechargeDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentRecharge" id="StudentRecharge">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="trans_no_" property="transNo"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="amount_" property="amount"/>
-        <result column="fee_user_" property="feeUser"/>
-        <result column="fee_platform_" property="feePlatform"/>
-        <result column="pay_platform_" property="payPlatform"/>
-        <result column="description_" property="description"/>
-        <result column="comment_" property="comment"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="modify_time_" property="modifyTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentRecharge">
-		SELECT * FROM student_recharge WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentRecharge">
-		SELECT * FROM student_recharge ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentRecharge" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO student_recharge
-        (id_,user_id_,trans_no_,status_,amount_,fee_user_,fee_platform_,pay_platform_,description_,comment_,create_time_,modify_time_)
-        VALUES(#{id},#{userId},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{feeUser},#{feePlatform},#{payPlatform},#{description},#{comment},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentRecharge">
-        UPDATE student_recharge
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="modifyTime != null">
-                modify_time_ = #{modifyTime},
-            </if>
-            <if test="feePlatform != null">
-                fee_platform_ = #{feePlatform},
-            </if>
-            <if test="comment != null">
-                comment_ = #{comment},
-            </if>
-            <if test="amount != null">
-                amount_ = #{amount},
-            </if>
-            <if test="feeUser != null">
-                fee_user_ = #{feeUser},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="transNo != null">
-                trans_no_ = #{transNo},
-            </if>
-            <if test="payPlatform != null">
-                pay_platform_ = #{payPlatform},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM student_recharge WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="StudentRecharge" parameterType="map">
-        SELECT * FROM student_recharge ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_recharge
-	</select>
-</mapper>

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

@@ -1,215 +0,0 @@
-<?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.StudentRegistrationDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentRegistration" id="StudentRegistration">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="name_" property="name"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="current_grade_" property="currentGrade"/>
-        <result column="current_class_" property="currentClass"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="actual_subject_id_" property="actualSubjectId"/>
-        <result column="is_allow_adjust_" property="isAllowAdjust"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="kit_purchase_method_" property="kitPurchaseMethod"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="remark_" property="remark"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="parents_name_" property="parentsName"/>
-        <result column="parents_phone_" property="parentsPhone"/>
-        <result column="parents_company_" property="parentsCompany"/>
-        <result column="payment_status_" property="paymentStatus"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="last_payment_date_" property="lastPaymentDate"/>
-        <result column="next_payment_date_" property="nextPaymentDate"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE id_ = #{id}
-    </select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentRegistration">
-        SELECT *
-        FROM student_registration
-        ORDER BY id_
-    </select>
-
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentRegistration" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        INSERT INTO student_registration
-        (parents_phone_,id_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,last_payment_date_,next_payment_date_,actual_subject_id_)
-        VALUES(#{parentsPhone},#{id},#{userId},#{name},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{remark},now(),now(),#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{lastPaymentDate},#{nextPaymentDate},#{subjectId})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentRegistration">
-        UPDATE student_registration
-        <set>
-            <if test="parentsPhone != null">
-                parents_phone_ = #{parentsPhone},
-            </if>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="nextPaymentDate != null">
-                next_payment_date_ = #{nextPaymentDate},
-            </if>
-            <if test="currentGrade != null">
-                current_grade_ = #{currentGrade},
-            </if>
-            <if test="lastPaymentDate != null">
-                last_payment_date_ = #{lastPaymentDate},
-            </if>
-            <if test="currentClass != null">
-                current_class_ = #{currentClass},
-            </if>
-            <if test="isAllowAdjust != null">
-                is_allow_adjust_ = #{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="kitPurchaseMethod != null">
-                kit_purchase_method_ = #{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-            <if test="remark != null">
-                remark_ = #{remark},
-            </if>
-            <if test="paymentStatus != null">
-                payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="parentsName != null">
-                parents_name_ = #{parentsName},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="parentsCompany != null">
-                parents_company_ = #{parentsCompany},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-            <if test="actualSubjectId != null">
-                actual_subject_id_ = #{actualSubjectId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-        DELETE FROM student_registration WHERE id_ = #{id}
-    </delete>
-
-    <sql id="queryPageSql">
-        <where>
-            <if test="isAllowAdjust != null">
-                AND is_allow_adjust_ = #{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="subjectId != null">
-                AND subject_id_ = #{subjectId}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="StudentRegistration" parameterType="map">
-        SELECT * FROM student_registration ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM student_registration
-    </select>
-
-
-    <sql id="queryStudentDetailPageSql">
-        <where>
-            <if test="musicGroupId != null">
-                sr.music_group_id_ = #{musicGroupId}
-            </if>
-            <if test="subjectId != null">
-                sr.subject_id_ = #{subjectId}
-            </if>
-            <if test="isAllowAdjust != null">
-                sr.is_allow_adjust_ = #{isAllowAdjust}
-            </if>
-            <if test="actualSubjectId != null">
-                sr.actual_subject_id_ = #{actualSubjectId}
-            </if>
-        </where>
-    </sql>
-
-    <resultMap type="com.ym.mec.web.dal.dto.StudentApplyDetailDto" id="studentApplyDetail">
-        <result column="current_grade_" property="currentGrade"/>
-        <result column="current_class_" property="currentClass"/>
-        <result column="is_allow_adjust_" property="isAllowAdjust"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="parents_name_" property="parentsName"/>
-        <result column="parents_phone_" property="parentsPhone"/>
-        <result column="subject_name_" property="subjectName"/>
-        <result column="username_" property="studentName"/>
-        <result column="actual_subject_name_" property="actualSubjectName"/>
-        <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-    <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
-        SELECT su.username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
-        su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_ actual_subject_name_,sr.parents_phone_
-        FROM student_registration sr
-        LEFT JOIN sys_user su ON sr.subject_id_ = su.id_
-        LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
-        LEFT JOIN `subject` ss ON sr.actual_subject_id_ = s.id_
-        <include refid="queryStudentDetailPageSql"/>
-        <include refid="global.limit"/>
-    </select>
-    <select id="queryStudentDetailCount" resultType="java.lang.Integer">
-        SELECT COUNT(sr.id_) FROM student_registration sr
-        <include refid="queryStudentDetailPageSql"/>
-    </select>
-
-    <select id="countPayNum" resultType="java.lang.Integer">
-        SELECT COUNT(DISTINCT user_id_) FROM student_registration
-        WHERE music_group_id_ = #{musicGroupId} AND subject_id_ = #{subjectId} AND payment_status_ = 1
-    </select>
-
-    <resultMap id="queryFeeDetailMap" type="com.ym.mec.web.dal.dto.StudentFeeDto">
-        <result column="deposit_fee_" property="depositFee"/>
-        <result column="course_fee_" property="courseFee"/>
-        <result column="musical_fee_" property="musicalFee"/>
-        <result column="total_amount_" property="totalAmount"/>
-    </resultMap>
-    <select id="queryFeeDetail" resultMap="queryFeeDetailMap">
-
-    </select>
-
-    <!-- 根据乐团和声部获取未分班的学生 -->
-    <select id="getNoClassStuBySubjectId" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND actual_subject_id_ =
-        #{actualSubjectId} AND class_group_id_ >=1
-    </select>
-
-    <!-- 根据乐团和声部获取未分班人数 -->
-    <select id="getNoClassStuCountBySubjectId" resultType="java.lang.Integer">
-        SELECT count(*) FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND actual_subject_id_ =
-        #{actualSubjectId} AND class_group_id_ >=1
-    </select>
-</mapper>

+ 0 - 100
mec-web/src/main/resources/config/mybatis/StudentWithdrawMapper.xml

@@ -1,100 +0,0 @@
-<?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.StudentWithdrawDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.StudentWithdraw" id="StudentWithdraw">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="bank_card_no_" property="bankCardNo"/>
-        <result column="trans_no_" property="transNo"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="amount_" property="amount"/>
-        <result column="fee_user_" property="feeUser"/>
-        <result column="fee_platform_" property="feePlatform"/>
-        <result column="description_" property="description"/>
-        <result column="comment_" property="comment"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="modify_time_" property="modifyTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="StudentWithdraw">
-		SELECT * FROM student_withdraw WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="StudentWithdraw">
-		SELECT * FROM student_withdraw ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentWithdraw" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO student_withdraw
-        (id_,user_id_,bank_card_no_,trans_no_,status_,amount_,fee_user_,fee_platform_,description_,comment_,create_time_,modify_time_)
-        VALUES(#{id},#{userId},#{bankCardNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{feeUser},#{feePlatform},#{description},#{comment},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentWithdraw">
-        UPDATE student_withdraw
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="modifyTime != null">
-                modify_time_ = #{modifyTime},
-            </if>
-            <if test="feePlatform != null">
-                fee_platform_ = #{feePlatform},
-            </if>
-            <if test="comment != null">
-                comment_ = #{comment},
-            </if>
-            <if test="amount != null">
-                amount_ = #{amount},
-            </if>
-            <if test="feeUser != null">
-                fee_user_ = #{feeUser},
-            </if>
-            <if test="bankCardNo != null">
-                bank_card_no_ = #{bankCardNo},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="transNo != null">
-                trans_no_ = #{transNo},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM student_withdraw WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="StudentWithdraw" parameterType="map">
-        SELECT * FROM student_withdraw ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_withdraw
-	</select>
-</mapper>

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

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

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

@@ -1,137 +0,0 @@
-<?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.SubjectDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.Subject" id="Subject">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="code_" property="code"/>
-        <result column="parent_subject_id_" property="parentSubjectId"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="Subject">
-		SELECT * FROM subject WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="Subject">
-		SELECT * FROM subject ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Subject" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.Subject">
-        UPDATE subject
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="parentSubjectId != null">
-                parent_subject_id_ = #{parentSubjectId},
-            </if>
-            <if test="code != null">
-                code_ = #{code},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		UPDATE `subject` SET del_flag_ = 1 WHERE id_ = #{id} AND parent_subject_ = #{id}
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="Subject" parameterType="map">
-        SELECT * FROM subject
-        <include refid="querySubPageSql"/>
-        ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM subject <include refid="querySubPageSql"/>
-	</select>
-
-    <select id="findSubByMusicGroupId" resultMap="Subject">
-        SELECT s.* FROM music_group_subject_plan mgsp LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_ WHERE mgsp.music_group_id_ = #{musicGroupId}
-    </select>
-
-    <select id="findSubByChargeType" resultMap="Subject">
-        SELECT s.* FROM charge_type_subject_mapper ctsm LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_ WHERE ctsm.charge_type_id_ = #{chargeTypeId}
-    </select>
-
-    <!-- 根据科目code查科目 -->
-    <select id="findByCode" resultMap="Subject">
-        SELECT * FROM subject WHERE code_ = #{code}
-    </select>
-    <select id="findByParentId" resultMap="Subject">
-        SELECT * FROM subject <include refid="querySubPageSql"/>
-    </select>
-
-    <select id="findDefaultSubByGroupId" resultMap="Subject">
-        SELECT s.id_,s.name_,g.name_ goods_name_,g.id_ goods_id_,ctsm.kit_group_purchase_type_,ctsm.deposit_fee_,ctsm.fee_
-        FROM music_group mg
-        LEFT JOIN charge_type_subject_mapper ctsm ON ctsm.charge_type_id_ = mg.charge_type_id_
-        LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        LEFT JOIN subject_goods_mapper sgm ON s.id_ = sgm.subject_id_
-        LEFT JOIN goods_category gc ON gc.id_ = sgm.goods_category_id_
-        LEFT JOIN goods g ON gc.id_ = g.goods_category_id_
-        WHERE mg.id_ = #{musicGroupId}
-    </select>
-
-    <resultMap id="subApplyDetail" type="com.ym.mec.web.dal.dto.SubjectApplyDetailDto">
-        <result column="pay_num_" property="payNum"/>
-        <result column="name_" property="subjectName"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="expected_student_num_" property="expectedStudentNum"/>
-        <result column="apply_student_num_" property="applyStudentNum"/>
-        <result column="not_part_class_num_" property="notPartClassNum"/>
-    </resultMap>
-    <select id="findSubApplyDetail" resultMap="subApplyDetail">
-        SELECT mgsp.subject_id_,s.name_,mgsp.expected_student_num_,mgsp.apply_student_num_
-        FROM music_group_subject_plan mgsp
-        LEFT JOIN `subject` s ON mgsp.subject_id_ = s.id_
-        WHERE mgsp.music_group_id_ =
-    </select>
-    <select id="findBySubIds" resultType="java.lang.String">
-        SELECT name_ FROM `subject` IN (#{subIds}) WHERE del_flag_ = 0
-    </select>
-
-    <sql id="querySubPageSql">
-        <where>
-            <if test="parentId != null">
-                parent_subject_id_ = #{parentId}
-            </if>
-            <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-        </where>
-    </sql>
-</mapper>

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

@@ -1,83 +0,0 @@
-<?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.SysAreaDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.SysArea" id="SysArea">
-        <result column="id_" property="id"/>
-        <result column="name_" property="name"/>
-        <result column="code_" property="code"/>
-        <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"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="SysArea">
-		SELECT * FROM sys_area WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="SysArea">
-		SELECT * FROM sys_area ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysArea" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO sys_area (id_,name_,code_,create_time_,update_time_,parent_organ_id_)
-        VALUES(#{id},#{name},#{code},now(),now(),#{parentOrganId})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysArea">
-        UPDATE sys_area
-        <set>
-            <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>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="name != null">
-                name_ = #{name},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		UPDATE sys_area SET del_flag_ = 1 WHERE id_ = #{id}
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="SysArea" parameterType="map">
-        SELECT * FROM sys_area ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <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>

+ 0 - 76
mec-web/src/main/resources/config/mybatis/SysMessageConfigMapper.xml

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

+ 0 - 105
mec-web/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -1,105 +0,0 @@
-<?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.SysMessageDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.SysMessage" id="SysMessage">
-        <result column="id_" property="id"/>
-        <result column="title_" property="title"/>
-        <result column="content_" property="content"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="receiver_" property="receiver"/>
-        <result column="send_time_" property="sendTime"/>
-        <result column="error_msg_" property="errorMsg"/>
-        <result column="create_on_" property="createOn"/>
-        <result column="modify_on_" property="modifyOn"/>
-        <result column="user_id_" property="userId"/>
-        <result column="memo_" property="memo"/>
-        <result column="read_status_" property="readStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="SysMessage">
-		SELECT * FROM sys_message WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="SysMessage">
-		SELECT * FROM sys_message ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysMessage" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO sys_message
-        (id_,title_,content_,type_,status_,receiver_,send_time_,error_msg_,create_on_,modify_on_,user_id_,memo_,read_status_)
-        VALUES(#{id},#{title},#{content},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{receiver},#{sendTime},#{errorMsg},now(),now(),#{userId},#{memo},#{readStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysMessage">
-        UPDATE sys_message
-        <set>
-            <if test="status != null">
-                status_ = #{status typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
-            </if>
-            <if test="receiver != null">
-                receiver_ = #{receiver},
-            </if>
-            <if test="modifyOn != null">
-                modify_on_ = #{modifyOn},
-            </if>
-            <if test="sendTime != null">
-                send_time_ = #{sendTime},
-            </if>
-            <if test="readStatus != null">
-                read_status_ = #{readStatus typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
-            </if>
-            <if test="content != null">
-                content_ = #{content},
-            </if>
-            <if test="memo != null">
-                memo_ = #{memo},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="errorMsg != null">
-                error_msg_ = #{errorMsg},
-            </if>
-            <if test="title != null">
-                title_ = #{title},
-            </if>
-            <if test="type != null">
-                type_ = #{type typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM sys_message WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="SysMessage" parameterType="map">
-        SELECT * FROM sys_message ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_message
-	</select>
-</mapper>

+ 0 - 75
mec-web/src/main/resources/config/mybatis/SysSuggestionMapper.xml

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

+ 0 - 96
mec-web/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -1,96 +0,0 @@
-<?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.SysUserCashAccountDetailDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" id="SysUserCashAccountDetail">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="trans_no_" property="transNo"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="amount_" property="amount"/>
-        <result column="balance_" property="balance"/>
-        <result column="description_" property="description"/>
-        <result column="comment_" property="comment"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="SysUserCashAccountDetail">
-		SELECT * FROM sys_user_cash_account_detail ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO sys_user_cash_account_detail
-        (id_,user_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_)
-        VALUES(#{id},#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail">
-        UPDATE sys_user_cash_account_detail
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="balance != null">
-                balance_ = #{balance},
-            </if>
-            <if test="comment != null">
-                comment_ = #{comment},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="amount != null">
-                amount_ = #{amount},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="transNo != null">
-                trans_no_ = #{transNo},
-            </if>
-            <if test="type != null">
-                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM sys_user_cash_account_detail WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
-        SELECT * FROM sys_user_cash_account_detail ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account_detail
-	</select>
-</mapper>

+ 0 - 87
mec-web/src/main/resources/config/mybatis/SysUserCashAccountMapper.xml

@@ -1,87 +0,0 @@
-<?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.SysUserCashAccountDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccount" id="SysUserCashAccount">
-        <result column="user_id_" property="userId"/>
-        <result column="currency_" property="currency"/>
-        <result column="balance_" property="balance"/>
-        <result column="frozen_amount_" property="frozenAmount"/>
-        <result column="margin_balance_" property="marginBalance"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="SysUserCashAccount">
-		SELECT * FROM sys_user_cash_account WHERE user_id_ = #{userId} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="SysUserCashAccount">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO sys_user_cash_account
-        (user_id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time)
-        VALUES(#{userId},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount">
-        UPDATE sys_user_cash_account
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime},
-            </if>
-            <if test="frozenAmount != null">
-                frozen_amount_ = #{frozenAmount},
-            </if>
-            <if test="balance != null">
-                balance_ = #{balance},
-            </if>
-            <if test="marginBalance != null">
-                margin_balance_ = #{marginBalance},
-            </if>
-            <if test="currency != null">
-                currency_ = #{currency},
-            </if>
-        </set>
-        WHERE user_id_ = #{userId}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM sys_user_cash_account WHERE user_id_ = #{userId} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
-        SELECT * FROM sys_user_cash_account ORDER BY user_id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account
-	</select>
-</mapper>

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

@@ -1,149 +0,0 @@
-<?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.TeacherAttendanceDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.TeacherAttendance" id="TeacherAttendance">
-        <result column="id_" property="id"/>
-        <result column="teacher_id_" property="teacherId"/>
-        <result column="music_group_id_" property="musicGroupId"/>
-        <result column="class_group_id_" property="classGroupId"/>
-        <result column="course_schedule_id_" property="courseScheduleId"/>
-        <result column="sign_in_time_" property="signInTime"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="remark_" property="remark"/>
-        <result column="create_time_" property="createTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="TeacherAttendance">
-		SELECT * FROM teacher_attendance WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="TeacherAttendance">
-		SELECT * FROM teacher_attendance ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO teacher_attendance
-        (id_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
-        VALUES(#{id},#{teacherId},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance">
-        UPDATE teacher_attendance
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="remark != null">
-                remark_ = #{remark},
-            </if>
-            <if test="signInTime != null">
-                sign_in_time_ = #{signInTime},
-            </if>
-            <if test="teacherId != null">
-                teacher_id_ = #{teacherId},
-            </if>
-            <if test="classGroupId != null">
-                class_group_id_ = #{classGroupId},
-            </if>
-            <if test="courseScheduleId != null">
-                course_schedule_id_ = #{courseScheduleId},
-            </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM teacher_attendance WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
-        SELECT * FROM teacher_attendance ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_attendance
-	</select>
-
-    <resultMap id="teacherPersonalAttendance" type="com.ym.mec.web.dal.dto.TeacherPersonalAttendanceDto">
-        <result column="class_date_" property="classDate"/>
-        <result column="start_class_time_" property="startClassTime"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="name_" property="name"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="remark_" property="remark"/>
-    </resultMap>
-
-    <sql id="queryCondition">
-        <where>
-            <if test="teacherId != null">
-                and ta.teacher_id_ = #{teacherId}
-            </if>
-            <if test="musicGroupId != null">
-                and ta.music_group_id_ = #{musicGroupId}
-            </if>
-            <if test="classGroupId != null">
-                and ta.class_group_id_ = #{classGroupId}
-            </if>
-            <if test="attendanceStatus != null">
-                and ta.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="classGroupType != null">
-                and cg.type_ = #{classGroupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="classGroupName != null">
-                and cg.name_ like CONCAT('%',#{classGroupName},'%')
-            </if>
-        </where>
-    </sql>
-
-    <select id="getTeacherPersonalAttendances" parameterType="map" resultMap="teacherPersonalAttendance">
-        SELECT
-            cs.class_date_,
-            cs.start_class_time_,
-            cg.name_,
-            cg.type_,
-            ta.status_,
-            ta.remark_
-        FROM
-            teacher_attendance ta
-        LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
-        LEFT JOIN class_group cg ON ta.class_group_id_=cg.id_
-        <include refid="queryCondition"/>
-        ORDER BY class_date_ DESC
-        <include refid="global.limit"/>
-    </select>
-
-    <select id="getTeacherPersonalAttendancesCount" resultType="int">
-        SELECT
-            count(*)
-        FROM
-          teacher_attendance ta
-        LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
-        LEFT JOIN class_group cg ON ta.class_group_id_=cg.id_
-        <include refid="queryCondition"/>
-    </select>
-
-
-</mapper>

+ 0 - 90
mec-web/src/main/resources/config/mybatis/TeacherDefaultMusicGroupSalaryMapper.xml

@@ -1,90 +0,0 @@
-<?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.TeacherDefaultMusicGroupSalaryDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary"
-		id="TeacherDefaultMusicGroupSalary">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="class_group_type_" property="classGroupType" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="main_teacher_salary_" property="mainTeacherSalary" />
-		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM teacher_default_music_group_salary WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM
-		teacher_default_music_group_salary ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert"
-		parameterType="com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO teacher_default_music_group_salary
-		(id_,user_id_,class_group_type_,subject_id_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{classGroupType},#{subjectId},#{mainTeacherSalary},#{assistantTeacherSalary},now(),now())
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update"
-		parameterType="com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary">
-		UPDATE teacher_default_music_group_salary
-		<set>
-			<if test="subjectId != null">
-				subject_id_ = #{subjectId},
-			</if>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="classGroupType != null">
-				class_group_type_ = #{classGroupType},
-			</if>
-			<if test="mainTeacherSalary != null">
-				main_teacher_salary_ = #{mainTeacherSalary},
-			</if>
-			<if test="assistantTeacherSalary != null">
-				assistant_teacher_salary_ = #{assistantTeacherSalary},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM
-		teacher_default_music_group_salary WHERE id_ = #{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TeacherDefaultMusicGroupSalary"
-		parameterType="map">
-		SELECT * FROM teacher_default_music_group_salary ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		teacher_default_music_group_salary
-	</select>
-
-	<!-- 根据user_id 获取老师的默认薪酬 -->
-	<select id="getTeacherSalaryByUserIdAndType" resultMap="TeacherDefaultMusicGroupSalary">
-		SELECT * FROM teacher_default_music_group_salary WHERE user_id_=#{userId} AND class_group_type_ = #{classGroupType}
-	</select>
-</mapper>

+ 0 - 83
mec-web/src/main/resources/config/mybatis/TeacherLeaveRecordMapper.xml

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

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

@@ -1,232 +0,0 @@
-<?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.TeacherDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.Teacher" id="Teacher">
-        <result column="id_" property="id"/>
-        <result column="organ_id_" property="organId"/>
-        <result column="organ_name_" property="organName"/>
-        <result column="job_type_" property="jobType"/>
-        <result column="job_nature_" property="jobNature"/>
-        <result column="is_probation_period_" property="isProbationPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="education_background_" property="educationBackground"/>
-        <result column="graduate_school_" property="graduateSchool"/>
-        <result column="technical_titles_" property="technicalTitles"/>
-        <result column="work_unit_" property="workUnit"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="entry_date_" property="entryDate"/>
-        <result column="demission_date_" property="demissionDate"/>
-        <result column="certificate_type_" property="certificateType"/>
-        <result column="certificate_num_" property="certificateNum"/>
-        <result column="flow_organ_range_" property="flowOrganRange"/>
-        <result column="introduction_" property="introduction"/>
-        <result column="update_time_" property="updateTime"/>
-        <result column="create_time_" property="createTime"/>
-
-        <result column="username_" property="username"/>
-        <result column="password_" property="password"/>
-        <result column="salt_" property="salt"/>
-        <result column="phone_" property="phone"/>
-        <result column="avatar_" property="avatar"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="wx_openid_" property="wxOpenid"/>
-        <result column="qq_openid_" property="qqOpenid"/>
-        <result column="user_type_" property="userType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="gender_" property="gender" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="nation_" property="nation"/>
-        <result column="birthdate_" property="birthdate"/>
-        <result column="email_" property="email"/>
-        <result column="im_token_" property="imToken"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="Teacher">
-		SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
-        su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
-        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,t.subject_id_,t.organ_id_,o.name_ organ_name_
-        FROM teacher t
-        LEFT JOIN sys_user su ON t.id_ = su.id_
-        LEFT JOIN organization o ON t.organ_id_ = o.id_
-        WHERE t.id_ = #{userId} AND o.del_flag_ = 0
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="Teacher">
-		SELECT * FROM teacher ORDER BY user_id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        INSERT INTO teacher
-        (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>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.Teacher">
-        UPDATE teacher
-        <set>
-            <if test="graduateSchool != null">
-                graduate_school_ = #{graduateSchool},
-            </if>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="technicalTitles != null">
-                technical_titles_ = #{technicalTitles},
-            </if>
-            <if test="entryDate != null">
-                entry_date_ = #{entryDate},
-            </if>
-            <if test="demissionDate != null">
-                demission_date_ = #{demissionDate},
-            </if>
-            <if test="jobType != null">
-                job_type_ = #{jobType},
-            </if>
-            <if test="flowOrganRange != null">
-                flow_organ_range_ = #{flowOrganRange},
-            </if>
-            <if test="certificateType != null">
-                certificate_type_ = #{certificateType},
-            </if>
-            <if test="jobNature != null">
-                job_nature_ = #{jobNature},
-            </if>
-            <if test="isProbationPeriod != null">
-                is_probation_period_ = #{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="educationBackground != null">
-                education_background_ = #{educationBackground},
-            </if>
-            <if test="certificateNum != null">
-                certificate_num_ = #{certificateNum},
-            </if>
-            <if test="workUnit != null">
-                work_unit_ = #{workUnit},
-            </if>
-            <if test="introduction != null">
-                introduction_ = #{introduction},
-            </if>
-        </set>
-        WHERE user_id_ = #{userId}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <update id="delete">
-		DELETE FROM teacher WHERE user_id_ = #{userId}
-	</update>
-
-    <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
-        UPDATE sys_user
-        <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="wxOpenid != null">
-                wx_openid_ = #{wxOpenid},
-            </if>
-            <if test="avatar != null">
-                avatar_ = #{avatar},
-            </if>
-            <if test="email != null">
-                email_ = #{email},
-            </if>
-            <if test="gender != null">
-                gender_ = #{gender, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="salt != null">
-                salt_ = #{salt},
-            </if>
-            <if test="username != null">
-                username_ = #{username},
-            </if>
-            <if test="userType != null">
-                user_type_ = #{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="lockFlag != null">
-                lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="birthdate != null">
-                birthdate_ = #{birthdate},
-            </if>
-            <if test="phone != null">
-                phone_ = #{phone},
-            </if>
-            <if test="qqOpenid != null">
-                qq_openid_ = #{qqOpenid},
-            </if>
-            <if test="nation != null">
-                nation_ = #{nation},
-            </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
-            <if test="imToken != null">
-                im_token_ = #{imToken},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="Teacher" parameterType="map">
-        SELECT t.*,su.username_,su.password_,su.salt_,su.phone_,su.avatar_,
-        su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
-        su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,t.subject_id_,t.organ_id_,o.name_ organ_name_
-        FROM teacher t
-        LEFT JOIN sys_user su ON t.id_ = su.id_
-        LEFT JOIN organization o ON t.organ_id_ = o.id_
-        <include refid="queryPageMap"/>
-        <include refid="global.limit"/>
-    </select>
-
-    <sql id="queryPageMap">
-        <where>
-            <if test="lockFlag != null">
-                AND su.lock_flag_ = #{lockFlag}
-            </if>
-            <if test="subjectId != null">
-                AND t.subject_id_ LIKE CONCAT('%',#{subjectId},'%')
-            </if>
-            <if test="organId != null">
-                AND o.organ_id_ = #{organId}
-            </if>
-            <if test="jobNature != null">
-                AND t.job_nature_ = #{jobNature}
-            </if>
-            <if test="isProbationPeriod != null">
-                AND t.is_probation_period_ = #{isProbationPeriod}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-        SELECT COUNT(t.id_) FROM teacher t
-        LEFT JOIN sys_user su ON t.id_ = su.id_
-        LEFT JOIN `subject` s ON t.subject_id_ = s.id_
-        LEFT JOIN organization o ON t.organ_id_ = o.id_
-        <include refid="queryPageMap"/>
-	</select>
-
-    <!-- 根据证件号查询老师 -->
-    <select id="findByCertificateNum" resultMap="Teacher">
-		SELECT * FROM teacher WHERE certificate_num_ = #{certificateNum}
-	</select>
-</mapper>

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

@@ -1,88 +0,0 @@
-<?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>

+ 0 - 80
mec-web/src/main/resources/config/mybatis/VipGroupCategoryMapper.xml

@@ -1,80 +0,0 @@
-<?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.VipGroupCategoryDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.VipGroupCategory" id="VipGroupCategory">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="online_classes_salary_" property="onlineClassesSalary" />
-		<result column="offline_classes_salary_" property="offlineClassesSalary" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VipGroupCategory" >
-		SELECT * FROM vip_group_category WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="VipGroupCategory">
-		SELECT * FROM vip_group_category ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.VipGroupCategory" 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_category (id_,name_,online_classes_salary_,offline_classes_salary_,del_flag_,create_time_,update_time_) VALUES(#{id},#{name},#{onlineClassesSalary},#{offlineClassesSalary},#{delFlag},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.VipGroupCategory">
-		UPDATE vip_group_category <set>
-<if test="delFlag != null">
-del_flag_ = #{delFlag},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="onlineClassesSalary != null">
-online_classes_salary_ = #{onlineClassesSalary},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="offlineClassesSalary != null">
-offline_classes_salary_ = #{offlineClassesSalary},
-</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 vip_group_category WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VipGroupCategory" parameterType="map">
-		SELECT * FROM vip_group_category ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_category
-	</select>
-</mapper>

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

@@ -1,70 +0,0 @@
-<?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>

+ 0 - 120
mec-web/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -1,120 +0,0 @@
-<?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"/>
-        <result column="audit_status_" property="auditStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="price_" property="price"/>
-    </resultMap>
-
-    <resultMap id="studentManageVipGroup" type="com.ym.mec.web.dal.dto.StudentManageVipGroupDto" extends="VipGroup">
-        <result property="vipGroupCategory" column="vip_group_category_"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="VipGroup">
-		SELECT * FROM vip_group WHERE id_ = #{id} 
-	</select>
-
-    <select id="findStudentVipGroups" resultMap="studentManageVipGroup">
-        SELECT
-            vg.*,
-            vgc.name_ vip_group_category_
-        FROM
-            class_group_student_mapper cgsm
-            LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_
-            LEFT JOIN vip_group vg ON vgcgm.vip_group_id_=vg.id_
-            LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
-        WHERE cgsm.class_group_id_=vgcgm.class_group_id_ AND cgsm.user_id_=#{userID}
-    </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_,price_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{price})
-    </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>
-            <if test="price!=null">
-                price_=#{price}
-            </if>
-            <if test="auditStatus != null">
-                audit_status_ = #{auditStatus,typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"},
-            </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>