From 90dafeea713fe5ba3825cac79d88077be466498a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 7 Jan 2025 16:58:36 +0800
Subject: [PATCH] 'commit'

---
 .../MaxKB/Controller/MaxKbController.java     | 18 +++++++++++----
 .../QingLong/MaxKB/Model/MaxKbModel.java      | 23 +++++++++++--------
 src/main/resources/Sql/ExportExcel.sql        | 21 +++++++++++------
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java
index 44882c6c..c2b8147b 100644
--- a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java
+++ b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java
@@ -135,16 +135,26 @@ public class MaxKbController extends Controller {
     }
 
     /**
-     * 获取已匹配学校名单，获取未匹配学校名单
+     * 按学校名称匹配学校名称【成批匹配】
      *
-     * @param type_id  1：已匹配学校，0：未匹配学校
      * @param pageNum  页码
      * @param pageSize 每页数量
      */
     // http://10.10.21.20:9000/QingLong/maxkb/matchSchoolNameList?type_id=1&pageNum=1&pageSize=10
     @Before(GET.class)
-    public void matchSchoolNameList(int type_id, int pageNum, int pageSize) {
-        Page<Record> page = mkm.matchSchoolNameList(type_id, pageNum, pageSize);
+    public void matchSchoolNameList(int pageNum, int pageSize) {
+        Page<Record> page = mkm.matchSchoolNameList(pageNum, pageSize);
+        renderJson(page);
+    }
+    /**
+     * 按课程匹配学校名称【单个匹配】
+     *
+     * @param pageNum  页码
+     * @param pageSize 每页数量
+     */
+    // http://10.10.21.20:9000/QingLong/maxkb/matchLessonSchoolName?pageNum=1&pageSize=10
+    public void matchLessonSchoolName(int pageNum, int pageSize) {
+        Page<Record> page = mkm.matchLessonSchoolName(pageNum, pageSize);
         renderJson(page);
     }
 }
diff --git a/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java b/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java
index 2bd19369..b3742bb2 100644
--- a/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java
+++ b/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java
@@ -307,19 +307,24 @@ public class MaxKbModel {
 
     /**
      * 获取学校标准名称列表
-     * @param type_id 类型
+     *
+     * @param pageNum  页码
+     * @param pageSize 每页数量
+     * @return
+     */
+    public Page<Record> matchSchoolNameList(int pageNum, int pageSize) {
+        SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchSchoolNameList");
+        return Db.paginate(pageNum, pageSize, sqlPara);
+    }
+
+    /**
+     * 获取课程名称列表
      * @param pageNum 页码
      * @param pageSize 每页数量
      * @return
      */
-    public Page<Record> matchSchoolNameList(int type_id, int pageNum, int pageSize) {
-        Kv kv = Kv.create();
-        if (type_id == 1) {
-            kv.set("matchType1", 1);
-        } else if (type_id == 0) {
-            kv.set("matchType2", 0);
-        }
-        SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchSchoolNameList", kv);
+    public Page<Record> matchLessonSchoolName(int pageNum, int pageSize) {
+        SqlPara sqlPara = Db.getSqlPara("ExportExcel.matchLessonSchoolName");
         return Db.paginate(pageNum, pageSize, sqlPara);
     }
 }
diff --git a/src/main/resources/Sql/ExportExcel.sql b/src/main/resources/Sql/ExportExcel.sql
index b179beaa..ac4081ee 100644
--- a/src/main/resources/Sql/ExportExcel.sql
+++ b/src/main/resources/Sql/ExportExcel.sql
@@ -73,12 +73,19 @@
   #sql("matchSchoolNameList")
     select distinct t1.teacher_school_name,t2.organization_no,t2.organization_name from t_crawler_resource 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 1=1
-        #if(matchType1)
-            and t2.organization_no is not null
-        #end
-        #if(matchType2)
-            and t2.organization_no is null
-        #end
+    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_resource 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
\ No newline at end of file