Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/YunXiao/Model/YunXiaoModel.java

@@ -26,7 +26,7 @@ public class YunXiaoModel {
      * @return
      */
     public Page<com.jfinal.plugin.activerecord.Record> matchSchoolNameList(int pageNum, int pageSize) {
-        SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchSchoolNameList");
+        SqlPara sqlPara = Db.getSqlPara("YunXiao.matchSchoolNameList");
         return Db.paginate(pageNum, pageSize, sqlPara);
     }
 
@@ -38,7 +38,7 @@ public class YunXiaoModel {
      * @return
      */
     public Page<com.jfinal.plugin.activerecord.Record> matchLessonSchoolName(int pageNum, int pageSize) {
-        SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchLessonSchoolName");
+        SqlPara sqlPara = Db.getSqlPara("YunXiao.matchLessonSchoolName");
         return Db.paginate(pageNum, pageSize, sqlPara);
     }
 

src/main/resources/Sql/ExportExcel.sql

@@ -69,23 +69,4 @@
             t.sort_order;
   #end
 
-  -- 匹配的学校名称列表
-  #sql("matchSchoolNameList")
-    select distinct t1.teacher_school_name,t2.organization_no,t2.organization_name from t_crawler_lesson as t1
-    left join 教基1001 as t2 on t1.teacher_school_name=t2.organization_name and t2.a=1 and length(t2.organization_no)=10
-    where t2.organization_no is null
-  #end
-  -- 匹配课程名称与学校名称
-  #sql("matchLessonSchoolName")
-    select t1.lesson_id,t1.lesson_name, t1.teacher_school_name,t1.teacher_id,t1.teacher_name,t2.organization_name,
-           t1.subject_id,t1.stage_id,t1.scheme_id,t1.book_id,
-           t3.subject_name,t4.stage_name,t5.scheme_name,t6.book_name
-    from t_crawler_lesson as t1
-             left join 教基1001 as t2 on t1.teacher_school_name=t2.organization_name and t2.a=1 and length(t2.organization_no)=10
-             inner join t_crawler_subject as t3 on t1.subject_id=t3.subject_id
-             inner join t_crawler_stage as t4 on t1.stage_id=t4.stage_id
-             inner join t_crawler_scheme as t5 on t1.scheme_id=t5.scheme_id
-             inner join t_crawler_book as t6 on t1.book_id=t6.book_id
-    where t2.organization_no is  null
-    #end
 #end

src/main/resources/Sql/YunXiao.sql

@@ -36,4 +36,15 @@
     select t1.gather_regionc,t1.organization_name,count(1) as c from t_crawler_lesson_school as t1 where t1.gather_regionc<>'' GROUP BY t1.organization_name,t1.gather_regionc
     order by t1.gather_regionc,c desc;
    #end
+
+    -- 匹配的学校名称列表
+    #sql("matchSchoolNameList")
+        select DISTINCT original_school_name from t_crawler_lesson_school where match_type=0
+    #end
+    -- 匹配课程名称与学校名称
+    #sql("matchLessonSchoolName")
+      select t1.lesson_id,t2.lesson_name,t2.teacher_name,t1.original_school_name from t_crawler_lesson_school as t1
+      inner join t_crawler_lesson as t2 on t1.lesson_id=t2.lesson_id
+      where t1.match_type=0
+    #end
 #end