From 3c20689cf90ee1ea7f39555dfb04eb4f1b68e8f4 Mon Sep 17 00:00:00 2001
From: wubin <kgdxpr@163.com>
Date: Thu, 17 Dec 2020 08:01:57 +0800
Subject: [PATCH] update

---
 ...«˜ä¸­åˆ†è¯¾ç¨‹ä¸“任教师学历情况.rpx | Bin 34528 -> 34622 bytes
 ...ˆ�中分课程专任教师学历情况.rpx | Bin 50672 -> 50681 bytes
 ...¸“业技术è�ŒåŠ¡ã€�年龄结构情况.rpx | Bin 25126 -> 25154 bytes
 ...•™å¸ˆå­¦åŽ†ã€�专业技术è�ŒåŠ¡æƒ…况.rpx | Bin 24539 -> 24515 bytes
 .../027特殊教育学校教�工数.rpx     | Bin 12591 -> 12585 bytes
 ...¸“任教师学历情况ã€�20201216】.txt} |   6 ++---
 ...务�年龄结构情况�20201216】.txt |  24 ++++++++++++++++++
 ...专业技术�务情况�20201216】.txt |  24 ++++++++++++++++++
 dsSso/static/index.html                       |   5 ++--
 9 files changed, 53 insertions(+), 6 deletions(-)
 rename ReportSQL/{030�中分课程专任教师学历情况 .txt => 030�中分课程专任教师学历情况�20201216】.txt} (71%)
 create mode 100644 ReportSQL/039�学专任教师专业技术�务�年龄结构情况�20201216】.txt
 create mode 100644 ReportSQL/053幼儿园园长�专任教师学历�专业技术�务情况�20201216】.txt

diff --git a/Report/012普通高中分课程专任教师学历情况.rpx b/Report/012普通高中分课程专任教师学历情况.rpx
index 833c2461379c5af5277577028247d14cf0aa0a2b..9fcf47aeb8e841df8bb72424443974a68f54380e 100644
GIT binary patch
delta 198
zcmW;GKWf5o0LAfN0z!sDad7Th_)6FJa5ARq;=e?rVyB+N131|wCz0$ejxIez!6Wnl
zZS=us{qlZ}@#jaJ6nS2RaCkW-NfuqJcD7IZA$pEN?^O)NNQ}iqOvOyh#X{tw5KFNV
zrC5uN*ori53{;(4PxV(;ccR~Wunh4%XohBF#%5xsW@hGQVRBQLrCFKMtj)%3-2@v0
WSEu)0_5F6NFT2O?!(X%8?VEoBFE`cz

delta 110
zcmdnj$Mm3=i6ba5Fo=Pn?ZQS54rj(~lLeitg@qXyH5eIqi%WAgqFv0b9G%Q#Cl{v6
zPF@f)XLGBIlqlmdkg~}S+}L>_YAk?iEMg~LOtPLFAKg2-)x~&{BIoA#=*!w*<3Uyc
E0HGu#mH+?%

diff --git a/Report/030�中分课程专任教师学历情况.rpx b/Report/030�中分课程专任教师学历情况.rpx
index 63139fd7d2b859f57958d0da49e00648f48d314c..539b2aa6750e262eb90bf87c5bffd59a6fda149c 100644
GIT binary patch
delta 827
zcmey+&HS^QnIkALFo=QS=*x{9Le7&HwZ=^raFyd#VPMi=WZ*0=&DC(SoIEky37d>F
zP8k=RGOjpf+;Gac<CO8hDdUM##tWy6H%=KJoHD*RW&Ci;_~Vobz$p`mQzi(fOfXKF
z5S%ihIAy|c%7o*TiNGlniBl#DB2(wu&g|%j#0IBB$IbI2q#~FvF)&ZQu-%mL)#Ohb
zlo(fSzPpc^akIoGUlwj1bz>7lbr5N~nSbv>M#jd;Y&-NAO(9AwcHUsdRC0Lo#(mn1
eRX`=1Sthe>i$_!8%{bZi=xUz-Kmf`sAPfLT+V<c8

delta 471
zcmey_&HSO8nIkALFo=QS=!1<MLe7)lhP5+085&HU=<Nh%J0r1Okl3zBY&RsfI}+Oi
ziS3ER_CjKNBe8vu*uF??KP0w45<38i9f-sZLShFau|ts9p-Aj7Bz8CwI|7LviNubA
zuo+KI-sn=zug1Wn!N|Z}T$-!l=!hf}JK4%dcyfV1H;M{K*g9@*iI9q5+%$Rq26M)H
zldo@3Vw|`6*M<Pr&AfXTFfx`-{=Qw0Q4=U)z_dAR*J>t+@b1a$_GvQ~ZN9Z{GYgBc
Yj)~6X-ox=gDKEy!PDfXR;}H~>0M-n)NB{r;

diff --git a/Report/039�学专任教师专业技术�务�年龄结构情况.rpx b/Report/039�学专任教师专业技术�务�年龄结构情况.rpx
index d71c8b87ff3b103b135f88ad43dd0fcc8728c31f..c7fb6a44696bc578d9928798099858498583df24 100644
GIT binary patch
delta 106
zcmZ2>gz?Z3MvkDsz#s;OB%_TSyF!@1Gq6lPm|()h8a(-Th!zto*Jkz5In3NfhKA}o
s>PChZ>N=Z?<J=f0b42Ac)=sX7(qlB-ygceGx{B4zJpX|JWHbl^0QKS`kpKVy

delta 83
zcmX?fgmKvsMvkDsz#s;OB(aSgyF!@nGq6l%OfX?$b)Wn@M2m^#-)8mDIn0~SM{Hqa
jES%gDrN^i`Sv~ac<_*yon1G_LjGHgUr!s-f0GR^-%jzB)

diff --git a/Report/053幼儿园园长�专任教师学历�专业技术�务情况.rpx b/Report/053幼儿园园长�专任教师学历�专业技术�务情况.rpx
index 2ff8d86f16e8aa1abc9a486e3cc298f2b6016ba4..68f4c82fdc6caa1097aa92621e87c19ebf1029e7 100644
GIT binary patch
delta 73
zcmV-P0Ji_zzX8L)0SHo2QBnW^U$e0YoKpjq00NWHSTq6z=ab!2E&-d9L0RmR_*7=I
fYE_#90YQ@nSt<er__H!u)&a9>RXYQ-PhN}x31S<l

