夏文涛 2 лет назад
Родитель
Сommit
41f4632f5f

+ 382 - 157
.idea/workspace.xml

@@ -2,7 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <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 afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/EvaluateTeacherVo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HomePageAttendanceVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateTeacherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateTeacherController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAttendanceStatu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAttendanceStatu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/evaluate/teacher/SmartEvaluateTeacher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/evaluate/teacher/SmartEvaluateTeacher.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateTeacherService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateTeacherService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml" 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" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -13,89 +29,36 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
+    <option name="isMigrated" value="true" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="1344" column="24" selection-start-line="1344" selection-start-column="24" selection-end-line="1344" selection-end-column="24" />
+            <state relative-caret-position="282">
+              <caret line="184" column="37" selection-start-line="184" selection-start-column="33" selection-end-line="184" selection-end-column="37" />
+              <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/resources/application-dev.yml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="328">
-              <caret line="65" column="45" lean-forward="true" selection-start-line="65" selection-start-column="45" selection-end-line="65" selection-end-column="45" />
+            <state relative-caret-position="183">
+              <caret line="44" column="11" selection-start-line="44" selection-start-column="11" selection-end-line="44" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="246">
-              <caret line="149" selection-start-line="149" selection-end-line="149" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="897">
-              <caret line="47" column="87" selection-start-line="47" selection-start-column="87" selection-end-line="47" selection-end-column="103" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="621">
-              <caret line="39" column="125" selection-start-line="39" selection-start-column="111" selection-end-line="39" selection-end-column="125" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1196">
-              <caret line="71" column="57" selection-start-line="71" selection-start-column="57" selection-end-line="71" selection-end-column="57" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2645">
-              <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
-              <caret line="32" column="120" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="120" />
+            <state relative-caret-position="208">
+              <caret line="736" column="19" selection-start-line="736" selection-start-column="19" selection-end-line="736" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -115,6 +78,17 @@
       <find>departmentNo</find>
       <find>导入</find>
       <find>updateSmartUserById</find>
+      <find>oldSchoolClass</find>
+      <find>getTeacherScoreList</find>
+      <find>public</find>
+      <find>.order</find>
+      <find>querySmartSemesters</find>
+      <find>月份</find>
+      <find>第一天</find>
+      <find>time</find>
+      <find>.valueOf</find>
+      <find>eAttendanceStatu</find>
+      <find>queryAttendanceList</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -133,6 +107,23 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherApiQueryByConditionParam.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/evaluate/teacher/SmartEvaluateTeacher.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/EvaluateVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/EvaluateTeacherVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateTeacherService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateTeacherController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/HomePageAttendanceVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAttendanceStatu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" />
       </list>
     </option>
   </component>
@@ -163,9 +154,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -231,7 +222,17 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" 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="model" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -241,6 +242,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -250,7 +252,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="seewo" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -301,7 +303,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/template/model/seewo" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../校车预约移动端/carBooksDevelopV" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -310,6 +312,9 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.template.model.vo" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
     </key>
@@ -326,7 +331,33 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
+    <configuration name="TimeExchange" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.TimeExchange" />
+      <module name="mybatis_plus" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.common.utils.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TimeExchange2" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.TimeExchange2" />
+      <module name="mybatis_plus" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.common.utils.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="mybatis_plus" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
@@ -334,6 +365,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.TimeExchange" />
+        <item itemvalue="Application.TimeExchange2" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -346,18 +383,18 @@
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <workItem from="1707008843054" duration="16121000" />
-      <workItem from="1708481187426" duration="2356000" />
+      <workItem from="1708481187426" duration="22613000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18477000" />
+    <option name="totallyTimeSpent" value="38734000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17750533" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22538294" />
       <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" />
@@ -368,8 +405,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" weight="0.3402626" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.3522976" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3436464" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.35027623" />
       <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" />
@@ -386,7 +423,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" weight="0.95076585" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.6706783" />
       <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" />
@@ -404,12 +441,6 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1559</line>
-          <properties />
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
           <line>1400</line>
           <properties />
           <option name="timeStamp" value="8" />
