From d48188a227e86826718d89a55002dc3cba34f83b Mon Sep 17 00:00:00 2001
From: wubin <kgdxpr@163.com>
Date: Mon, 4 Jan 2021 08:30:01 +0800
Subject: [PATCH] update

---
 Report/034初中办学条件(三).rpx         | Bin 11036 -> 11956 bytes
 Report/036小学学生数.rpx                 | Bin 68119 -> 68038 bytes
 Report/040小学办学条件(一).rpx         | Bin 25462 -> 25510 bytes
 Report/041小学办学条件(二).rpx         | Bin 20771 -> 20761 bytes
 Report/042小学办学条件(三).rpx         | Bin 11018 -> 11694 bytes
 Report/045特殊教育学校基本情况.rpx  | Bin 41703 -> 41704 bytes
 Report/050幼儿园园数、班数.rpx        | Bin 16020 -> 16148 bytes
 ...学前教育分年龄幼儿数(总计).rpx | Bin 13348 -> 13263 bytes
 ...初中办学条件(三) 【20201222】.txt |  24 ++++++++++++++
 .../036小学学生数【20201222】.txt      |  30 ++++++++++++++++++
 ReportSQL/040小学办学条件(一) .txt     |   4 +--
 ...3小学办学条件(三)【20201223】.txt |  24 ++++++++++++++
 dsBigData/go.mod                              |   2 +-
 dsBigData/go.sum                              |   2 ++
 14 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 ReportSQL/034初中办学条件(三) 【20201222】.txt
 create mode 100644 ReportSQL/036小学学生数【20201222】.txt
 create mode 100644 ReportSQL/043小学办学条件(三)【20201223】.txt

diff --git a/Report/034初中办学条件(三).rpx b/Report/034初中办学条件(三).rpx
index bb156b357a66c07c46cd70a9bb3bb4b5124c125c..f14e2697bd677dbc271b3e6c4102fea2d47efccf 100644
GIT binary patch
delta 177
zcmbOewk4J$C@?UHfkAJ{Mh-RwCPTB$0t)$TOzf*CH>#O2u@_I?sU|1RZdRO{lbT$j
zprw#jl%K1h0pU)5s42YplbQw7W<yPFM#0j&%=|os#GD*nE)@AJMgxV+JOvH)r>&jO
zcP&xZQGeFG;%WbOAj8om*ayU)zTo+;{XoXk)@@IAPgB>NoTRY`<Q4->Ek<Tdg_6lp
LS~8Q%wUz<^kXAnz

delta 95
zcmdlIJ12}IC@?UHfkB&RBL|xTlaaw@0fl@vCKlnzjcR60%(o}+RFh+3p0_z)tC?|f
yw#GR&9d$zkpehSZ9Y*Q=qLkDkg``S_<jj)F<owdSlA_9z%7WCqeCx^ldP@QRs~t}O

diff --git a/Report/036小学学生数.rpx b/Report/036小学学生数.rpx
index e92b996d06b21dc6fe577ae4c9f39fbd5d1e2db1..729757807d911980f4723fefb433236daf453408 100644
GIT binary patch
delta 144
zcmbO}h2_{}7LK66z#s-j&TShxG7hu2o?+me-1yRjiR0DeRfjd$mjt`|xH^YymO9JE
zI62^p$K?AT{%^i>-jQ)~`f<t4Z~jU%Zr*<44)f%cmw`-t5tCn>(Pre|yzjOK3s6pw
oadYM+4Nk@@lPBHQX6%LtZ~h?!5)NnIob_U<BF}#y0674J0e&e#IRF3v

delta 215
zcmX>$nPvJE7LK66z#s-jF7}Na8HZWi6d5=t&--b@#K|#v)nN_BLz};y;bEK{@XllU
z23E%ZoA;e}WSpFSTyk>44-VnXVxPp~lE~D=BIm@s<kTDmTZ8Qfm>6XkH_twChk0`S
z&tN9LlF6seXftX9jnQDir%8x$v;HLwPR93>BW`OmE+bBTIQwSqTi%SD6JACsfc*jT
F3jomOQYioc

