|
|
@@ -260,34 +260,34 @@
|
|
|
<select id="selectUser" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
resultMap="ClassGradeUserVoResult">
|
|
|
SELECT
|
|
|
- g.*,
|
|
|
- u.user_account,
|
|
|
- u.realname,
|
|
|
- u.id_card,
|
|
|
- u.telphone,
|
|
|
- u.sex,
|
|
|
- u.edu_level,
|
|
|
- u.company_name,
|
|
|
- cg.class_name,
|
|
|
- cg.official_name,
|
|
|
- cg.class_status,
|
|
|
- cg.interface_push_id,
|
|
|
- cg.class_start_time,
|
|
|
- cg.class_end_time,
|
|
|
- g.official_status_num,
|
|
|
- g.period_time,
|
|
|
- g.period_wait_time,
|
|
|
- g.period_status
|
|
|
+ g.*,
|
|
|
+ u.user_account,
|
|
|
+ u.realname,
|
|
|
+ u.id_card,
|
|
|
+ u.telphone,
|
|
|
+ u.sex,
|
|
|
+ u.edu_level,
|
|
|
+ u.company_name,
|
|
|
+ cg.class_name,
|
|
|
+ cg.official_name,
|
|
|
+ cg.class_status,
|
|
|
+ cg.interface_push_id,
|
|
|
+ cg.class_start_time,
|
|
|
+ cg.class_end_time,
|
|
|
+ g.official_status_num,
|
|
|
+ g.period_time,
|
|
|
+ g.period_wait_time,
|
|
|
+ g.period_status
|
|
|
FROM
|
|
|
- class_grade_user g
|
|
|
- LEFT JOIN `user` u ON g.user_id = u.user_id
|
|
|
- LEFT JOIN class_grade cg ON cg.grade_id = g.grade_id
|
|
|
+ class_grade_user g
|
|
|
+ LEFT JOIN `user` u ON g.user_id = u.user_id
|
|
|
+ LEFT JOIN class_grade cg ON cg.grade_id = g.grade_id
|
|
|
WHERE
|
|
|
- 1 = 1
|
|
|
+ 1 = 1
|
|
|
AND g.change_grade = 0
|
|
|
- AND g.grade_id = #{gradeId}
|
|
|
- AND g.user_id = #{userId}
|
|
|
- AND g.order_goods_id = #{orderGoodsId}
|
|
|
+ AND g.grade_id = #{gradeId}
|
|
|
+ AND g.user_id = #{userId}
|
|
|
+ AND g.order_goods_id = #{orderGoodsId}
|
|
|
</select>
|
|
|
|
|
|
<select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
@@ -386,16 +386,16 @@
|
|
|
<select id="listUserVideoRecord" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
resultMap="ClassPeriodStudentVo">
|
|
|
SELECT
|
|
|
- up.* ,cg.class_name,cs.duration_time,u.id_card,u.realname,u.one_inch_photos,u.company_name,cs.`name` as section_name,ups.record_start_time,ups.record_end_time,ups.update_time as on_line_time
|
|
|
+ up.* ,cg.class_name,cs.duration_time,u.id_card,u.realname,u.one_inch_photos,u.company_name,cs.`name` as section_name,ups.record_start_time,ups.record_end_time,ups.update_time as on_line_time
|
|
|
FROM
|
|
|
- user_period up
|
|
|
- LEFT JOIN user_period_status ups ON up.id = ups.period_id
|
|
|
- LEFT JOIN class_grade cg on up.grade_id = cg.grade_id
|
|
|
- LEFT JOIN goods g ON up.goods_id = g.goods_id
|
|
|
- LEFT JOIN course_section cs ON up.section_id = cs.section_id
|
|
|
- LEFT JOIN `user` u ON up.user_id = u.user_id
|
|
|
+ user_period up
|
|
|
+ LEFT JOIN user_period_status ups ON up.id = ups.period_id
|
|
|
+ LEFT JOIN class_grade cg on up.grade_id = cg.grade_id
|
|
|
+ LEFT JOIN goods g ON up.goods_id = g.goods_id
|
|
|
+ LEFT JOIN course_section cs ON up.section_id = cs.section_id
|
|
|
+ LEFT JOIN `user` u ON up.user_id = u.user_id
|
|
|
WHERE
|
|
|
- up.grade_id > 0 and up.type = 1
|
|
|
+ up.grade_id > 0 and up.type = 1
|
|
|
<if test="businessId != null and businessId != ''">
|
|
|
AND g.business_id = #{businessId}
|
|
|
</if>
|
|
|
@@ -532,10 +532,10 @@
|
|
|
</if>
|
|
|
<if test="searchKey != null and searchKey != '' ">
|
|
|
and (u.realname like concat('%', #{searchKey}, '%')
|
|
|
- or u.id_card like concat('%', #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
|
|
|
- or g.goods_name like concat('%', #{searchKey}, '%')
|
|
|
- or cg.class_name like concat('%', #{searchKey}, '%')
|
|
|
- or u.company_name like concat('%', #{searchKey}, '%'))
|
|
|
+ or u.id_card like concat('%', #{searchKey,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
|
|
|
+ or g.goods_name like concat('%', #{searchKey}, '%')
|
|
|
+ or cg.class_name like concat('%', #{searchKey}, '%')
|
|
|
+ or u.company_name like concat('%', #{searchKey}, '%'))
|
|
|
</if>
|
|
|
<if test="inputOrderSn != null and inputOrderSn != '' ">
|
|
|
and (select count(*) from `order` o where o.order_sn =og.order_sn and o.input_order_sn = #{inputOrderSn})>0
|
|
|
@@ -575,32 +575,32 @@
|
|
|
<select id="listUserWeekStudyTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
resultType="Long">
|
|
|
SELECT
|
|
|
- IFNULL( SUM( cs.duration_time ), 0 )
|
|
|
+ IFNULL( SUM( cs.duration_time ), 0 )
|
|
|
FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- section_id
|
|
|
- FROM
|
|
|
- user_study_record
|
|
|
- WHERE
|
|
|
- user_id = #{userId}
|
|
|
- AND grade_id = #{gradeId}
|
|
|
- AND order_goods_id = #{orderGoodsId}
|
|
|
- AND current_status = 1
|
|
|
- AND `status` = 1
|
|
|
- <if test="searchWeekStartTime != null and searchWeekStartTime != '' ">
|
|
|
- AND update_time >= #{searchWeekStartTime}
|
|
|
- </if>
|
|
|
- <if test="searchWeekEndTime != null and searchWeekEndTime != '' ">
|
|
|
- AND #{searchWeekEndTime} >= update_time
|
|
|
- </if>
|
|
|
- GROUP BY
|
|
|
- course_id,
|
|
|
- module_id,
|
|
|
- chapter_id,
|
|
|
- section_id
|
|
|
- ) usr
|
|
|
- LEFT JOIN course_section cs ON usr.section_id = cs.section_id
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
+ section_id
|
|
|
+ FROM
|
|
|
+ user_study_record
|
|
|
+ WHERE
|
|
|
+ user_id = #{userId}
|
|
|
+ AND grade_id = #{gradeId}
|
|
|
+ AND order_goods_id = #{orderGoodsId}
|
|
|
+ AND current_status = 1
|
|
|
+ AND `status` = 1
|
|
|
+ <if test="searchWeekStartTime != null and searchWeekStartTime != '' ">
|
|
|
+ AND update_time >= #{searchWeekStartTime}
|
|
|
+ </if>
|
|
|
+ <if test="searchWeekEndTime != null and searchWeekEndTime != '' ">
|
|
|
+ AND #{searchWeekEndTime} >= update_time
|
|
|
+ </if>
|
|
|
+ GROUP BY
|
|
|
+ course_id,
|
|
|
+ module_id,
|
|
|
+ chapter_id,
|
|
|
+ section_id
|
|
|
+ ) usr
|
|
|
+ LEFT JOIN course_section cs ON usr.section_id = cs.section_id
|
|
|
</select>
|
|
|
|
|
|
<select id="listUserWeekPeriod" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
@@ -818,10 +818,10 @@
|
|
|
<if test="searchKey != null and searchKey != '' ">
|
|
|
and (
|
|
|
u.realname like concat('%', #{searchKey}, '%')
|
|
|
- or u.id_card like concat('%', #{searchKey}, '%')
|
|
|
- or g.goods_name like concat('%', #{searchKey}, '%')
|
|
|
- or cg.class_name like concat('%', #{searchKey}, '%')
|
|
|
- or u.company_name like concat('%', #{searchKey}, '%'))
|
|
|
+ or u.id_card like concat('%', #{searchKey}, '%')
|
|
|
+ or g.goods_name like concat('%', #{searchKey}, '%')
|
|
|
+ or cg.class_name like concat('%', #{searchKey}, '%')
|
|
|
+ or u.company_name like concat('%', #{searchKey}, '%'))
|
|
|
</if>
|
|
|
<if test="searchStartTime != null and searchStartTime !='' ">
|
|
|
AND cgu.create_time >=#{searchStartTime}
|
|
|
@@ -1011,7 +1011,7 @@
|
|
|
LEFT JOIN goods_course gc on gc.course_id = cm.course_id
|
|
|
where 1=1
|
|
|
<if test="goodsId != null and goodsId !='' ">
|
|
|
- and gc.goods_id=#{goodsId}
|
|
|
+ and gc.goods_id=#{goodsId}
|
|
|
</if>
|
|
|
<if test="courseId != null and courseId !='' ">
|
|
|
and gc.course_id=#{courseId}
|
|
|
@@ -1419,28 +1419,28 @@
|
|
|
|
|
|
<select id="selectStart" parameterType="map" resultType="long">
|
|
|
SELECT
|
|
|
- rp.create_time
|
|
|
+ rp.create_time
|
|
|
FROM
|
|
|
- user_study_record_photo rp
|
|
|
- LEFT JOIN user_period_status ups ON rp.period_id = ups.id
|
|
|
- LEFT JOIN user_period up ON up.id = ups.period_id
|
|
|
+ user_study_record_photo rp
|
|
|
+ LEFT JOIN user_period_status ups ON rp.period_id = ups.id
|
|
|
+ LEFT JOIN user_period up ON up.id = ups.period_id
|
|
|
WHERE
|
|
|
- 1=1
|
|
|
+ 1=1
|
|
|
<if test="orderGoodsId != null ">
|
|
|
AND (up.order_goods_id = #{orderGoodsId} or up.order_goods_id is null)
|
|
|
</if>
|
|
|
- AND ups.period_status = 1
|
|
|
- AND up.grade_id = #{gradeId}
|
|
|
- AND up.user_id = #{userId}
|
|
|
+ AND ups.period_status = 1
|
|
|
+ AND up.grade_id = #{gradeId}
|
|
|
+ AND up.user_id = #{userId}
|
|
|
ORDER BY
|
|
|
- rp.create_time ASC
|
|
|
+ rp.create_time ASC
|
|
|
</select>
|
|
|
|
|
|
<select id="selectStartNoPhoto" parameterType="map" resultType="long">
|
|
|
SELECT
|
|
|
ups.record_start_time
|
|
|
FROM
|
|
|
- user_period_status ups
|
|
|
+ user_period_status ups
|
|
|
LEFT JOIN user_period up ON up.id = ups.period_id
|
|
|
WHERE
|
|
|
1=1
|
|
|
@@ -1477,22 +1477,22 @@
|
|
|
|
|
|
<select id="sendClassGradeUser" resultMap="ClassGradeUserGoodsVoResult">
|
|
|
SELECT
|
|
|
- cgu.user_id,
|
|
|
- cgu.order_goods_id,
|
|
|
- cg.class_start_time,
|
|
|
- cg.class_end_time,
|
|
|
- og.goods_id,
|
|
|
- cg.grade_id
|
|
|
+ cgu.user_id,
|
|
|
+ cgu.order_goods_id,
|
|
|
+ cg.class_start_time,
|
|
|
+ cg.class_end_time,
|
|
|
+ og.goods_id,
|
|
|
+ cg.grade_id
|
|
|
FROM
|
|
|
- class_grade_user cgu
|
|
|
- LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
- LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
- LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
- LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
+ class_grade_user cgu
|
|
|
+ LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
+ LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
+ LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
+ LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
where 1=1
|
|
|
- and irb.remind_id =5
|
|
|
+ and irb.remind_id =5
|
|
|
and cgu.status = 1
|
|
|
- AND unix_timestamp(now()) BETWEEN cg.class_end_time-1728000 and cg.class_end_time-1641600
|
|
|
+ AND unix_timestamp(now()) BETWEEN cg.class_end_time-1728000 and cg.class_end_time-1641600
|
|
|
</select>
|
|
|
|
|
|
<select id="checkSendClassGradeUser" parameterType="map" resultType="long">
|
|
|
@@ -1503,44 +1503,44 @@
|
|
|
<select id="sendTenClassGradeUser" resultMap="ClassGradeUserGoodsVoResult">
|
|
|
|
|
|
SELECT
|
|
|
- cgu.user_id,
|
|
|
- cgu.order_goods_id,
|
|
|
- cg.class_start_time,
|
|
|
- cg.class_end_time,
|
|
|
- og.goods_id,
|
|
|
- cg.grade_id
|
|
|
+ cgu.user_id,
|
|
|
+ cgu.order_goods_id,
|
|
|
+ cg.class_start_time,
|
|
|
+ cg.class_end_time,
|
|
|
+ og.goods_id,
|
|
|
+ cg.grade_id
|
|
|
FROM
|
|
|
- class_grade_user cgu
|
|
|
- LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
- LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
- LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
- LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
+ class_grade_user cgu
|
|
|
+ LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
+ LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
+ LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
+ LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
where 1=1
|
|
|
- and irb.remind_id =6
|
|
|
+ and irb.remind_id =6
|
|
|
and cgu.status = 1
|
|
|
- AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
|
|
|
+ AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
|
|
|
</select>
|
|
|
|
|
|
|
|
|
<select id="sendFiveClassGradeUser" resultMap="ClassGradeUserGoodsVoResult">
|
|
|
|
|
|
SELECT
|
|
|
- cgu.user_id,
|
|
|
- cgu.order_goods_id,
|
|
|
- cg.class_start_time,
|
|
|
- cg.class_end_time,
|
|
|
- og.goods_id,
|
|
|
- cg.grade_id
|
|
|
+ cgu.user_id,
|
|
|
+ cgu.order_goods_id,
|
|
|
+ cg.class_start_time,
|
|
|
+ cg.class_end_time,
|
|
|
+ og.goods_id,
|
|
|
+ cg.grade_id
|
|
|
FROM
|
|
|
- class_grade_user cgu
|
|
|
- LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
- LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
- LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
- LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
+ class_grade_user cgu
|
|
|
+ LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id
|
|
|
+ LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
|
|
|
+ LEFT JOIN goods g on og.goods_id = g.goods_id
|
|
|
+ LEFT JOIN inform_remind_business irb on irb.business_id = g.business_id
|
|
|
where 1=1
|
|
|
- and irb.remind_id =7
|
|
|
+ and irb.remind_id =7
|
|
|
and cgu.status = 1
|
|
|
- AND unix_timestamp(now()) BETWEEN cg.class_end_time-432000 and cg.class_end_time-345600
|
|
|
+ AND unix_timestamp(now()) BETWEEN cg.class_end_time-432000 and cg.class_end_time-345600
|
|
|
</select>
|
|
|
<select id="selectUserCount" parameterType="com.zhongzheng.modules.user.domain.User" resultType="long">
|
|
|
SELECT
|
|
|
@@ -1579,7 +1579,7 @@
|
|
|
cc.chapter_id,
|
|
|
cc.`name`,
|
|
|
m.sort,
|
|
|
- 0 as common_sign,
|
|
|
+ 0 as common_sign,
|
|
|
(SELECT count(*) from course_chapter_section ccs WHERE ccs.chapter_id = cc.chapter_id) section_num
|
|
|
FROM
|
|
|
course_menu m
|
|
|
@@ -1762,40 +1762,40 @@
|
|
|
|
|
|
<select id="getPeriodStartTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
|
|
|
SELECT
|
|
|
- p.create_time
|
|
|
+ p.create_time
|
|
|
FROM
|
|
|
- user_study_record usr
|
|
|
- LEFT JOIN user_study_record_photo p ON usr.record_id = p.record_id
|
|
|
+ user_study_record usr
|
|
|
+ LEFT JOIN user_study_record_photo p ON usr.record_id = p.record_id
|
|
|
WHERE
|
|
|
- usr.current_status = 1
|
|
|
- AND usr.user_id = #{userId}
|
|
|
- AND usr.grade_id = #{gradeId}
|
|
|
+ usr.current_status = 1
|
|
|
+ AND usr.user_id = #{userId}
|
|
|
+ AND usr.grade_id = #{gradeId}
|
|
|
<if test="orderGoodsId != null and orderGoodsId !='' ">
|
|
|
AND usr.order_goods_id = #{orderGoodsId}
|
|
|
</if>
|
|
|
- AND P.create_time IS NOT NULL
|
|
|
+ AND P.create_time IS NOT NULL
|
|
|
ORDER BY
|
|
|
- P.create_time
|
|
|
- LIMIT 1
|
|
|
+ P.create_time
|
|
|
+ LIMIT 1
|
|
|
</select>
|
|
|
|
|
|
<select id="getPeriodEndTime" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="java.lang.Long">
|
|
|
SELECT
|
|
|
- ups.record_end_time
|
|
|
+ ups.record_end_time
|
|
|
FROM
|
|
|
- user_period_status ups
|
|
|
- LEFT JOIN user_period up ON up.id = ups.period_id
|
|
|
+ user_period_status ups
|
|
|
+ LEFT JOIN user_period up ON up.id = ups.period_id
|
|
|
WHERE
|
|
|
- 1 = 1
|
|
|
- AND up.user_id = #{userId}
|
|
|
- AND up.grade_id = #{gradeId}
|
|
|
- <if test="orderGoodsId != null and orderGoodsId !='' ">
|
|
|
- AND up.order_goods_id = #{orderGoodsId}
|
|
|
- </if>
|
|
|
- AND ups.period_status = 1
|
|
|
+ 1 = 1
|
|
|
+ AND up.user_id = #{userId}
|
|
|
+ AND up.grade_id = #{gradeId}
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId !='' ">
|
|
|
+ AND up.order_goods_id = #{orderGoodsId}
|
|
|
+ </if>
|
|
|
+ AND ups.period_status = 1
|
|
|
ORDER BY
|
|
|
- ups.record_end_time DESC
|
|
|
- LIMIT 1
|
|
|
+ ups.record_end_time DESC
|
|
|
+ LIMIT 1
|
|
|
</select>
|
|
|
|
|
|
<select id="getClassInfoByUser" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.grade.domain.ClassGradeUser">
|
|
|
@@ -1809,11 +1809,11 @@
|
|
|
LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
|
|
|
LEFT JOIN course_business cb ON g.business_id = cb.id
|
|
|
WHERE
|
|
|
- cgu.`status` = 1
|
|
|
- AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), "继续教育" ) > 0
|
|
|
- AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), "施工现场专业人员" ) > 0
|
|
|
- AND og.`status` = 1
|
|
|
- AND og.refund_status != 2
|
|
|
+ cgu.`status` = 1
|
|
|
+ AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), "继续教育" ) > 0
|
|
|
+ AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), "施工现场专业人员" ) > 0
|
|
|
+ AND og.`status` = 1
|
|
|
+ AND og.refund_status != 2
|
|
|
AND og.pay_status IN ( 2, 3, 4 )
|
|
|
AND cgu.period_status != 1
|
|
|
AND cgu.finish_status = 0
|
|
|
@@ -2073,24 +2073,24 @@
|
|
|
|
|
|
<select id="getListUserSubscribe" resultType="com.zhongzheng.modules.user.vo.UserUsbRecordVo" parameterType="com.zhongzheng.modules.user.bo.UserUsbRecordBo">
|
|
|
SELECT
|
|
|
- us.subscribe_id,
|
|
|
- us.create_time,
|
|
|
- g.goods_name,
|
|
|
- CONCAT(cet.education_name,'-',cb.business_name,cpt.project_name) AS businessName,
|
|
|
- m.category_name AS majorName,
|
|
|
- us.subscribe_status,
|
|
|
- us.apply_site_exam_time AS applyTime,
|
|
|
- us.apply_site_start_time AS applyStarTime,
|
|
|
- us.apply_site_end_time AS applyEndTime,
|
|
|
- us.apply_site_address AS applyAddress,
|
|
|
- '自带文具、身份证' AS remark
|
|
|
+ us.subscribe_id,
|
|
|
+ us.create_time,
|
|
|
+ g.goods_name,
|
|
|
+ CONCAT(cet.education_name,'-',cb.business_name,cpt.project_name) AS businessName,
|
|
|
+ m.category_name AS majorName,
|
|
|
+ us.subscribe_status,
|
|
|
+ us.apply_site_exam_time AS applyTime,
|
|
|
+ us.apply_site_start_time AS applyStarTime,
|
|
|
+ us.apply_site_end_time AS applyEndTime,
|
|
|
+ us.apply_site_address AS applyAddress,
|
|
|
+ '自带文具、身份证' AS remark
|
|
|
FROM user_subscribe us
|
|
|
- LEFT JOIN order_goods og ON us.order_goods_id = og.order_goods_id
|
|
|
- LEFT JOIN goods g ON og.goods_id = g.goods_id
|
|
|
- LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
|
|
|
- LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
|
|
|
- LEFT JOIN course_business cb ON g.business_id = cb.id
|
|
|
- LEFT JOIN major m ON g.major_id = m.id
|
|
|
+ LEFT JOIN order_goods og ON us.order_goods_id = og.order_goods_id
|
|
|
+ LEFT JOIN goods g ON og.goods_id = g.goods_id
|
|
|
+ LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
|
|
|
+ LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
|
|
|
+ LEFT JOIN course_business cb ON g.business_id = cb.id
|
|
|
+ LEFT JOIN major m ON g.major_id = m.id
|
|
|
WHERE 1=1 AND us.exam_status = 0
|
|
|
<if test="userId != null and userId !='' ">
|
|
|
AND us.user_id = #{userId}
|
|
|
@@ -2159,12 +2159,12 @@
|
|
|
<select id="selectUserNoTenant" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
|
|
|
resultType="com.zhongzheng.modules.grade.domain.ClassGradeUser">
|
|
|
SELECT
|
|
|
- g.*
|
|
|
+ g.*
|
|
|
FROM
|
|
|
- class_grade_user g
|
|
|
+ class_grade_user g
|
|
|
|
|
|
WHERE
|
|
|
- 1 = 1
|
|
|
+ 1 = 1
|
|
|
<if test="id != null ">
|
|
|
AND g.id = #{id}
|
|
|
</if>
|