@@ -448,170 +479,364 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-483">
-          <caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
+        <state relative-caret-position="4646">
+          <caret line="248" column="75" selection-start-line="248" selection-start-column="67" selection-end-line="248" selection-end-column="75" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+        <state relative-caret-position="897">
+          <caret line="47" column="87" selection-start-line="47" selection-start-column="87" selection-end-line="47" selection-end-column="103" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="97" column="27" selection-start-line="97" selection-start-column="27" selection-end-line="97" selection-end-column="27" />
+        <state relative-caret-position="1196">
+          <caret line="71" column="57" selection-start-line="71" selection-start-column="57" selection-end-line="71" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" column="49" selection-start-line="15" selection-start-column="49" selection-end-line="15" selection-end-column="49" />
+        <state relative-caret-position="2645">
+          <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <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="460">
+          <caret line="32" column="120" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="120" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsClassVo.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="174">
-          <caret line="11" column="22" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="22" />
+        <state relative-caret-position="246">
+          <caret line="149" selection-start-line="149" selection-end-line="149" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsClassNoVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <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="328">
+          <caret line="65" column="45" selection-start-line="65" selection-start-column="45" selection-end-line="65" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/GradeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <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="401">
+          <caret line="614" column="26" lean-forward="true" selection-start-line="614" selection-start-column="26" selection-end-line="614" selection-end-column="26" />
         </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="552">
+          <caret line="73" column="90" lean-forward="true" selection-start-line="68" selection-start-column="4" selection-end-line="73" selection-end-column="90" />
+        </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="28520">
+          <caret line="1288" column="36" selection-start-line="1288" selection-start-column="36" selection-end-line="1288" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <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/test/java/com/template/WrapperTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="586">
+          <caret line="88" column="35" lean-forward="true" selection-start-line="86" selection-start-column="10" selection-end-line="88" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="69" column="43" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartFreezeRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="144" lean-forward="true" selection-start-line="3" selection-start-column="4" selection-end-line="11" selection-end-column="144" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/evaluate/teacher/SmartEvaluateTeacher.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
-          <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="81" column="33" selection-start-line="81" selection-start-column="33" selection-end-line="81" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="14" column="35" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="213" selection-start-line="213" selection-end-line="213" />
+        <state relative-caret-position="294">
+          <caret line="53" column="43" selection-start-line="53" selection-start-column="25" selection-end-line="53" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/open/platform/platform/1.0/platform-1.0.jar!/com/seewo/open/sdk/SeewoClient.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/EvaluateTeacherVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <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="348">
+          <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherResult.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartEvaluateTeacherService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="36" column="21" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/conditions/AbstractWrapper.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="117" column="22" selection-start-line="117" selection-start-column="22" selection-end-line="117" selection-end-column="22" />
+          <caret line="119" column="16" selection-start-line="119" selection-start-column="16" selection-end-line="119" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartEvaluateTeacherController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="618">
+          <caret line="346" column="30" selection-start-line="346" selection-start-column="30" selection-end-line="346" selection-end-column="30" />
           <folding>
-            <element signature="e#2360#2361#0" expanded="true" />
-            <element signature="e#2407#2408#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherApiQueryByConditionParam.java">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="437">
+          <caret line="24" column="67" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="67" />
+        </state>
+      </provider>
     </entry>
-    <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/pojo/SmartAttendance.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4646">
-          <caret line="248" column="75" selection-start-line="248" selection-start-column="67" selection-end-line="248" selection-end-column="75" />
+        <state relative-caret-position="-58">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1932">
-          <caret line="124" selection-start-line="124" selection-end-line="124" />
+        <state relative-caret-position="-404">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDuties.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="897">
-          <caret line="47" column="87" selection-start-line="47" selection-start-column="87" selection-end-line="47" selection-end-column="103" />
+        <state relative-caret-position="-105">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDutiesType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="39" column="125" selection-start-line="39" selection-start-column="111" selection-end-line="39" selection-end-column="125" />
+        <state relative-caret-position="207">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eExamineStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1196">
-          <caret line="71" column="57" selection-start-line="71" selection-start-column="57" selection-end-line="71" selection-end-column="57" />
+        <state relative-caret-position="207">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eExamType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2645">
-          <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
+        <state relative-caret-position="207">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eFileType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="32" column="120" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="120" />
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartDepartmentController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eFreezeRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="149" selection-start-line="149" selection-end-line="149" />
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIsSuper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/ePunish.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="65" column="45" lean-forward="true" selection-start-line="65" selection-start-column="45" selection-end-line="65" selection-end-column="45" />
+        <state relative-caret-position="-933">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSubjectStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1830">
+          <caret line="11" column="12" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
+        </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="207">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eVisitorType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eWeekStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="1344" column="24" selection-start-line="1344" selection-start-column="24" selection-end-line="1344" selection-end-column="24" />
+        <state relative-caret-position="-506">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eXwApproveStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="571">
+          <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAttendanceStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-671">
+          <caret line="17" column="28" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/stream/Stream.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="853" column="9" selection-start-line="853" selection-start-column="9" selection-end-line="853" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="736" column="19" selection-start-line="736" selection-start-column="19" selection-end-line="736" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="44" column="11" selection-start-line="44" selection-start-column="11" selection-end-line="44" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/HomePageAttendanceVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="184" column="37" selection-start-line="184" selection-start-column="33" selection-end-line="184" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 5 - 4
src/main/java/com/template/api/SmartAttendanceControllerAPI.java

