update

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
+,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) 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
+,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;

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);
+
+

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;

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"
+                                <input type="password" name="password" id="passwordTxt" class="input-text" placeholder="请输入密码"></dd>
-                                       class="input-text" placeholder="请输入密码"></dd>
                         </dl>
                         <dl class="top2 clearfix">
                             <dt>验证码：</dt>