diff --git a/Report/040小学办学条件(一).rpx b/Report/040小学办学条件(一).rpx
index df258e6a80cc31b435365c7b2542174942ed7cbe..b8f83ca4dc13c704127d9e59c9073afc70c97f7d 100644
GIT binary patch
delta 274
zcmex%jB(j<MvkDsz#s;O<Y^l@);Kd~GH^_`k2ht!I{B@$21kFetB<R5h{EPR9|^|E
zJu!Tnon12+S#{Kn3@tVbdb=@lv6wS3FlYg>=;Q@rqLcYOL>OOe&WqMz+#KL}2%*xQ
zk+E%Zq>mn>)#iEeUl=FX`1!z10m}7E<_|D|$yo#;<h&Utp9@xn$-D?f$N+WqO|A|%
zXS9TvxIEH_9qcZ3&CLdJ&WubfJd-V>O&E6pU2}j5*|Pe{rSTeIZT1LpA;!t?k~#oJ
CUs75C

delta 221
zcmZ2>oblT+MvkDsz#s;O<g|?(Yn+)a88{~E`<ODGpZwNYgQGLp)yLI2L}9amhZ^H%
zXV(nI%|T(Vj7%(slYh7yGCtaTF<g#u@`f0`&0(I0Kyq%3j17}hee@VjfKuNXCwKdK
zLPXmpD+ZXrM16yxqE(Y02W!AYnZux>9g}B<n=={%O>kgh)ZDD#?F_V$ZE|e13F8*9
ijhi>bEP~orIeC7(23YME#>smUy@9p~GESCD?f?KQdQHjz

diff --git a/Report/041小学办学条件(二).rpx b/Report/041小学办学条件(二).rpx
index f703983b94b02c1d8dd2b0aba5573b35cec62544..7f7d76573c798a01c7f3a23e6380c23ea87b35e2 100644
GIT binary patch
delta 98
zcmV-o0G<D%q5+wr0SHo2QBnW^Q3<gK3^oD0lc6g(lR+v-85sZpC;<Qya&L8RWGG~F
zF)nj;Z75_ZEHaZpJSLO8K9RF^H+vKTu#@piHvxE)DNG*$JF`hlHUkALCo(ZOvwlyd
E0hgg2i~s-t

delta 66
zcmbQah;i{EMvkDsz#s;OK;exXJZ6*E*iB?inQW+II(Y#rCy2K>)x27San<C9-sX%&
VlO=uR8BI4^`j|0qF7;o+2mseA72^N^

diff --git a/Report/042小学办学条件(三).rpx b/Report/042小学办学条件(三).rpx
index 24ac76fc3d79c5802c8dd9cd60e40164c2ff32cb..97db720780da822edde83fa3c3ed3fd30acdf6b3 100644
GIT binary patch
delta 191
zcmeAQTNlj{6c`x9z@R&CBL|xTlcCvW0fl@vCbp%M8`aF1*m5WDRFjirGbm2YNlh+M
z&{9Y%%Fk8MfN~Wk-&eadSzAkVvbDy`&DxssjKZaPnfZANi8(pETv!xI8!9Md<|$~X
zKW*)NzH5oPj{39i6;J!O0~wAk!9F1V^aam%?FTZRwr+c}dz!lD<QR=bAZKZ5$}uu)
SDwIt2(2`~1<(izTwG;qqX+d=W

delta 220
zcmZ1%-4(_W6c`x9z@YVOBL|xTlaaw@0fl@vCKkrYjcR60%qJ)BRFmUi?kP^qNlh-9
z{6Xy!J1<vqVsWa%<O7-_^$O(~sd)<OPv`eN-O;43Py*-m>{5rx_3eK-wH+o0WIjcb
zYn$_I?nIc}lbs8}ywtoDg~Vco<jj&v=ls&VlA=oYqWsbVUM`*D(p(L&<zQ>G^d`U5
e;-36T{T!Q)x}gEk>H9Sl7$?8ck)F({yA%LiH&j6Y

diff --git a/Report/045特殊教育学校基本情况.rpx b/Report/045特殊教育学校基本情况.rpx
index 88b30c98ee46eb165edd24621326186e5ce61f9c..94851077b6d4e9e1a5ce3e795bf60873c4bfc788 100644
GIT binary patch
delta 57
zcmV-90LK64#RBNX0tix3QBnW^qS&zr?}Y<s00WbtoHPOp0Fy9=D*?B&j*+7Q1u!6C
Pb0D)dlg0zH$%`Hrb)6MF

delta 46
zcmV+}0MY;G#RBKW0tix3QBnW^qSvtq?}Y<r00WbuoHPOo|C2C=D*?8%kCAN!v&xGe
E7q@v5djJ3c

diff --git a/Report/050幼儿园园数、班数.rpx b/Report/050幼儿园园数、班数.rpx
index 3981663533f9482a2d02c1cd8c4cc8bd456a4023..626d3ecffa8fd2a390e23ebd4da793d0c631fdfb 100644
GIT binary patch
delta 237
zcmbPIJEe{zC@?UHfx(_-BgZjDMw7`O7-cuVVVumyXfU~fqmfZ@a-e|1<aO-qn>9JJ
zg_*xIFioDRYr-VRHTkTJHsis~zjf`ISdtTqQztJl6fr5!NX=7FH#9U<S1187i<62J
z^fHU{5=%1k^Au8Zic=K~6jJk26cURSV8WX{3^aH)=V>P}G1gB$udBr*U`8ENUHEwZ
K0|Cf?APfL-)K7r`

delta 109
zcmbPIH>H*%C@?UHfx)h2BgZku$?qBEHosw<%r<$0G~47>j+)86>>8UjIkSbCs~MOk
zU)MEdJTv*Mj5cHQ=ASb5Op|q#co`Kox5#(!F*;7>)zf0)|A8!V#K46QY(B^i00OEb
AZ~y=R

diff --git a/Report/051学前教育分年龄幼儿数(总计).rpx b/Report/051学前教育分年龄幼儿数(总计).rpx
index 3d80a7bcd513ba75c6a39e54f613a28be78fce3e..cbf4a95da92e69f9f7676739203b80e94c93beb9 100644
GIT binary patch
delta 108
zcmZ3IaXy_RC@?UHfx&qHMh;tfW=00)$saXMm{>keu9G)moWJ>*$_K{HixumDghmr1
z6RXhV!zxOQmw@66m^UxdXklcGnyjv+%_unenaYLD%GycHK!x&*n-A+pvhe%|0+8__
F3;+R1Cyf9A

delta 201
zcmX?~z9fSqC@?UHfx$#%BZsX#a})#f<a`xVM*hil@+ORXCrfHwm@J@KGMPth&F005
zb&N6!iFqjs#YshanZ-Vd#U+uciABzddC93c3bqED<&|3*8TBSFRZ(Jm2h+NlM=gd)
o8o#a<Mkdb6$!|5a84Wf|Y8kP}DiE+nk#TdDek2Rn?I8C901^d1a{vGU

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=