ソースを参照

用户管理添加部门管理权限逻辑

夏文涛 2 年 前
コミット
e07d04d658

+ 143 - 192
.idea/workspace.xml

@@ -2,12 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/OutdoorScreenControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/OutdoorScreenController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDepartmentControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartDepartmentControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/DepartmentTreeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/DepartmentTreeVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
@@ -26,85 +25,28 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="316">
-              <caret line="985" column="32" selection-start-line="985" selection-start-column="32" selection-end-line="985" selection-end-column="32" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="332">
-              <caret line="109" selection-start-line="109" selection-end-line="109" />
+            <state relative-caret-position="329">
+              <caret line="127" column="122" lean-forward="true" selection-start-line="127" selection-start-column="122" selection-end-line="127" selection-end-column="122" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchRemoveClassMastersParam.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="13" column="55" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="55" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="224">
-              <caret line="97" column="27" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchRemoveTeachersParam.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="7" column="27" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="27" />
+            <state relative-caret-position="317">
+              <caret line="290" column="62" lean-forward="true" selection-start-line="290" selection-start-column="62" selection-end-line="290" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/HttpParame.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="7" column="28" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSetClassMastersParam.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="7" column="26" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2031">
-              <caret line="56" column="52" selection-start-line="56" selection-start-column="52" selection-end-line="56" selection-end-column="52" />
+            <state relative-caret-position="-4">
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
             </state>
           </provider>
         </entry>
@@ -120,15 +62,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>百胜</find>
-      <find>::</find>
-      <find>semesters</find>
-      <find>queryExamTypes</find>
-      <find>querySmartScores</find>
-      <find>subjects.size() * 3</find>
-      <find>smartScoreExport</find>
-      <find>导入</find>
-      <find>downloadScoreExcel</find>
       <find>dataFormatter</find>
       <find>.isEmpty</find>
       <find>hasTe</find>
@@ -150,6 +83,15 @@
       <find>StudentLeaveStudentLeaveRequestHandlerParam</find>
       <find>时间组</find>
       <find>timeGroups</find>
+      <find>getAuthorByKey</find>
+      <find>queryDepartmentTree</find>
+      <find>QueryDepartmentTreeRecords</find>
+      <find>ver</find>
+      <find>vertify</find>
+      <find>bind</find>
+      <find>home?</find>
+      <find>wechatLoginUrl</find>
+      <find>login</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -172,11 +114,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/daleteUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" />
@@ -223,6 +160,11 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDepartmentControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartAuthorityService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/DepartmentTreeVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java" />
       </list>
     </option>
   </component>
@@ -255,7 +197,7 @@
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -303,6 +245,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend_code" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -535,18 +486,18 @@
       <workItem from="1710658855683" duration="119000" />
       <workItem from="1710730122468" duration="2620000" />
       <workItem from="1710813194846" duration="3355000" />
-      <workItem from="1711012645234" duration="14315000" />
+      <workItem from="1711012645234" duration="24389000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="302230000" />
+    <option name="totallyTimeSpent" value="312304000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26012793" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.10660981" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -557,8 +508,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.22762431" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.29540482" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" visible="true" weight="0.22757111" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.29540482" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -575,7 +526,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" visible="true" weight="0.116204694" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.5066815" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -606,7 +557,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java</url>
-          <line>128</line>
+          <line>141</line>
           <properties />
           <option name="timeStamp" value="16" />
         </line-breakpoint>
@@ -689,83 +640,6 @@
     <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartApplyMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartAuthorityMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartCarAccessMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/qcloud/cos_api/5.6.155/cos_api-5.6.155.jar!/com/qcloud/cos/COSClient.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="1213" column="16" selection-start-line="1213" selection-start-column="16" selection-end-line="1213" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/PersonalLeaveListSchoolPeriodRecordsResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3243">