@@ -41,10 +41,11 @@ public interface SmartAttendanceControllerAPI {
     CommonResult queryLeaveRecords();
 
     /**
-     * 首页请假数据
-     * 不清楚是获取当年的 还是当的 还是本周的
+     * 首页班级考勤数据
+     * 获取当月
      * 可查询的时间范围不清楚
      */
-
-
+    @GetMapping(value = "/queryAttendanceList")
+    @ApiOperation(value = "首页班级考勤数据", notes = "首页班级考勤数据", httpMethod = "GET")
+    CommonResult queryAttendanceList();
 }

+ 16 - 9
src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java

@@ -6,6 +6,7 @@ import com.template.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -17,34 +18,40 @@ public interface SmartEvaluateTeacherControllerAPI {
 
     @RequestMapping(value = "/operateSmartScoreManage")
     @ApiOperation(value = "评分项目管理", httpMethod = "POST")
-    public CommonResult operateSmartScoreManage(@Validated @RequestBody JSONObject jsonObject);
+    CommonResult operateSmartScoreManage(@Validated @RequestBody JSONObject jsonObject);
 
     @RequestMapping(value = "/getScoreManage")
     @ApiOperation(value = "查看评分项", httpMethod = "POST")
-    public CommonResult getScoreManage(String term);
+    CommonResult getScoreManage(String term);
 
     @RequestMapping(value = "/getTeacherScoreList")
     @ApiOperation(value = "查看教师评分", httpMethod = "POST")
-    public CommonResult getTeacherScoreList(@Validated @RequestBody SmartEvaluateTeacher smartEvaluateTeacher,Integer currentPage, Integer pageCount);
+    CommonResult getTeacherScoreList(@Validated @RequestBody SmartEvaluateTeacher smartEvaluateTeacher, Integer currentPage, Integer pageCount);
 
     @RequestMapping(value = "/getTeacherScoreExcel")
     @ApiOperation(value = "导出教师评分", httpMethod = "POST")
-    public void getTeacherScoreExcel(SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response);
+    void getTeacherScoreExcel(SmartEvaluateTeacher smartEvaluateTeacher, HttpServletResponse response);
 
     @RequestMapping(value = "/evaluateScore")
     @ApiOperation(value = "教师评分", httpMethod = "POST")
-    public CommonResult evaluateScore(@Validated @RequestBody JSONObject jsonObject);
+    CommonResult evaluateScore(@Validated @RequestBody JSONObject jsonObject);
 
     @RequestMapping(value = "/getTeacherScoreDetail")
     @ApiOperation(value = "获取教师分数详情", httpMethod = "POST")
-    public CommonResult getTeacherScoreDetail(Integer id);
+    CommonResult getTeacherScoreDetail(Integer id);
 
     @RequestMapping(value = "/getScoreComparison")
     @ApiOperation(value = "分数对比", httpMethod = "POST")
-    public CommonResult getScoreComparison(Integer id);
+    CommonResult getScoreComparison(Integer id);
 
     @RequestMapping(value = "/getScoreRank")
     @ApiOperation(value = "评分排行", httpMethod = "POST")
-    public CommonResult getScoreRank(int currentPage, int pageCount,String subject);
-
+    CommonResult getScoreRank(int currentPage, int pageCount, String subject);
+
+    /**
+     * 首页最受欢迎老师TOP6
+     */
+    @GetMapping(value = "queryTopSixTeacher")
+    @ApiOperation(value = "最受欢迎老师TOP6", notes = "最受欢迎老师TOP6", httpMethod = "GET")
+    CommonResult queryTopSixTeacher();
 }

