Browse Source

修改课程地点查询逻辑

zhangxin 1 week ago
parent
commit
ede2ce19ac

+ 6 - 6
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesMapper.xml

@@ -87,13 +87,13 @@
              ,b.id,b.price_type,b.good_rate,e.latitude,e.longitude,count(c.courses_id) as coursesNum
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
-        LEFT JOIN nm_site e on e.id = b.site_id
+        LEFT JOIN nm_site e on e.id = b.address_site_id
         where 1=1
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>
         <if test="courseRequestVo.siteId != null and courseRequestVo.siteId !=''">
-            and  b.site_id=#{courseRequestVo.siteId}
+            and  b.address_site_id=#{courseRequestVo.siteId}
         </if>
         <if test="courseRequestVo.priceType != null">
             and  b.price_type=#{courseRequestVo.priceType}
@@ -109,13 +109,13 @@
                    ) /1000 AS km
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
-        LEFT JOIN nm_site e on e.id = b.site_id
+        LEFT JOIN nm_site e on e.id = b.address_site_id
         where 1=1
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>
         <if test="courseRequestVo.siteId != null and courseRequestVo.siteId !=''">
-            and  b.site_id=#{courseRequestVo.siteId}
+            and  b.address_site_id=#{courseRequestVo.siteId}
         </if>
         <if test="courseRequestVo.priceType != null">
             and  b.price_type=#{courseRequestVo.priceType}
@@ -139,13 +139,13 @@
         ,b.id,b.price_type,b.good_rate,e.latitude,e.longitude,count(c.courses_id) as coursesNum
         FROM nm_courses b
         LEFT JOIN nm_courses_price_rules c on b.id= c.courses_id
-        LEFT JOIN nm_site e on e.id = b.site_id
+        LEFT JOIN nm_site e on e.id = b.address_site_id
         where 1=1
         <if test="courseRequestVo.instructorId != null and courseRequestVo.instructorId !=''">
             and  b.user_id=#{courseRequestVo.instructorId}
         </if>
         <if test="courseRequestVo.siteId != null and courseRequestVo.siteId !=''">
-            and  b.site_id=#{courseRequestVo.siteId}
+            and  b.address_site_id=#{courseRequestVo.siteId}
         </if>
         <if test="courseRequestVo.priceType != null">
             and  b.price_type=#{courseRequestVo.priceType}