From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/resources/mapper/TCoursePackageMapper.xml | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackageMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackageMapper.xml
index 8fc1230..788311b 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackageMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackageMapper.xml
@@ -4,35 +4,35 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsh.course.entity.TCoursePackage">
- <id column="id" property="id" />
- <result column="province" property="province" />
- <result column="provinceCode" property="provinceCode" />
- <result column="city" property="city" />
- <result column="cityCode" property="cityCode" />
- <result column="storeId" property="storeId" />
- <result column="coursePackageTypeId" property="coursePackageTypeId" />
- <result column="name" property="name" />
- <result column="siteId" property="siteId" />
- <result column="coachId" property="coachId" />
- <result column="maxSubscribeNumber" property="maxSubscribeNumber" />
- <result column="classStartTime" property="classStartTime" />
- <result column="classEndTime" property="classEndTime" />
- <result column="classWeeks" property="classWeeks" />
- <result column="coverDrawing" property="coverDrawing" />
- <result column="detailDrawing" property="detailDrawing" />
- <result column="introduceDrawing" property="introduceDrawing" />
- <result column="sort" property="sort" />
- <result column="payType" property="payType" />
- <result column="validDays" property="validDays" />
- <result column="courseId" property="courseId" />
- <result column="introduce" property="introduce" />
- <result column="integral" property="integral" />
- <result column="status" property="status" />
- <result column="auditStatus" property="auditStatus" />
- <result column="auditUserId" property="auditUserId" />
- <result column="authRemark" property="authRemark" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
+ <id column="id" property="id"/>
+ <result column="province" property="province"/>
+ <result column="provinceCode" property="provinceCode"/>
+ <result column="city" property="city"/>
+ <result column="cityCode" property="cityCode"/>
+ <result column="storeId" property="storeId"/>
+ <result column="coursePackageTypeId" property="coursePackageTypeId"/>
+ <result column="name" property="name"/>
+ <result column="siteId" property="siteId"/>
+ <result column="coachId" property="coachId"/>
+ <result column="maxSubscribeNumber" property="maxSubscribeNumber"/>
+ <result column="classStartTime" property="classStartTime"/>
+ <result column="classEndTime" property="classEndTime"/>
+ <result column="classWeeks" property="classWeeks"/>
+ <result column="coverDrawing" property="coverDrawing"/>
+ <result column="detailDrawing" property="detailDrawing"/>
+ <result column="introduceDrawing" property="introduceDrawing"/>
+ <result column="sort" property="sort"/>
+ <result column="payType" property="payType"/>
+ <result column="validDays" property="validDays"/>
+ <result column="courseId" property="courseId"/>
+ <result column="introduce" property="introduce"/>
+ <result column="integral" property="integral"/>
+ <result column="status" property="status"/>
+ <result column="auditStatus" property="auditStatus"/>
+ <result column="auditUserId" property="auditUserId"/>
+ <result column="authRemark" property="authRemark"/>
+ <result column="state" property="state"/>
+ <result column="insertTime" property="insertTime"/>
</resultMap>
<select id="queryStoreOfCourse" resultType="com.dsh.course.feignclient.model.CourseOfStoreVo">
SELECT tcp.id as courseId,
@@ -53,7 +53,6 @@
</select>
-
<select id="queryCoursePackageLists" resultType="map">
select
a.id,
@@ -65,7 +64,8 @@
CONCAT('购买后', a.validDays, '天内有效') as validDays,
a.sort,
a.`status`,
- a.state
+ a.state,
+ a.type
from t_course_package a
left join t_course_package_type b on (a.coursePackageTypeId = b.id)
where a.state != 3 and a.auditStatus = 2
@@ -78,11 +78,14 @@
<if test="null != item.coursePackageTypeId">
and a.coursePackageTypeId = #{item.coursePackageTypeId}
</if>
- <if test="null != item.storeId">
- and a.storeId = #{item.storeId}
+ <if test="item.storeIds != null and item.storeIds.size()>0">
+ AND a.storeId IN
+ <foreach collection="item.storeIds" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
</if>
<if test="null != item.name and '' != item.name">
- and a.name line CONCAT('%', #{item.name}, '%')
+ and a.name like CONCAT('%', #{item.name}, '%')
</if>
<if test="null != item.status">
and a.status = #{item.status}
@@ -128,7 +131,8 @@
<select id="queryByConfigId" resultType="java.util.Map">
select id,classHours from t_course_package_payment_config where coursePackageId =#{oneId}
</select>
- <select id="getHours" resultType="java.lang.String">
- select classHours from t_course_package_payment_config where id =#{coursePackageId}
+ <select id="getHours" resultType="java.lang.Integer">
+ select classHours from t_course_package_payment_config where coursePackageId =#{coursePackageId}
</select>
+
</mapper>
--
Gitblit v1.7.1