+ 7 - 4
src/main/java/com/template/common/utils/TimeExchange.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.time.DateUtils;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
@@ -55,7 +56,6 @@ public class TimeExchange {
      */
     public static String DateToString(Date time) {
         String dateStr = "";
-        Date date = new Date();
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:sss");
         try {
             dateStr = dateFormat.format(time);
@@ -734,11 +734,14 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) throws ParseException {
-        int total = 25;
-        int pageSize = 20;
-        int restData =(total + pageSize - 1) / pageSize;
+        long a = 1;
+        int pageSize = 5;
+
+        double restData =(double)a / pageSize * 100;
         System.out.println("数据:"+restData);
         String sdsd ="";
+
+
     }
 }
 

+ 13 - 2
src/main/java/com/template/common/utils/TimeExchange2.java

@@ -9,7 +9,7 @@ import java.util.*;
 /**
  * 时间转化工具 date转为时间戳 时间戳转date 互相与String的转换
  * 所有出现的String time 格式都必须为(yyyy-MM-dd HH:mm:ss),否则出错
- * @author 
+ * @author
  *
  */
 public class TimeExchange2 {
@@ -610,7 +610,18 @@ public class TimeExchange2 {
 
 
     public static void main(String[] args) throws ParseException {
-        System.out.println(ToSimpleMonth(StringToDate("2023-11","yyyy-MM")));
+        char a = 'A';
+        char b = 'B';
+        int result = b -a;
+
+        String s = "ZY";
+        int ans = 0;
+        for(int i=0;i<s.length();i++) {
+            int num = s.charAt(i) - 'A' + 1;
+            ans = ans * 26 + num;
+        }
+
+        System.out.println(ans);
     }
 
 }

+ 38 - 4
src/main/java/com/template/controller/SmartAttendanceController.java

@@ -14,6 +14,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.seewo.PersonalLeaveListSchoolPeriodRecordsParam;
 import com.template.model.seewo.PersonalLeaveListSchoolPeriodRecordsRequest;
 import com.template.model.seewo.PersonalLeaveListSchoolPeriodRecordsResult;
+import com.template.model.vo.HomePageAttendanceVo;
 import com.template.services.SmartAttendanceService;
 import com.template.services.SmartUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static com.template.model.enumModel.eAttendanceStatu.attendanceStatus;
+
 /**
  * <p>
  * 楼栋表 前端控制器
@@ -145,10 +149,10 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
             //获取用户数据
             List<String> xwuids = attendances.stream().map(SmartAttendance::getUserUid).collect(Collectors.toList());
             List<SmartUser> users = smartUserService.getSmartUserByxwuids(xwuids);
-            if(users != null && users.size() > 0){
-                for (SmartAttendance attendance:attendances) {
+            if (users != null && users.size() > 0) {
+                for (SmartAttendance attendance : attendances) {
                     Optional<SmartUser> user = users.stream().filter(e -> e.getXwStudentUid().equals(attendance.getUserUid())).findFirst();
-                    if(user != null && user.isPresent()){
+                    if (user != null && user.isPresent()) {
                         attendance.setUserId(user.get().getId());
                         attendance.setClassId(user.get().getSchoolClass());
                     }
@@ -156,7 +160,7 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
             }
 
             boolean insertResult = smartAttendanceService.insertAttendanceBatch(attendances);
-            if(!insertResult){
+            if (!insertResult) {
                 return CommonResult.fail("请假数据获取失败");
             }
         }
@@ -164,6 +168,36 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         return CommonResult.ok("操作成功");
     }
 
+    @Override
+    public CommonResult queryAttendanceList() {
+        List<HomePageAttendanceVo> result = new ArrayList<>();
+        Date startMonth = TimeExchange.getToMonthBeginDate(TimeExchange.DateToString(new Date()));
+        Date endMonth = TimeExchange.getToMonthEndDate(TimeExchange.DateToString(new Date()));
+
+        List<SmartAttendance> datas = smartAttendanceService.queryAttendanceList(startMonth, endMonth);
+
+        if (datas == null) {
+            return CommonResult.ok(result);
+        }
+
+        List<Integer> status = eAttendanceStatu.attendanceStatus();
+        for (int statu : status) {
+            HomePageAttendanceVo data = new HomePageAttendanceVo();
+            data.setName(eAttendanceStatu.stringOf(statu));
+            //百分比
+            long count = datas.stream().filter(e -> e.getStatus().intValue() == statu).count();
+            if(count == 0){
+                data.setProportion(0.0);
+            }else{
+                double restData =(double)count/ datas.size() * 100;
+                data.setProportion(restData);
+            }
+            result.add(data);
+        }
+
+        return CommonResult.ok(result);
+    }
+
     public PersonalLeaveListSchoolPeriodRecordsResult getXwAttendance(String startDate, String endDate, Integer currentPage, Integer pageSize) {
         //初始化客户端
         SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));

+ 8 - 0
src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -10,6 +10,7 @@ import com.template.common.utils.UUIDUtil;
 import com.template.model.evaluate.teacher.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.EvaluateTeacherVo;
 import com.template.services.SmartEvaluateTdetailService;
 import com.template.services.SmartEvaluateTeacherService;
 import com.template.services.SmartScoreManageService;
@@ -340,4 +341,11 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
         PageUtils<SmartEvaluateTeacher> list = smartEvaluateTeacherService.queryPageSmartEvaluateTeacher(currentPage,pageCount,queryWrapper1);
         return CommonResult.ok(list);
     }
+
+    @PassToken
+    public CommonResult queryTopSixTeacher() {
+        List<EvaluateTeacherVo> teachers = smartEvaluateTeacherService.smartTopTeacherList();
+
+        return CommonResult.ok(teachers);
+    }
 }

+ 4 - 0
src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java

@@ -2,9 +2,12 @@ package com.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
+import com.template.model.vo.EvaluateTeacherVo;
 import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 Mapper 接口
@@ -18,4 +21,5 @@ public interface SmartEvaluateTeacherMapper extends BaseMapper<SmartEvaluateTeac
 
     Double getAvgLowingScore(@RequestParam("term") String term);
 
+    List<EvaluateTeacherVo> smartTopTeacherList();
 }

+ 17 - 0
src/main/java/com/template/model/enumModel/eAttendanceStatu.java

@@ -1,5 +1,8 @@
 package com.template.model.enumModel;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author: binguo
  * @Date: 2023/7/6 星期四 16:34
@@ -78,4 +81,18 @@ public enum eAttendanceStatu {
                 return null;
         }
     }
+
+    /**
+     * 获取考勤状态集合
+     * @return
+     */
+    public static List<Integer> attendanceStatus(){
+        List<Integer> result = new ArrayList<>();
+        result.add(0);
+        result.add(1);
+        result.add(3);
+        result.add(6);
+        result.add(7);
+        return result;
+    }
 }

+ 0 - 1
src/main/java/com/template/model/evaluate/teacher/SmartEvaluateTeacher.java

@@ -1,6 +1,5 @@
 package com.template.model.evaluate.teacher;
 
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 22 - 0
src/main/java/com/template/model/vo/EvaluateTeacherVo.java

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/4 星期一 15:57
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class EvaluateTeacherVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    private String name;
+}