-          <caret line="177" column="11" selection-start-line="177" selection-start-column="11" selection-end-line="177" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartBuildControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="33" column="58" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6969">
-          <caret line="343" selection-start-line="343" selection-end-line="343" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartVisitorMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="60" column="17" lean-forward="true" selection-start-line="60" selection-start-column="17" selection-end-line="60" selection-end-column="17" />
-          <folding>
-            <element signature="e#3525#3529#0" expanded="true" />
-            <element signature="e#3564#3568#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartDataTaskMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="260" column="81" selection-start-line="260" selection-start-column="70" selection-end-line="260" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartEvaluateStudentMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUploadServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="417">
-          <caret line="139" column="72" selection-start-line="139" selection-start-column="66" selection-end-line="139" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/UploadController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="309">
@@ -808,13 +682,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1001">
-          <caret line="117" column="9" selection-start-line="117" selection-start-column="9" selection-end-line="117" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/OutdoorScreenControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
@@ -1017,41 +884,125 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/TimeGroupVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="97" column="27" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="27" />
+        <state relative-caret-position="105">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/TimeGroupVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="161">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="332">
+          <caret line="109" selection-start-line="109" selection-end-line="109" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDataTaskControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartDepartmentControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="42" column="93" selection-start-line="42" selection-start-column="78" selection-end-line="42" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1042">
+          <caret line="117" column="9" selection-start-line="117" selection-start-column="9" selection-end-line="117" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartAuthorityService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="458">
+          <caret line="29" column="46" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="826">
+          <caret line="83" column="98" selection-start-line="79" selection-start-column="12" selection-end-line="83" selection-end-column="98" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/DepartmentTreeVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="101" column="14" selection-start-line="101" selection-start-column="14" selection-end-line="101" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="985" column="32" selection-start-line="985" selection-start-column="32" selection-end-line="985" selection-end-column="32" />
+        <state relative-caret-position="200">
+          <caret line="1614" column="45" selection-start-line="1614" selection-start-column="45" selection-end-line="1614" selection-end-column="45" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="332">
-          <caret line="109" selection-start-line="109" selection-end-line="109" />
+        <state relative-caret-position="62">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.3.1/spring-context-5.3.1.jar!/org/springframework/ui/Model.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        <state relative-caret-position="138">
+          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/HttpParame.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/WechatScanLoginServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-168">
+          <caret line="54" column="38" lean-forward="true" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="127" column="122" lean-forward="true" selection-start-line="127" selection-start-column="122" selection-end-line="127" selection-end-column="122" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="317">
+          <caret line="290" column="62" lean-forward="true" selection-start-line="290" selection-start-column="62" selection-end-line="290" selection-end-column="62" />
         </state>
       </provider>
     </entry>

+ 1 - 1
src/main/java/com/template/api/SmartDepartmentControllerAPI.java

@@ -40,5 +40,5 @@ public interface SmartDepartmentControllerAPI {
 
     @GetMapping(value = "/queryDepartmentTree")
     @ApiOperation(value = "查询部门树形结构数据", notes = "查询部门树形结构数据", httpMethod = "GET")
-    CommonResult queryDepartmentTree(String name);
+    CommonResult queryDepartmentTree(String name, @RequestHeader("user_head") String userhead);
 }

+ 71 - 4
src/main/java/com/template/controller/SmartDepartmentController.java

@@ -2,6 +2,7 @@ package com.template.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,13 +10,17 @@ import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartDepartmentControllerAPI;
 import com.template.common.utils.*;
 import com.template.config.ControlConfig;
+import com.template.model.pojo.SmartAuthority;
 import com.template.model.pojo.SmartDepartment;
+import com.template.model.pojo.SmartUser;
 import com.template.model.request.insertDepartmentRequest;
 import com.template.model.request.updateDepartmentRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.*;
+import com.template.services.SmartAuthorityService;
 import com.template.services.SmartDepartmentService;
+import com.template.services.SmartUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
@@ -26,6 +31,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,8 +54,15 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
     private ControlConfig controlConfig;
 
     @Autowired
+    private SmartUserService smartUserService;
+
+    @Autowired
+    private SmartAuthorityService smartAuthorityService;
+
+    @Autowired
     private SmartDepartmentService smartDepartmentService;
 
