Merge branch 'master' of http://10.10.14.250:3000/huanghai/dsMin

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;

dsSso/接入示例/JavaDemo/.idea/workspace.xml

@@ -5,10 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e8f146ac-f507-4bd7-9ea5-679097c20d1c" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Report2019/004各级各类民办教育学生情况.rpx" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Report2019/004各级各类民办教育学生情况.rpx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../Report2020/004各级各类民办教育学生情况.rpx" beforeDir="false" afterPath="$PROJECT_DIR$/../../../Report2020/004各级各类民办教育学生情况.rpx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" afterDir="false" />
     </list>
@@ -153,6 +151,9 @@
       <updated>1596089651797</updated>
       <workItem from="1596089653221" duration="2841000" />
       <workItem from="1612597219020" duration="2993000" />
+      <workItem from="1615347379769" duration="21000" />
+      <workItem from="1615347415032" duration="8000" />
+      <workItem from="1619600842667" duration="3844000" />
     </task>
     <servers />
   </component>
@@ -206,6 +207,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java

@@ -10,13 +10,13 @@ import java.util.Base64;
 
 public class IndexController extends Controller {
     //服务器的位置信息
-    String OAuth2Server = "http://10.10.14.187";
+    String OAuth2Server = "http://www.ccsjy.cn";
     String authCodeURI = OAuth2Server + "/oauth2/authorize";
     String authTokenURI = OAuth2Server + "/oauth2/access_token";
 
     //在服务器注册生成的用户和密码
-    String clientId = "bu3pcf7cl45ug8dup8og";
-    String clientSecret = "01emmt5qdyszh9ndbpbg4zk4tn";
+    String clientId = "c078fqpqbqf91bggrro0";
+    String clientSecret = "01ewwc5wdjhv14nkp2n6hcvbsb";
     String redirectURI = "http://127.0.0.1:8003/code";
     String oauthCallback = "http://127.0.0.1:8003/success";