delta 93
zcmX@SpYis7MvkDsz#s;O_|qFX<^(gYo4hpGobmJIyTN*l%Qy3c1TpexXK80^=V<3@
j=V|9}jtia5%;-D$SA-T58_Q<3$ZHt#*36sD<9ZkYBqATg

diff --git a/Report/县区/027特殊教育学校教�工数.rpx b/Report/县区/027特殊教育学校教�工数.rpx
index f04db848e21c7057f1ae968f9469a6552986eff5..ced2ac06fb9603bb7281c2f6469f8b067d92a185 100644
GIT binary patch
delta 40
wcmZ3Vv@(e!C@?UHfx%F6BgcF-#-Ec{sF^b!ocusdp0Q<<x*F4F9ZhBq02r7I*Z=?k

delta 47
zcmZ3Pv_6R=C@?UHfx%FIBgcF-#{ZL7sF^b!pZq{gp0R6_x*8Lkj**VBj>%><O=b=N
DcJ~eq

diff --git a/ReportSQL/030�中分课程专任教师学历情况 .txt b/ReportSQL/030�中分课程专任教师学历情况�20201216】.txt
similarity index 71%
rename from ReportSQL/030�中分课程专任教师学历情况 .txt
rename to ReportSQL/030�中分课程专任教师学历情况�20201216】.txt
index 42622bfe..7e3b9f91 100644
--- a/ReportSQL/030�中分课程专任教师学历情况 .txt	
+++ b/ReportSQL/030�中分课程专任教师学历情况�20201216】.txt
@@ -11,11 +11,11 @@ SELECT sbr.organizationNo  ,2 as schoolTypeGroupNo,'二�义务教育' as schoo
 ,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation 
 ,case when sbr.businessTypeNo='341' then 0  when sbr.businessTypeNo='345' then 0 else 1 end as isCount  ,  
 sum(F + G + H + I + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z + AC + AD) as teacherNO 
-,did,sum(F) as f,sum(G) as g,sum(H) as h,sum(I) as i,sum(J) as j,sum(K) as k,sum(L) as l,sum(M) as m,sum(N) as n,sum(O) as o,sum(P) as p,sum(Q) as q,sum(R) as r,sum(S) as s,sum(T) as t,sum(U) as u
-,sum(V) as v,sum(W) as w,sum(X) as x,sum(Y) as y,sum(Z) as z,sum(AA) as aa,sum(AB) as ab,sum(AC) as ac,sum(AD) as ad
+,did,sum(F) ,sum(G) ,sum(H) ,sum(I) ,sum(J) ,sum(K) ,sum(L) ,sum(M) ,sum(N) ,sum(O) ,sum(P) ,sum(Q) ,sum(R) ,sum(S) ,sum(T) ,sum(U) 
+,sum(V) ,sum(W) ,sum(X) ,sum(Y) ,sum(Z) ,sum(AA) ,sum(AB) ,sum(AC) ,sum(AD)
 from schoolBusinessRelation sbr 
 inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno 
 inner join J424 as j on j.instanceid =it.instanceid  and  did in (3,4,5,6,7,8,9)
-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
+where  sbr.gatherRegionB ='长春市'  and sbr.businessTypeNo in('311','312','321','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,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/039�学专任教师专业技术�务�年龄结构情况�20201216】.txt b/ReportSQL/039�学专任教师专业技术�务�年龄结构情况�20201216】.txt
new file mode 100644
index 00000000..029a243a
--- /dev/null
+++ b/ReportSQL/039�学专任教师专业技术�务�年龄结构情况�20201216】.txt
@@ -0,0 +1,24 @@
+--did：
+--4�正高级
+--5�副高级
+--6�中级
+--7�助�级
+--8�员级
+--9�未定�级
+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 
+,0 as isCount , 0 as jzgNo,sum(f+g+h+i+j+k+l+m+n) as teacherNo ,sum(F),sum(G),sum(H),sum(I),sum(J),sum(K) ,sum(L),sum(M) ,sum(N) 
+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 ('211','218','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.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation ,sbr.isCount
+order by sbr.businessTypeNo;
+
+--女
+select (F + G + H + I +j+k+l+ M + N  ) as teacherNO,did,F,G,H,I,J,K ,L,M ,N from j422 where did in (2);
+
+--å°‘æ•°æ°‘æ—�
+select (F + G + H + I +j+k+l+ M + N  ) as teacherNO,did,F,G,H,I,J,K ,L,M ,N from j422 where did in (3);
+
+
diff --git a/ReportSQL/053幼儿园园长�专任教师学历�专业技术�务情况�20201216】.txt b/ReportSQL/053幼儿园园长�专任教师学历�专业技术�务情况�20201216】.txt
new file mode 100644
index 00000000..a7b87bd0
--- /dev/null
+++ b/ReportSQL/053幼儿园园长�专任教师学历�专业技术�务情况�20201216】.txt
@@ -0,0 +1,24 @@
+--did
+--1 院长
+--2 专任教师
+SELECT sbr.organizationNo ,5 as schoolTypeGroupNo,'五�学�教育' as schoolTypeGroup,0 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( e+f+g+h+i) as jzgNo
+,sum(e) ,sum(f) ,sum(g) ,sum(h) ,sum(i) ,sum(j) ,sum(k) ,sum(l) ,sum(m) ,sum(n) ,sum(o) 
+from schoolBusinessRelation sbr
+inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno 
+inner join J4211 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,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation 
+order by sbr.businessTypeNo;
+
+SELECT sbr.organizationNo ,5 as schoolTypeGroupNo,'五�学�教育' as schoolTypeGroup,0 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( e+f+g+h+i) as jzgNo
+,sum(e) ,sum(f) ,sum(g) ,sum(h) ,sum(i) ,sum(j) ,sum(k) ,sum(l) ,sum(m) ,sum(n) ,sum(o) 
+from schoolBusinessRelation sbr
+inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno 
+inner join J4211 as j on j.instanceid =it.instanceid and j.did =2
+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,sbr.ownertypeno ,sbr.ownerTypeGroup ,sbr.citycountrytypeno ,sbr.cityCountryGroup,sbr.structureType,sbr.populationGroup,sbr .isnation 
+order by sbr.businessTypeNo;
\ No newline at end of file
diff --git a/dsSso/static/index.html b/dsSso/static/index.html
index 1fce7caa..9be6ac6c 100644
--- a/dsSso/static/index.html
+++ b/dsSso/static/index.html
@@ -35,14 +35,13 @@
                         <dl class="clearfix">
                             <dt>账<em></em>户：</dt>
                             <dd>
-                                <input type="text" name="loginName" id="usernameTxt" value="sys1" class="input-text"
+                                <input type="text" name="loginName" id="usernameTxt" class="input-text"
                                        autocomplete="off" placeholder="账户�/邮箱/手机�"/></dd>
                         </dl>
                         <dl class="top1 clearfix">
                             <dt>密<em></em>�：</dt>
                             <dd>
-                                <input type="password" name="password" id="passwordTxt" value="123456"
-                                       class="input-text" placeholder="请输入密�"></dd>
+                                <input type="password" name="password" id="passwordTxt" class="input-text" placeholder="请输入密�"></dd>
                         </dl>
                         <dl class="top2 clearfix">
                             <dt>验��：</dt>