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 85d95034..44882c6c 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Controller/MaxKbController.java @@ -14,6 +14,7 @@ import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; import com.jfinal.kit.PropKit; import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.ext.interceptor.GET; import com.jfinal.kit.StrKit; @@ -123,4 +124,27 @@ public class MaxKbController extends Controller { //提供下载 renderFile(new File(tmpFile), gather_regionc + "统计报表.xlsx"); } + + /** + * 获取标准学校名单,名单来自发展规划处 + */ + // http://10.10.21.20:9000/QingLong/maxkb/getStandardSchoolList + @Before(GET.class) + public void getStandardSchoolList() { + renderJson(mkm.getStandardSchoolList()); + } + + /** + * 获取已匹配学校名单,获取未匹配学校名单 + * + * @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 page = mkm.matchSchoolNameList(type_id, 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 52613216..2bd19369 100644 --- a/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java +++ b/src/main/java/com/dsideal/QingLong/MaxKB/Model/MaxKbModel.java @@ -4,6 +4,7 @@ import com.dsideal.QingLong.Const.DbConst; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.SqlPara; @@ -281,6 +282,7 @@ public class MaxKbModel { /** * 导出Excel + * * @param gather_regionc * @return */ @@ -292,4 +294,32 @@ public class MaxKbModel { SqlPara sqlPara = Db.getSqlPara("ExportExcel.SchoolClassStudentTeacherList", kv); return Db.find(sqlPara); } + + /** + * 获取所有学校标准名称 + * + * @return + */ + public List getStandardSchoolList() { + String sql = "select organization_no,organization_name,gather_regionc from 教基1001 where a=1 and length(organization_no)=10 order by gather_regionc"; + return Db.find(sql); + } + + /** + * 获取学校标准名称列表 + * @param type_id 类型 + * @param pageNum 页码 + * @param pageSize 每页数量 + * @return + */ + public Page 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); + return Db.paginate(pageNum, pageSize, sqlPara); + } } diff --git a/src/main/resources/Sql/ExportExcel.sql b/src/main/resources/Sql/ExportExcel.sql index e33bdaf5..b179beaa 100644 --- a/src/main/resources/Sql/ExportExcel.sql +++ b/src/main/resources/Sql/ExportExcel.sql @@ -68,4 +68,17 @@ t.gather_regionc, t.sort_order; #end + + -- 匹配的学校名称列表 + #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 + #end #end \ No newline at end of file