+ 22 - 0
src/main/java/com/template/model/vo/HomePageAttendanceVo.java

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/4 星期一 15:57
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class HomePageAttendanceVo {
+    /**
+     * 考勤名称
+     */
+    private String name;
+
+    /**
+     * 考勤占比
+     */
+    private Double proportion;
+}

+ 3 - 0
src/main/java/com/template/services/SmartAttendanceService.java

@@ -4,6 +4,7 @@ import com.template.model.pojo.SmartAttendance;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.SmartVisitor;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,4 +21,6 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
     List<SmartAttendance> queryExistAttendances(String startDate, String endDate);
 
     boolean insertAttendanceBatch(List<SmartAttendance> attendances);
+
+    List<SmartAttendance> queryAttendanceList(Date startMonth, Date endMonth);
 }

+ 11 - 8
src/main/java/com/template/services/SmartEvaluateTeacherService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.EvaluateTeacherVo;
 
 import java.util.List;
 
@@ -17,19 +18,21 @@ import java.util.List;
  */
 public interface SmartEvaluateTeacherService extends IService<SmartEvaluateTeacher> {
 
-    public int insertSmartEvaluateTeacher(SmartEvaluateTeacher sa);
+    int insertSmartEvaluateTeacher(SmartEvaluateTeacher sa);
 
-    public int updateSmartEvaluateTeacher(SmartEvaluateTeacher sa);
+    int updateSmartEvaluateTeacher(SmartEvaluateTeacher sa);
 
-    public PageUtils<SmartEvaluateTeacher> queryPageSmartEvaluateTeacher(int currentPage, int pageCount, QueryWrapper<SmartEvaluateTeacher> queryWrapper);
+    PageUtils<SmartEvaluateTeacher> queryPageSmartEvaluateTeacher(int currentPage, int pageCount, QueryWrapper<SmartEvaluateTeacher> queryWrapper);
 
-    public int deleteSmartEvaluateTeacherById(int id);
+    int deleteSmartEvaluateTeacherById(int id);
 
-    public SmartEvaluateTeacher getSmartEvaluateTeacherById(int id);
+    SmartEvaluateTeacher getSmartEvaluateTeacherById(int id);
 
-    public List<SmartEvaluateTeacher> getEvaluateTeacherList();
+    List<SmartEvaluateTeacher> getEvaluateTeacherList();
 
-    public List<SmartEvaluateTeacher> getEvaluateTeacherByKey(QueryWrapper<SmartEvaluateTeacher> queryWrapper);
+    List<SmartEvaluateTeacher> getEvaluateTeacherByKey(QueryWrapper<SmartEvaluateTeacher> queryWrapper);
 
-    public Double getAvgLowingScore(String term);
+    Double getAvgLowingScore(String term);
+
+    List<EvaluateTeacherVo> smartTopTeacherList();
 }

