diff --git a/Report2019/004各级各类民办教育学生情况.rpx b/Report2019/004各级各类民办教育学生情况.rpx index 18a655d7..5f457811 100644 Binary files a/Report2019/004各级各类民办教育学生情况.rpx and b/Report2019/004各级各类民办教育学生情况.rpx differ diff --git a/Report2019/005各级各类学校女学生数.rpx b/Report2019/005各级各类学校女学生数.rpx index c8442e31..68559660 100644 Binary files a/Report2019/005各级各类学校女学生数.rpx and b/Report2019/005各级各类学校女学生数.rpx differ diff --git a/Report2019/019中等职业学校(机构)学生分科类情况(总计).rpx b/Report2019/019中等职业学校(机构)学生分科类情况(总计).rpx index 02929f51..dd17b79c 100644 Binary files a/Report2019/019中等职业学校(机构)学生分科类情况(总计).rpx and b/Report2019/019中等职业学校(机构)学生分科类情况(总计).rpx differ diff --git a/Report2019/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx b/Report2019/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx index 2f73cd71..bbc03cc8 100644 Binary files a/Report2019/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx and b/Report2019/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx differ diff --git a/Report2019/029初中学生数.rpx b/Report2019/029初中学生数.rpx index 690b8f3f..0cd5567e 100644 Binary files a/Report2019/029初中学生数.rpx and b/Report2019/029初中学生数.rpx differ diff --git a/Report2019/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx b/Report2019/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx index 99c83f44..0e416a64 100644 Binary files a/Report2019/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx and b/Report2019/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx differ diff --git a/Report2020/004各级各类民办教育学生情况.rpx b/Report2020/004各级各类民办教育学生情况.rpx index 2b047bb5..70d9baab 100644 Binary files a/Report2020/004各级各类民办教育学生情况.rpx and b/Report2020/004各级各类民办教育学生情况.rpx differ diff --git a/Report2020/005各级各类学校女学生数.rpx b/Report2020/005各级各类学校女学生数.rpx index 321c4f2e..5b62a847 100644 Binary files a/Report2020/005各级各类学校女学生数.rpx and b/Report2020/005各级各类学校女学生数.rpx differ diff --git a/Report2020/012普通高中分课程专任教师学历情况.rpx b/Report2020/012普通高中分课程专任教师学历情况.rpx index ec00a332..83187e7f 100644 Binary files a/Report2020/012普通高中分课程专任教师学历情况.rpx and b/Report2020/012普通高中分课程专任教师学历情况.rpx differ diff --git a/Report2020/013普通高中专任教师专业技术职务、年龄结构情况.rpx b/Report2020/013普通高中专任教师专业技术职务、年龄结构情况.rpx index 56f22eea..69dcc76f 100644 Binary files a/Report2020/013普通高中专任教师专业技术职务、年龄结构情况.rpx and b/Report2020/013普通高中专任教师专业技术职务、年龄结构情况.rpx differ diff --git a/Report2020/017中等职业学校(机构)数.rpx b/Report2020/017中等职业学校(机构)数.rpx index 68a990cd..b343528e 100644 Binary files a/Report2020/017中等职业学校(机构)数.rpx and b/Report2020/017中等职业学校(机构)数.rpx differ diff --git a/Report2020/019中等职业学校(机构)学生分科类情况(总计).rpx b/Report2020/019中等职业学校(机构)学生分科类情况(总计).rpx index 89a94689..6e9d4240 100644 Binary files a/Report2020/019中等职业学校(机构)学生分科类情况(总计).rpx and b/Report2020/019中等职业学校(机构)学生分科类情况(总计).rpx differ diff --git a/Report2020/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx b/Report2020/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx index b1aadb38..54d28e6c 100644 Binary files a/Report2020/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx and b/Report2020/023中等职业学校(机构)专任教师、聘请校外教师学历情况(总计).rpx differ diff --git a/Report2020/027职业技术培训机构基本情况.rpx b/Report2020/027职业技术培训机构基本情况.rpx index 045b7b3e..8fa807ea 100644 Binary files a/Report2020/027职业技术培训机构基本情况.rpx and b/Report2020/027职业技术培训机构基本情况.rpx differ diff --git a/Report2020/029初中学生数.rpx b/Report2020/029初中学生数.rpx index 60656f20..ded5ef98 100644 Binary files a/Report2020/029初中学生数.rpx and b/Report2020/029初中学生数.rpx differ diff --git a/Report2020/县区/001普通高中校数、班数(总计).rpx b/Report2020/县区/001普通高中校数、班数(总计).rpx index 64a80382..c54e2df8 100644 Binary files a/Report2020/县区/001普通高中校数、班数(总计).rpx and b/Report2020/县区/001普通高中校数、班数(总计).rpx differ diff --git a/Report2020/县区/007中等职业学校(机构)数.rpx b/Report2020/县区/007中等职业学校(机构)数.rpx index 83d4a5aa..3f350450 100644 Binary files a/Report2020/县区/007中等职业学校(机构)数.rpx and b/Report2020/县区/007中等职业学校(机构)数.rpx differ diff --git a/Report2020/县区/014初中校数、班数(总计).rpx b/Report2020/县区/014初中校数、班数(总计).rpx index ed54b8f8..acb7437b 100644 Binary files a/Report2020/县区/014初中校数、班数(总计).rpx and b/Report2020/县区/014初中校数、班数(总计).rpx differ diff --git a/Report2020/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx b/Report2020/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx index 040d5de6..950f367d 100644 Binary files a/Report2020/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx and b/Report2020/县区/028特殊教育学校专任教师学历、专业技术职务情况.rpx differ diff --git a/ReportSQL/001各级各类教育校数、教职工数、专任教师情况【2020-11-10】.txt b/ReportSQL/001各级各类教育校数、教职工数、专任教师情况【2020-11-10】.txt index e69de29b..62153899 100644 --- a/ReportSQL/001各级各类教育校数、教职工数、专任教师情况【2020-11-10】.txt +++ b/ReportSQL/001各级各类教育校数、教职工数、专任教师情况【2020-11-10】.txt @@ -0,0 +1,96 @@ +SELECT sbr.organizationNo ,5 as schoolTypeGroupNo,'五、学前教育' as schoolTypeGroup,0 as schoolTypeGroupNo2,'' as schoolTypeGroup2,sbr.businessTypeNo,sbr.businessType +,sbr.isCount,sum( e+f+g+h+i) as jzgNo,sum(f) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J411 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('111') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,'小学' as businessType +,case when sbr.businessTypeNo='218' then 0 else 1 end as isCount,sum( e+f+g+h+i) as jzgNo,sum(e) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J412 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211','218') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,0 as isCount , 0 as jzgNo,sum(f+g+h+i+j+k+l+m+n) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J422 as j on j.instanceid =it.instanceid and j.did in (4,5,6,7,8,9 ) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('312','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）初中阶段' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,1 as isCount ,sum( e+f+g+h+i) as jzgNo,sum(case when sbr.businessTypeNo = '312' then 0 else e end) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J412 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','321') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）初中阶段' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,0 as isCount ,0 as jzgNo,sum(f+g+h+i+j+k+l+m+n) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J422 as j on j.instanceid =it.instanceid and j.did in (13,14,15,16,17,18) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('312','341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,3 as schoolTypeGroupNo,'三、特殊教育' as schoolTypeGroup,0 as schoolTypeGroupNo2,'' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +, sbr.isCount, sum( e+f+g+h) as jzgNo,sum(e) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J413 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('511','512','513','514') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,4 as schoolTypeGroupNo,'四、工读学校' as schoolTypeGroup,0 as schoolTypeGroupNo2,'' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +, sbr.isCount,sum(h) as jzgNo,sum(i) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J911 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('371') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,1 as schoolTypeGroupNo,'一、高中阶段' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）普通高中' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +, sbr.isCount ,sum( e+f+g+h+i) as jzgNo,sum(case when sbr.businessTypeNo='342' then e else 0 end) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J412 as j on j.instanceid =it.instanceid and j.did =1 +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('341','342','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,1 as schoolTypeGroupNo,'一、高中阶段' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）普通高中' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +, 0 as isCount ,0 as jzgNo,sum(f+g+h+i+j+k+l+m+n) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J422 as j on j.instanceid =it.instanceid and j.did in (22,23,24,25,26,27) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + + +SELECT sbr.organizationNo ,1 as schoolTypeGroupNo,'一、高中阶段' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）中等职业学校' as schoolTypeGroup2 ,sbr.businessTypeNo,case when sbr.businessTypeNo in ('368','369') then '其他机构（班）' else sbr.businessType end as businessType +, sbr.isCount ,sum(g+h+i+j+k+l) as jzgNo,sum(g) as teacherNo +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join Z411 as j on j.instanceid =it.instanceid and j.did in (3,4,5,6,7) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('362','364','365','369','361','363') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount +order by sbr.businessTypeNo; + +SELECT sbr.organizationNo ,1 as schoolTypeGroupNo,'一、高中阶段' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）中等职业学校' as schoolTypeGroup2 ,sbr.businessTypeNo,case when sbr.businessTypeNo in ('368','369') then '其他机构（班）' else sbr.businessType end as businessType +, sbr.isCount ,0 as jzgNo,0 as teacherNo +from schoolBusinessRelation sbr +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('368') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 +order by sbr.businessTypeNo; diff --git a/dsSso/接入示例/JavaDemo.zip b/dsSso/接入示例/JavaDemo.zip new file mode 100644 index 00000000..f8b216c2 Binary files /dev/null and b/dsSso/接入示例/JavaDemo.zip differ diff --git a/dsSso/接入示例/JavaDemo/.idea/workspace.xml b/dsSso/接入示例/JavaDemo/.idea/workspace.xml index e1d600dc..61dc819a 100644 --- a/dsSso/接入示例/JavaDemo/.idea/workspace.xml +++ b/dsSso/接入示例/JavaDemo/.idea/workspace.xml @@ -5,10 +5,8 @@ - - - - + + @@ -153,6 +151,9 @@ 1596089651797 + + + @@ -206,6 +207,7 @@ +