+
     /**
      * 新增部门
      *
@@ -225,29 +238,76 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
      */
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult queryDepartmentTree(String name) {
+    public CommonResult queryDepartmentTree(String name, String userhead) {
+        //region 角色判断
+        String userID = AesUtils.decrypt(userhead);
+        SmartUser operateData = smartUserService.getSmartById(Integer.valueOf(userID));
+        if (operateData == null) {
+            return CommonResult.fail("用户信息不合法,无法查看");
+        }
+
+        QueryWrapper<SmartAuthority> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", operateData.getId());
+        List<SmartAuthority> authorities = smartAuthorityService.getAuthorByKey(queryWrapper);
+        if (authorities == null) {
+            return CommonResult.fail("当前用户权限不足,无法查看对应部门数据");
+        }
+
+        List<String> viewAuthors = new ArrayList<>();//部门查看权限
+        List<String> manageAuthors = new ArrayList<>();//部门管理权限
+        for (SmartAuthority author : authorities) {
+            List<String> views = Arrays.asList(author.getDepartmentView().split(","));
+            if (views != null && views.size() > 0) {
+                viewAuthors.addAll(views);
+            }
+
+            List<String> manages = Arrays.asList(author.getDepartmentManage().split(","));
+            if (manages != null && manages.size() > 0) {
+                manageAuthors.addAll(manages);
+            }
+        }
+
+        viewAuthors = (viewAuthors != null && viewAuthors.size() > 0) ? viewAuthors.stream().distinct().collect(Collectors.toList()) : viewAuthors;
+        manageAuthors = (manageAuthors != null && manageAuthors.size() > 0) ? manageAuthors.stream().distinct().collect(Collectors.toList()) : manageAuthors;
+        //endregion
+
         List<SmartDepartment> result = smartDepartmentService.getSmartsByName(name);
 
         List<SmartDepartment> zeroResult = result.stream().filter(e -> e.getParentId().intValue() == 0).collect(Collectors.toList());
         List<DepartmentTreeVo> departments = new ArrayList<>();
         if (ObjectUtils.isEmpty(name)) {
             for (SmartDepartment data : zeroResult) {
+
+                long existViewData = viewAuthors == null ? 0 : viewAuthors.stream().filter(e -> e.equals(data.getId().toString())).count();
+                long existManageData = manageAuthors == null ? 0 : manageAuthors.stream().filter(e -> e.equals(data.getId().toString())).count();
+                if (existViewData <= 0 && existManageData <= 0) {
+                    continue;
+                }
+
                 DepartmentTreeVo newData = new DepartmentTreeVo().builder()
                         .id(data.getId())
                         .name(data.getName())
                         .parentId(data.getParentId())
+                        .isManage(existManageData > 0 ? 1 : 0)
                         .build();
 
-                List<DepartmentTreeVo> departmentTrees = QueryDepartmentTreeRecords(newData.getId(), result);
+                List<DepartmentTreeVo> departmentTrees = QueryDepartmentTreeRecords(newData.getId(), result, viewAuthors, manageAuthors);
                 newData.setChildren(departmentTrees);
                 departments.add(newData);
             }
         } else {
             for (SmartDepartment data : result) {
+                long existViewData = viewAuthors == null ? 0 : viewAuthors.stream().filter(e -> e.equals(data.getId().toString())).count();
+                long existManageData = manageAuthors == null ? 0 : manageAuthors.stream().filter(e -> e.equals(data.getId().toString())).count();
+                if (existViewData <= 0 && existManageData <= 0) {
+                    continue;
+                }
+
                 DepartmentTreeVo newData = new DepartmentTreeVo().builder()
                         .id(data.getId())
                         .name(data.getName())
                         .parentId(data.getParentId())
+                        .isManage(existManageData > 0 ? 1 : 0)
                         .build();
                 departments.add(newData);
             }
@@ -263,18 +323,25 @@ public class SmartDepartmentController implements SmartDepartmentControllerAPI {
      * @param lists    数据集合
      * @return
      */
-    private List<DepartmentTreeVo> QueryDepartmentTreeRecords(Integer parentID, List<SmartDepartment> lists) {
+    private List<DepartmentTreeVo> QueryDepartmentTreeRecords(Integer parentID, List<SmartDepartment> lists, List<String> viewDatas, List<String> manageDatas) {
         List<DepartmentTreeVo> newTrees = new ArrayList<>();
 
         List<SmartDepartment> datas = lists.stream().filter(e -> e.getParentId().equals(parentID)).collect(Collectors.toList());
 
         for (SmartDepartment data : datas) {
+            long existViewData = viewDatas == null ? 0 : viewDatas.stream().filter(e -> e.equals(data.getId().toString())).count();
+            long existManageData = manageDatas == null ? 0 : manageDatas.stream().filter(e -> e.equals(data.getId().toString())).count();
+            if (existViewData <= 0 && existManageData <= 0) {
+                continue;
+            }
+
             DepartmentTreeVo item = DepartmentTreeVo.builder()
                     .id(data.getId())
                     .parentId(parentID)
                     .name(data.getName())
+                    .isManage(existManageData > 0 ? 1 : 0)
                     .build();
-            List<DepartmentTreeVo> news = QueryDepartmentTreeRecords(item.getId(), lists);
+            List<DepartmentTreeVo> news = QueryDepartmentTreeRecords(item.getId(), lists, viewDatas, manageDatas);
             if (news == null || news.size() == 0) {
                 newTrees.add(item);
                 continue;

+ 2 - 1
src/main/java/com/template/controller/WechatScanLoginController.java

@@ -119,12 +119,13 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("请绑定信息", "UTF-8");
                 } else {
                     String token = JWTUtil.getToken(user, null);
+                    String userhead = AesUtils.encrypt(String.valueOf(user.getId()));
                     QueryWrapper<SmartAuthority> queryWrapper1 = new QueryWrapper<>();
                     queryWrapper1.eq("deleted", 0);
                     queryWrapper1.eq("user_id", user.getId());
                     List<SmartAuthority> query = smartAuthorityService.getAuthorByKey(queryWrapper1);
                     if (query.size() > 0) {
-                        return "redirect:" + HttpParame.FRONT_URI + "/#/wanzai/home?token=" + token;
+                        return "redirect:" + HttpParame.FRONT_URI + "/#/wanzai/home?token=" + token+"&userhead="+userhead;
                     } else {
                         return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("无登录权限", "UTF-8");
                     }

+ 7 - 0
src/main/java/com/template/model/vo/DepartmentTreeVo.java

@@ -32,6 +32,13 @@ public class DepartmentTreeVo {
     private String name;
 
     /**
+     * 是否能进行管理
+     * 0:否
+     * 1:是
+     */
+    private int isManage;
+
+    /**
      * 子级部门
      */
     private List<DepartmentTreeVo> children;

+ 1 - 1
target/classes/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: prod
+      active: dev
   main:
     allow-circular-references: true
   servlet:

+ 11 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -57,6 +57,7 @@ com\template\mapper\SmsCodeMapper.class
 com\template\services\impl\SmartVisitorServiceImpl.class
 com\template\model\vo\DepartmentTreeVo$DepartmentTreeVoBuilder.class
 com\template\common\utils\AesTestOne.class
+com\template\mapper\SmartSubjectTemplateMapper.class
 com\template\controller\SmartVisitorController.class
 com\template\api\SmartSubjectControllerAPI.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam.class
@@ -69,6 +70,7 @@ com\template\services\impl\SmartClassServiceImpl.class
 com\template\api\WxGzhControllerAPI.class
 com\template\model\pojo\SmartAttendance.class
 com\template\model\vo\SmartEnumVo.class
+com\template\services\impl\SmartSubjectTemplateServiceImpl.class
 com\template\model\vo\BsStaffVo.class
 com\template\model\seewo\OrgClassOpenSeewoUcOpenV1ClassFullParam.class
 com\template\common\jh\ReqRespResearchProductQuestionnaireItem.class
@@ -76,6 +78,7 @@ com\template\controller\Task.class
 com\template\api\SmartAuthorityControllerAPI.class
 com\template\services\SmartScreenshotService.class
 com\template\model\evaluate\student\SmartSubjectRule.class
+com\template\services\SmartTemplateRuleService.class
 com\template\mapper\SmartSemesterMapper.class
 com\template\model\tongji\All.class
 com\template\mapper\WechatScanLoginMapper.class
@@ -271,6 +274,7 @@ com\template\services\SmartQrcodeService.class
 com\template\model\seewo\HomeSchoolServiceSendNoteToKidResult.class
 com\template\model\seewo\ParentServiceRemoveStudentParentConditionResult$JSONResponseBody.class
 com\template\common\utils\Md5Utils.class
+com\template\model\evaluate\student\SmartTemplateRule.class
 com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsResult.class
 com\template\model\seewo\StudentLeaveStudentLeaveRequestHandlerResult.class
 com\template\model\seewo\ParentServiceBatchSaveOrUpdateParentsParam$ParentsItem.class
@@ -287,6 +291,7 @@ com\template\model\seewo\TeacherServiceBatchSetClassMastersParam$RequestBody.cla
 com\template\controller\ExcelController.class
 com\template\controller\ScheduleController.class
 com\template\model\seewo\ParentServiceRemoveStudentParentConditionParam$JSONRequestBody.class
+com\template\api\SmartEvaluateStudentControlle2API.class
 com\template\model\seewo\StudentServiceBatchSaveClassStudentsResult$ParentInfoDto.class
 com\template\model\evaluate\teacher\SmartEvaluateTeacher.class
 com\template\services\SmartDataSourceLogService.class
@@ -420,6 +425,7 @@ com\template\model\seewo\AttendanceRuleListSchoolAttendRuleParam.class
 com\template\model\request\updateScreenshotRequest.class
 com\template\model\dto\OperationWarningDto.class
 com\template\model\seewo\AttendanceRuleListSchoolAttendRuleResult.class
+com\template\model\evaluate\student\SmartSubjectTemplate.class
 com\template\services\SmartEvaluateStudentService.class
 com\template\mapper\SmartVisitorMapper.class
 com\template\model\seewo\StudentServiceUpdateStudentInfoResult.class
@@ -541,6 +547,7 @@ com\template\model\seewo\StudentServiceBatchSaveClassStudentsParam$StudentInfo.c
 com\template\mapper\SmartAttendanceMapper.class
 com\template\model\seewo\StudentServiceUpdateStudentInfoParam.class
 com\template\api\SmartFreezeRecordControllerAPI.class
+com\template\mapper\SmartTemplateRuleMapper.class
 com\template\controller\RepairAdminController.class
 com\template\model\seewo\TeacherServiceBatchRemoveClassMastersParam$Query$QueryBuilder.class
 com\template\model\vo\SystemMenuVo.class
@@ -558,8 +565,10 @@ com\template\model\dto\WarningUserDto.class
 com\template\model\seewo\StudentServiceBatchSaveClassStudentsParam$Boolean$BooleanBuilder.class
 com\template\mapper\SmartSchoolMapper.class
 com\template\model\pojo\SmartDataSourceJobParams.class
+com\template\services\impl\SmartTemplateRuleServiceImpl.class
 com\template\config\smsConfig.class
 com\template\model\seewo\StudentServiceRemoveClassStudentsParam$JSONRequestBody.class
+com\template\services\SmartSubjectTemplateService.class
 com\template\model\seewo\TeacherServiceBatchRemoveTeachersParam$RequestBody$RequestBodyBuilder.class
 com\template\api\SmartDataTaskControllerAPI.class
 com\template\model\result\CommonResult.class
@@ -579,6 +588,7 @@ com\template\config\ParkConfig.class
 com\template\mapper\SmartDataSourceLogMapper.class
 com\template\controller\SmartEvaluateTeacherController.class
 com\template\api\SmartScoreControllerAPI.class
+com\template\controller\SmartEvaluateStudentController2.class
 com\template\model\request\queryAccountPageRequest.class
 com\template\model\evaluate\student\SubjectManageList.class
 com\template\model\pojo\SystemUser.class
@@ -696,6 +706,7 @@ com\template\model\seewo\HomeSchoolServiceSendNoteToKidRequest.class
 com\template\services\SmartApplyService.class
 com\template\common\utils\HttpUtils.class
 com\template\model\tongji\DAll.class
+com\template\model\evaluate\student\SmartTemplateRuleList.class
 com\template\model\seewo\AttendanceRuleListSchoolAttendRuleResult$Data.class
 com\template\common\utils\AesUtils.class
 com\template\common\result\ResponseStatusEnum.class

+ 11 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -38,6 +38,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartSchool.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\VisitorCountVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartGradeService.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\student\SmartTemplateRule.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\annotation\ExcelImport.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartBuildMeterMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\HttpClientUtils.java
@@ -91,7 +92,9 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\AttendanceRuleListSchoolAttendRuleParam.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eTimeGroup.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eFileType.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\student\SmartSubjectTemplate.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartEvaluateStudentMapper.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartTemplateRuleMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\AesTestOne.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\JWTUtil.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\updateMenuRequest.java
@@ -109,6 +112,8 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartCodeOpenIdController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\TeacherServiceBatchRemoveClassMastersResult.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartEvaluateTdetailService.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartEvaluateStudentController2.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartTemplateRuleService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\insertDutiesRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartDataClassServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartScreenshotServiceImpl.java
@@ -313,6 +318,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartCodeOpenIdControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartScoreServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartAttendanceControllerAPI.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartSubjectTemplateService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartFaceDiscern.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartSemesterServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\AttendanceRuleListEventByClazzRequest.java
@@ -372,8 +378,10 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartIdentityMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\BsStaffNoVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\tongji\EnergyTj.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartSubjectTemplateMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\tongji\DAll.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartDataSourceLogController.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\student\SmartTemplateRuleList.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartApplyControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\DBUtil.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eIsSuper.java
@@ -401,11 +409,13 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartSchoolMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\RepairAdmin.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\ClassSettingDateVo.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartEvaluateStudentControlle2API.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\UserDeleteVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataSourceLog.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\DepartmentTreeVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\WxConfig.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartMeterDetailMapper.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartSubjectTemplateServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\insertSmartUserRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartExamtypeControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\WechatScanLoginServiceImpl.java
@@ -500,6 +510,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\DepartmentVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\turnOnTheDeviceRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartDataClassService.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartTemplateRuleServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartMeterMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\GradeListVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartFreezeRecordServiceImpl.java

BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original