+ 12 - 1
src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,7 +45,7 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
         QueryWrapper<SmartAttendance> queryWrapper = new QueryWrapper<>();
         queryWrapper.ge(StringUtils.hasText(startDate), "start_time", startDate);//大于等于
         queryWrapper.le(StringUtils.hasText(endDate), "start_time", endDate);//小于等于
-        queryWrapper.eq("status", eAttendanceStatu.AskLeave.getValue());//小于等于
+        queryWrapper.eq("status", eAttendanceStatu.AskLeave.getValue());//等于
 
         List<SmartAttendance> result = smartAttendanceMapper.selectList(queryWrapper);
         return result;
@@ -55,4 +56,14 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
         boolean result = this.saveBatch(attendances);
         return result;
     }
+
+    @Override
+    public List<SmartAttendance> queryAttendanceList(Date startMonth, Date endMonth) {
+        QueryWrapper<SmartAttendance> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("start_time", startMonth);//大于等于
+        queryWrapper.le("start_time", endMonth);//小于等于
+
+        List<SmartAttendance> result = smartAttendanceMapper.selectList(queryWrapper);
+        return result;
+    }
 }

+ 8 - 1
src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.SmartEvaluateTeacherMapper;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.EvaluateTeacherVo;
 import com.template.services.SmartEvaluateTeacherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -76,5 +77,11 @@ public class SmartEvaluateTeacherServiceImpl extends ServiceImpl<SmartEvaluateTe
     public Double getAvgLowingScore(String term){
         return smartEvaluateTeacherMapper.getAvgLowingScore(term);
     }
-    
+
+    @Override
+    public List<EvaluateTeacherVo> smartTopTeacherList() {
+        List<EvaluateTeacherVo> result =smartEvaluateTeacherMapper.smartTopTeacherList();
+        return result;
+    }
+
 }

+ 15 - 0
src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml

@@ -7,4 +7,19 @@
             where deleted=0 and term=#{term}
     </select>
 
+    <resultMap type="com.template.model.vo.EvaluateTeacherVo" id="smartTopTeacherMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="smartTopTeacherList" resultType="com.template.model.vo.EvaluateTeacherVo" resultMap="smartTopTeacherMap">
+        select id,name from smart_evaluate_teacher
+        where term in
+        (select t.term from(select term from smart_evaluate_teacher
+        where deleted = 0 order by term desc
+        limit 1) as t) and deleted = 0
+        order by total_score desc
+    </select>
+
+
 </mapper>

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