diff --git a/Report/034初中办学条件(三).rpx b/Report/034初中办学条件(三).rpx index bb156b35..f14e2697 100644 Binary files a/Report/034初中办学条件(三).rpx and b/Report/034初中办学条件(三).rpx differ diff --git a/Report/036小学学生数.rpx b/Report/036小学学生数.rpx index e92b996d..72975780 100644 Binary files a/Report/036小学学生数.rpx and b/Report/036小学学生数.rpx differ diff --git a/Report/040小学办学条件(一).rpx b/Report/040小学办学条件(一).rpx index df258e6a..b8f83ca4 100644 Binary files a/Report/040小学办学条件(一).rpx and b/Report/040小学办学条件(一).rpx differ diff --git a/Report/041小学办学条件(二).rpx b/Report/041小学办学条件(二).rpx index f703983b..7f7d7657 100644 Binary files a/Report/041小学办学条件(二).rpx and b/Report/041小学办学条件(二).rpx differ diff --git a/Report/042小学办学条件(三).rpx b/Report/042小学办学条件(三).rpx index 24ac76fc..97db7207 100644 Binary files a/Report/042小学办学条件(三).rpx and b/Report/042小学办学条件(三).rpx differ diff --git a/Report/045特殊教育学校基本情况.rpx b/Report/045特殊教育学校基本情况.rpx index 88b30c98..94851077 100644 Binary files a/Report/045特殊教育学校基本情况.rpx and b/Report/045特殊教育学校基本情况.rpx differ diff --git a/Report/050幼儿园园数、班数.rpx b/Report/050幼儿园园数、班数.rpx index 39816635..626d3ecf 100644 Binary files a/Report/050幼儿园园数、班数.rpx and b/Report/050幼儿园园数、班数.rpx differ diff --git a/Report/051学前教育分年龄幼儿数(总计).rpx b/Report/051学前教育分年龄幼儿数(总计).rpx index 3d80a7bc..cbf4a95d 100644 Binary files a/Report/051学前教育分年龄幼儿数(总计).rpx and b/Report/051学前教育分年龄幼儿数(总计).rpx differ diff --git a/ReportSQL/034初中办学条件(三) 【20201222】.txt b/ReportSQL/034初中办学条件(三) 【20201222】.txt new file mode 100644 index 00000000..a1a49a39 --- /dev/null +++ b/ReportSQL/034初中办学条件(三) 【20201222】.txt @@ -0,0 +1,24 @@ +--keyid +--体育运动场（馆）:1007 +--体育器械配备:1006 +--音乐器材配备:1012 +--美术器材配备:1003 +--理科实验仪器:1002 +--校园网：5001 + +select sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）初中阶段' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.citycountrytypeno ,sbr.cityCountryGroup,sum(case when j.stringvalue='是' then 1 else 0 end) as dabiaoNo ,j.keyid +from schoolBusinessRelation sbr +inner join schoolinfo as j on j.organizationno =sbr .organizationno and keyid in ('1007','1006','1012','1003','1002','5001') +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','321') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.citycountrytypeno ,sbr.cityCountryGroup,j.keyid +order by sbr.businessTypeNo; + +--互联网： +select sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,2 as schoolTypeGroupNo2,'（二）初中阶段' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.citycountrytypeno ,sbr.cityCountryGroup,sum(case when j.stringvalue in ('光纤','拨号','ADSL','无线','其他') then 1 else 0 end) as dabiaoNo ,j.keyid +from schoolBusinessRelation sbr +inner join schoolinfo as j on j.organizationno =sbr .organizationno and keyid in ('1016') +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','321') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.citycountrytypeno ,sbr.cityCountryGroup,j.keyid +order by sbr.businessTypeNo; \ No newline at end of file diff --git a/ReportSQL/036小学学生数【20201222】.txt b/ReportSQL/036小学学生数【20201222】.txt new file mode 100644 index 00000000..4d4f7938 --- /dev/null +++ b/ReportSQL/036小学学生数【20201222】.txt @@ -0,0 +1,30 @@ +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation +, sbr.isCount , sum(f) as zhaoshengNo,sum(j+k+l+m+n+o) as zaixiaoNo,sum(e) as biyeNo,sum(i) as nvNo,sum(p) as yuji_biyeNo, +sum(j) as j,sum(k) as k,sum(l) as l ,sum(m) as m,sum(n) as n,sum(o) as o +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J312 as j on j.instanceid =it.instanceid and j.did in (1,37,38,39,40,41,42,43,44,45,46,47) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211','218','219','312','345') and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation +order by sbr.businessTypeNo; + +--did +--随迁子女9 +--其中：外省迁入10 +--本省外县迁入11 +--进城务工人员随迁子女12 +--其中：外省迁入13 +--本省外县迁入14 +--农村留守儿童15 +--送教上门16 +SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation +, sbr.isCount , sum(f) as zhaoshengNo,sum(j+k+l+m+n+o) as zaixiaoNo,sum(e) as biyeNo,sum(i) as nvNo,sum(p) as yuji_biyeNo, +sum(j) as j,sum(k) as k,sum(l) as l ,sum(m) as m,sum(n) as n,sum(o) as o,did +from schoolBusinessRelation sbr +inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno +inner join J312 as j on j.instanceid =it.instanceid and j.did in (1,37,38,39,40,41,42,43,44,45,46,47) +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211','218','219','312','345') and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation,did +order by sbr.businessTypeNo; \ No newline at end of file diff --git a/ReportSQL/040小学办学条件(一) .txt b/ReportSQL/040小学办学条件(一) .txt index 628c60bd..1bafbc43 100644 --- a/ReportSQL/040小学办学条件(一) .txt +++ b/ReportSQL/040小学办学条件(一) .txt @@ -22,7 +22,7 @@ SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoo from schoolBusinessRelation sbr inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno inner join J512 as j on j.instanceid =it.instanceid and ( did in (5,6,7,8,9,10) or did in (11,12) or did in (14,16,17,18,19) or did in (20)) -where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +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,sbr.citycountrytypeno ,sbr.cityCountryGroup,did order by sbr.businessTypeNo; @@ -36,6 +36,6 @@ SELECT sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as scho from schoolBusinessRelation sbr inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno inner join J512 as j on j.instanceid =it.instanceid and ( did in (2,3) ) -where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019 +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,sbr.citycountrytypeno ,sbr.cityCountryGroup,did order by sbr.businessTypeNo; \ No newline at end of file diff --git a/ReportSQL/043小学办学条件(三)【20201223】.txt b/ReportSQL/043小学办学条件(三)【20201223】.txt new file mode 100644 index 00000000..b7df1533 --- /dev/null +++ b/ReportSQL/043小学办学条件(三)【20201223】.txt @@ -0,0 +1,24 @@ +--keyid +--体育运动场（馆）:1007 +--体育器械配备:1006 +--音乐器材配备:1012 +--美术器材配备:1003 +--理科实验仪器:1002 +--校园网：5001 + +select sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.citycountrytypeno ,sbr.cityCountryGroup,sum(case when j.stringvalue='是' then 1 else 0 end) as dabiaoNo ,j.keyid +from schoolBusinessRelation sbr +inner join schoolinfo as j on j.organizationno =sbr .organizationno and keyid in ('1007','1006','1012','1003','1002','5001','1020') +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.citycountrytypeno ,sbr.cityCountryGroup,j.keyid +order by sbr.businessTypeNo; + +--互联网： +select sbr.organizationNo ,2 as schoolTypeGroupNo,'二、义务教育' as schoolTypeGroup,1 as schoolTypeGroupNo2,'（一）小学' as schoolTypeGroup2 ,sbr.businessTypeNo,sbr.businessType +,sbr.citycountrytypeno ,sbr.cityCountryGroup,sum(case when j.stringvalue in ('光纤','拨号','ADSL','无线','其他') then 1 else 0 end) as dabiaoNo ,j.keyid +from schoolBusinessRelation sbr +inner join schoolinfo as j on j.organizationno =sbr .organizationno and keyid in ('1016') +where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and j.recordyear =2019 +group by sbr.organizationNo,sbr.businessTypeNo,sbr.businessType ,sbr.isCount,sbr.citycountrytypeno ,sbr.cityCountryGroup,j.keyid +order by sbr.businessTypeNo; \ No newline at end of file diff --git a/dsBigData/go.mod b/dsBigData/go.mod index 2335f856..f755058d 100644 --- a/dsBigData/go.mod +++ b/dsBigData/go.mod @@ -43,5 +43,5 @@ require ( golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect gopkg.in/ini.v1 v1.55.0 - gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/dsBigData/go.sum b/dsBigData/go.sum index c71e7823..494f1383 100644 --- a/dsBigData/go.sum +++ b/dsBigData/go.sum @@ -471,5 +471,7 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=