提交代码

.idea/workspace.xml

@@ -2,8 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DateUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -36,10 +49,10 @@
   <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/repair/controller/RepairRecordController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="1770" column="31" selection-start-line="1770" selection-start-column="24" selection-end-line="1770" selection-end-column="31" />
+            <state relative-caret-position="231">
+              <caret line="92" column="73" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="73" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -48,76 +61,37 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="348">
-              <caret line="73" column="98" selection-start-line="73" selection-start-column="76" selection-end-line="73" selection-end-column="98" />
+            <state relative-caret-position="68">
+              <caret line="59" column="64" selection-start-line="59" selection-start-column="64" selection-end-line="59" selection-end-column="64" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="564">
-              <caret line="79" column="93" selection-start-line="79" selection-start-column="71" selection-end-line="79" selection-end-column="93" />
+            <state relative-caret-position="318">
+              <caret line="49" column="37" selection-start-line="47" selection-start-column="8" selection-end-line="49" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
-              <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
-              <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/repair/model/vo/DetailsVo.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="792">
-              <caret line="129" column="47" selection-start-line="129" selection-start-column="36" selection-end-line="129" selection-end-column="47" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="394">
-              <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="153" column="48" lean-forward="true" selection-start-line="153" selection-start-column="48" selection-end-line="153" selection-end-column="48" />
+            <state relative-caret-position="268">
+              <caret line="277" column="81" selection-start-line="277" selection-start-column="70" selection-end-line="277" selection-end-column="81" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="470">
-              <caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
+            <state relative-caret-position="632">
+              <caret line="48" selection-start-line="48" selection-end-line="49" />
             </state>
           </provider>
         </entry>
@@ -134,36 +108,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>receiveOwnOrders</find>
-      <find>finishOrder</find>
-      <find>getTechnicianCountByUserId</find>
-      <find>receiving_count</find>
-      <find>.setRecordId(result)</find>
-      <find>result</find>
-      <find>throw new Exception()</find>
-      <find>= new RepairSystemMessages();</find>
-      <find>insertRepairEvaluate</find>
-      <find>cooperationOrders</find>
-      <find>new RepairTrackRecord();</find>
-      <find>transfer</find>
-      <find>receiveSendOrders</find>
-      <find>queryPageRepairUsers</find>
+      <find>detail</find>
+      <find>queryConsumeMaterial</find>
+      <find>head</find>
+      <find>String userhead</find>
+      <find>AesUtils.decrypt(userhead)</find>
+      <find>repairSummarizing</find>
+      <find>queryTeamWorkCount</find>
+      <find>queryLogisticHomeCount</find>
+      <find>queryTeamWorkTimeout</find>
+      <find>queryTeamWorkPage</find>
+      <find>queryTeamWorkPending</find>
+      <find>repairRecordTechnicianDataMap</find>
+      <find>queryTimeout</find>
+      <find>repairRecordPageMap</find>
       <find>queryManagePage</find>
-      <find>queryChangePriceConsumables</find>
-      <find>details</find>
-      <find>报修时间</find>
-      <find>转后勤</find>
-      <find>transferToLogistics</find>
-      <find>alterPrice</find>
-      <find>insertMaintenanceConsumables</find>
-      <find>RepairTrackRecord</find>
-      <find>eIsSuccess</find>
-      <find>2</find>
-      <find>getRepairRecordsByUserId</find>
-      <find>recordId</find>
-      <find>详情</find>
+      <find>user</find>
+      <find>queryTime</find>
+      <find>maintenanceState</find>
+      <find>split(&quot;-</find>
+      <find>maintenance_state</find>
+      <find>join</find>
+      <find>area_name</find>
       <find>querySystemMessagePage</find>
-      <find>detail</find>
+      <find>Mana</find>
+      <find>queryManageCount</find>
+      <find>queryNotTimeout</find>
+      <find>all_count</find>
+      <find>.or</find>
+      <find>deleteRepairArticleTypeById</find>
+      <find>insertRepairArticleType</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -204,19 +178,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairNoticeSetting.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairPayRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRefundRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSchool.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairShiftSettings.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemMessages.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairUser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairWorkType.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/WxAccessToken.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/freezeRepairAdminRequest.java" />
@@ -252,9 +213,22 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
       </list>
     </option>
   </component>
@@ -297,8 +271,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -528,7 +502,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$/../../校车预约移动端/carBooksDevelopV" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <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="project.structure.last.edited" value="Artifacts" />
@@ -540,14 +514,15 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.template" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
-    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.repair.model.vo" />
       <recent name="com.repair.model.enumModel" />
@@ -555,11 +530,10 @@
       <recent name="com.repair.api" />
       <recent name="com.repair.common.utils" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -698,12 +672,13 @@
       <workItem from="1692276778311" duration="8094000" />
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
-      <workItem from="1692691144895" duration="1388000" />
+      <workItem from="1692691144895" duration="14181000" />
+      <workItem from="1692753806714" duration="4144000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="835422000" />
+    <option name="totallyTimeSpent" value="852359000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -715,7 +690,7 @@
     </todo-panel>
   </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 id="Designer" order="0" />
@@ -727,18 +702,18 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.20362474" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.19037199" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.61767954" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.50765866" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.678453" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.9569061" />
       <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" weight="0.32932165" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32932165" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32928178" />
       <window_info anchor="bottom" id="Docker" order="9" />
-      <window_info anchor="bottom" id="Messages" order="10" weight="0.29540482" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.2950276" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
       <window_info anchor="bottom" id="Database Changes" order="12" />
       <window_info anchor="bottom" id="Version Control" order="13" />
@@ -747,7 +722,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.48358864" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.85448575" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -922,6 +897,18 @@
           <properties />
           <option name="timeStamp" value="311" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java</url>
+          <line>53</line>
+          <properties />
+          <option name="timeStamp" value="312" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java</url>
+          <line>48</line>
+          <properties />
+          <option name="timeStamp" value="313" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -930,81 +917,62 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/QueryExportVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RecordEvaluateVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="46">
-          <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAreaTreeVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+          <caret line="2" column="47" selection-start-line="2" selection-start-column="47" selection-end-line="2" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAreaVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TransferDetailVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="46">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UploadFileVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        <state relative-caret-position="46">
+          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleTreeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserScheduleVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="299">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleTypeTreeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxCodeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="46">
           <caret line="2" selection-start-line="2" selection-end-line="2" />
@@ -1014,344 +982,312 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCardNumberVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxOpenVo.java">
       <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairClassesVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="23">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairConsumeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="299">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairLogisticsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java">
       <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="230">
+          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/MybatisPlusApplication.java">
       <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="299">
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
       <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="3289">
+          <caret line="158" column="44" selection-start-line="158" selection-start-column="44" selection-end-line="158" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-533">
+          <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/repair/model/vo/RepairSchoolVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java">
       <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="79">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1075#1076#0" expanded="true" />
-            <element signature="e#1166#1167#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="394">
+          <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairUserVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="470">
+          <caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
       <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="792">
+          <caret line="129" column="47" selection-start-line="129" selection-start-column="36" selection-end-line="129" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="230">
+          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/routeDataVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="299">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+          <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ShiftSettingDataVo.java">
-      <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>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/shiftSettingVo.java">
-      <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>
-      </provider>
+    <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/java/com/repair/model/vo/StatisticsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="322">
+          <caret line="14" column="17" lean-forward="true" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMenuTreeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemSettingController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="295">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMenuVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/repair/model/vo/TeamWorkCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
       <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="654">
+          <caret line="45" selection-start-line="45" selection-end-line="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="47" selection-start-line="2" selection-start-column="47" selection-end-line="2" selection-end-column="47" />
+        <state relative-caret-position="667">
+          <caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TransferDetailVo.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
+        <state relative-caret-position="295">
+          <caret line="28" column="7" selection-start-line="28" selection-start-column="4" selection-end-line="28" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UploadFileVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
       <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="594">
+          <caret line="84" column="35" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="295">
+          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserScheduleVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="-1071">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#1075#1076#0" expanded="true" />
+            <element signature="e#1166#1167#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxCodeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
       <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="295">
+          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
+        <state relative-caret-position="345">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxOpenVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
       <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="2369">
+          <caret line="118" column="13" selection-start-line="118" selection-start-column="13" selection-end-line="118" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="1472">
+          <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PageUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="897">
+          <caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/MybatisPlusApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="269">
+          <caret line="35" column="182" selection-start-line="35" selection-start-column="182" selection-end-line="35" selection-end-column="182" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3289">
-          <caret line="158" column="44" selection-start-line="158" selection-start-column="44" selection-end-line="158" selection-end-column="44" />
+        <state relative-caret-position="219">
+          <caret line="135" column="47" selection-start-line="135" selection-start-column="31" selection-end-line="135" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-533">
-          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        <state relative-caret-position="568">
+          <caret line="46" column="107" selection-start-line="46" selection-start-column="100" selection-end-line="46" selection-end-column="107" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="394">
-          <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
+        <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/repair/services/impl/RepairConsumablesServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
+        <state relative-caret-position="338">
+          <caret line="826" column="60" selection-start-line="826" selection-start-column="45" selection-end-line="826" selection-end-column="60" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="792">
-          <caret line="129" column="47" selection-start-line="129" selection-start-column="36" selection-end-line="129" selection-end-column="47" />
+        <state relative-caret-position="338">
+          <caret line="76" selection-start-line="76" selection-end-line="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="73" column="98" selection-start-line="73" selection-start-column="76" selection-end-line="73" selection-end-column="98" />
+        <state relative-caret-position="70">
+          <caret line="208" column="12" selection-start-line="208" selection-start-column="12" selection-end-line="208" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="564">
-          <caret line="79" column="93" selection-start-line="79" selection-start-column="71" selection-end-line="79" selection-end-column="93" />
+        <state relative-caret-position="318">
+          <caret line="49" column="37" selection-start-line="47" selection-start-column="8" selection-end-line="49" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
+        <state relative-caret-position="68">
+          <caret line="59" column="64" selection-start-line="59" selection-start-column="64" selection-end-line="59" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="92" column="73" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="73" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="153" column="48" lean-forward="true" selection-start-line="153" selection-start-column="48" selection-end-line="153" selection-end-column="48" />
+        <state relative-caret-position="295">
+          <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="1770" column="31" selection-start-line="1770" selection-start-column="24" selection-end-line="1770" selection-end-column="31" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="632">
+          <caret line="48" selection-start-line="48" selection-end-line="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+        <state relative-caret-position="268">
+          <caret line="277" column="81" selection-start-line="277" selection-start-column="70" selection-end-line="277" selection-end-column="81" />
         </state>
       </provider>
     </entry>

src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -73,7 +73,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/queryManageCount")
     @ApiOperation(value = "工单状态数量", notes = "工单状态数量", httpMethod = "GET")
-    CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead);
+    CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime);
 
     @GetMapping(value = "/queryManagePage")
     @ApiOperation(value = "工单管理工单数据", notes = "工单管理工单数据", httpMethod = "GET")

src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java

@@ -36,4 +36,13 @@ public interface RepairSystemMessagesControllerAPI {
     @ApiOperation(value = "已读操作", notes = "已读操作", httpMethod = "GET")
     CommonResult readSystemMessage(@RequestParam int id);
 
+    @GetMapping(value = "/queryManageMessagePage")
+    @ApiOperation(value = "管理端消息中心", notes = "管理端消息中心", httpMethod = "GET")
+    CommonResult queryManageMessagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestHeader("user_head") String userhead);
+
+    @GetMapping(value = "/readAllManageMessage")
+    @ApiOperation(value = "管理端批量已读操作", notes = "管理端批量已读操作", httpMethod = "GET")
+    CommonResult readAllManageMessage(@RequestHeader("user_head") String userhead);
+
+
 }

src/main/java/com/repair/common/utils/DateUtils.java

@@ -66,6 +66,11 @@ public class DateUtils {
         return LocalDateTime.now().format(dateTimeFormatter);
     }
 
+    /**
+     * 当前
+     * @param state
+     * @return
+     */
     public static String trendStartTime(Integer state){
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime now = LocalDateTime.now();
@@ -95,7 +100,7 @@ public class DateUtils {
     }
 
     /**
-     *
+     *  对比
      * @param state
      * @return
      */
@@ -155,5 +160,7 @@ public class DateUtils {
         System.out.println("s = " + s);
         String s1 = trendComparisonStartTime(4);
         System.out.println("s1 = " + s1);
+        int hour = LocalDateTime.now().getHour();
+        System.out.println("hour = " + hour);
     }
 }

src/main/java/com/repair/controller/LoginController.java

@@ -192,6 +192,7 @@ public class LoginController implements LoginControllerAPI {
     @Override
     @PassToken
     public CommonResult Openid(String wxcode){
+        System.out.println("微校授权："+wxcode);
         Gson gson = new Gson();
         String tokenUrl = "https://open.wecard.qq.com/connect/oauth2/token";
         Map<String, String> tokenParams = new HashMap<>();
@@ -219,8 +220,8 @@ public class LoginController implements LoginControllerAPI {
         String campus = null;
         Wx_user userinfos = gson.fromJson(userinfo, new TypeToken<Wx_user>() {
         }.getType());
-        System.out.println(userinfo);
-        System.out.println(userinfos.getIdentity_type());
+        System.out.println("微校授权获取用户信息："+userinfo);
+        System.out.println("微校授权获取用户信息类别："+userinfos.getIdentity_type());
         try {
             card_number = userinfos.getCard_number();
             user_name = userinfos.getName();
@@ -229,6 +230,7 @@ public class LoginController implements LoginControllerAPI {
             campus = userinfos.getCampus();
 
         } catch (Exception e) {
+            System.out.println("微校授权异常信息："+e.getMessage());
             return CommonResult.fail(e.getMessage());
         }
 
@@ -242,29 +244,34 @@ public class LoginController implements LoginControllerAPI {
         }
 
         if (user == null) {
-            user = new RepairUser();
-            user.setCardNumber(card_number);
-            user.setUserName(user_name);
-            user.setUserPhone(phone);
-            user.setUserZzid(eUserZZ.User.getValue());
-            user.setIdentityType(identity_type);
-            user.setSchoolId(eSchool.integerOf(campus));//校区ID
-            user.setIsChange(0);
-            int num = repairUserService.insertRepairUser(user);
-            if (num <= 0) {
-                return CommonResult.fail("无法记录用户信息，授权失败");
-            }
-            RepairAdmin admin = new RepairAdmin();
-            admin.setAccount(card_number);
-            admin.setPassword("974264710");
-            admin.setUsername(user_name);
-            admin.setPhone(phone);
-            admin.setIsSuper(0);
-            admin.setStatu(1);
-            admin.setIsMobile(1);
-            int adminNum = repairAdminService.insertRepairAdmin(admin);
-            if (adminNum <= 0) {
-                return CommonResult.fail("无法记录账号信息，授权失败");
+            try{
+                user = new RepairUser();
+                user.setCardNumber(card_number);
+                user.setUserName(user_name);
+                user.setUserPhone(phone);
+                user.setUserZzid(eUserZZ.User.getValue());
+                user.setIdentityType(identity_type);
+                user.setSchoolId(eSchool.integerOf(campus));//校区ID
+                user.setIsChange(0);
+                int num = repairUserService.insertRepairUser(user);
+                if (num <= 0) {
+                    return CommonResult.fail("无法记录用户信息，授权失败");
+                }
+                RepairAdmin admin = new RepairAdmin();
+                admin.setAccount(card_number);
+                admin.setPassword("974264710");
+                admin.setUsername(user_name);
+                admin.setPhone(phone);
+                admin.setIsSuper(0);
+                admin.setStatu(1);
+                admin.setCardNumber(card_number);
+                admin.setIsMobile(1);
+                int adminNum = repairAdminService.insertRepairAdmin(admin);
+                if (adminNum <= 0) {
+                    return CommonResult.fail("无法记录账号信息，授权失败");
+                }
+            }catch (Exception e){
+                System.out.println("微校授权异常信息："+e.getMessage());
             }
         }
 

src/main/java/com/repair/controller/RepairRecordController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jcraft.jsch.*;
 import com.repair.api.RepairRecordControllerAPI;
 import com.repair.common.utils.*;
@@ -760,7 +761,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
-    public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead) {
+    public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime) {
 //        String userID = AesUtils.decrypt(userhead);
 //        RepairAdmin operateData = repairAdminService.getRepairById(userID);
 //        if (operateData == null) {
@@ -769,7 +770,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 //        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
 //            schoolId = null;
 //        }
-        RepairManageCountVo result = repairRecordService.queryManageCount(schoolId);
+
+        if (startTime != null && endTime != null) {
+            try {
+                startTime = TimeExchange.getStartOfDayStr(TimeExchange.StringToDate(startTime, "yyyy-MM-dd"));
+                endTime = TimeExchange.getEndOfDayStr(TimeExchange.StringToDate(endTime, "yyyy-MM-dd"));
+            } catch (Exception e) {
+            }
+        }
+
+        RepairManageCountVo result = repairRecordService.queryManageCount(schoolId, keyWord, startTime, endTime);
         return CommonResult.ok(result);
     }
 
@@ -892,12 +902,33 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
                 break;
             case 8:
-                result = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime, schoolId);
-                for (RepairRecordPageVo r : result.getList()) {
-                    String[] Str = r.getMaintenancerName().split("-");
-                    r.setMaintenancerName(Str.length >= 2 ? Str[0] : "");
-                    r.setState(Str.length >= 2 ? Str[1] : "");
+                PageUtils<RepairRecordTimeoutPageVo> timeoutResult = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime, schoolId);
+                List<RepairRecordPageVo> pages = new ArrayList<>();
+                for (RepairRecordTimeoutPageVo r : timeoutResult.getList()) {
+                    RepairRecordPageVo page = new RepairRecordPageVo();
+                    page.setId(r.getId());
+                    page.setRecordNo(r.getRecordNo());
+                    page.setAreaName(r.getAreaName());
+                    page.setUserId(r.getUserId());
+                    page.setUserName(r.getUserName());
+                    page.setUserPhone(r.getUserPhone());
+                    page.setArticleName(r.getArticleName());
+                    page.setDescription(r.getDescription());
+                    page.setSchoolId(r.getSchoolId());
+                    page.setMaintenanceState(r.getMaintenanceState());
+                    List<String> timeoutStr = new ArrayList<>();
+                    if (r.getTimeoutStr() != null) {
+                        timeoutStr.add(r.getTimeoutStr());
+                    }
+                    if (r.getMaintenanceTimeout() != null) {
+                        timeoutStr.add(r.getMaintenanceTimeout());
+                    }
+                    page.setState(StringUtils.join(timeoutStr, ','));
+                    page.setReportTime(r.getReportTime());
+                    page.setMaintenancerName(r.getMaintenancerName());
+                    pages.add(page);
                 }
+                result = new PageUtils<RepairRecordPageVo>(pages, timeoutResult.getTotalCount(), timeoutResult.getPageSize(), timeoutResult.getCurrPage());
                 break;
             default:
                 break;
@@ -1780,7 +1811,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         if (tracks.size() > 0) {
             rr.setTracks(tracks);
         }
-        if(rcs.size() > 0){
+        if (rcs.size() > 0) {
             rr.setConsumables(rcs);
         }
 
@@ -2500,16 +2531,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         wrapperReceiving.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
         wrapperReceiving.isNotNull(RepairReceiving::getFinishTime);
         wrapperReceiving.groupBy(RepairReceiving::getUserId);
-        IPage<RepairReceiving> repairReceivingListPage = repairReceivingService.page(new Page<RepairReceiving>(currentPage,pageCount),wrapperReceiving);
+        IPage<RepairReceiving> repairReceivingListPage = repairReceivingService.page(new Page<RepairReceiving>(currentPage, pageCount), wrapperReceiving);
 
         IPage<MaintenanceWorkerVo> page = new Page();
-        BeanUtils.copyProperties(repairReceivingListPage,page);
+        BeanUtils.copyProperties(repairReceivingListPage, page);
 
         LambdaQueryWrapper<RepairReceiving> wrapperReceiving2 = new LambdaQueryWrapper<>();
         wrapperReceiving2.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
         wrapperReceiving2.isNotNull(RepairReceiving::getFinishTime);
         List<RepairReceiving> repairReceivingList = repairReceivingService.list(wrapperReceiving2);
-        if (ObjectUtils.isEmpty(repairReceivingList)&&repairReceivingList.size()<=0) {
+        if (ObjectUtils.isEmpty(repairReceivingList) && repairReceivingList.size() <= 0) {
             return CommonResult.ok(page);
         }
 
@@ -2805,7 +2836,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         wrapperReceiving.isNotNull(RepairReceiving::getFinishTime);
         List<RepairReceiving> repairReceivingList = repairReceivingService.list(wrapperReceiving);
 
-        if (ObjectUtils.isNotEmpty(repairReceivingList)&&repairReceivingList.size()>0) {
+        if (ObjectUtils.isNotEmpty(repairReceivingList) && repairReceivingList.size() > 0) {
 
 
             ArrayList<Integer> userList = new ArrayList<>();
@@ -3060,29 +3091,29 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             for (int i = 0; i < vos.size(); i++) {
                 MaintenanceWorkerVo vo = vos.get(i);
                 Row dataRow1 = sheet.createRow(i + 1);
-                dataRow1.createCell(0).setCellValue(i+1);
+                dataRow1.createCell(0).setCellValue(i + 1);
                 dataRow1.createCell(1).setCellValue(vo.getSchoolName());
                 dataRow1.createCell(2).setCellValue(vo.getName());
                 dataRow1.createCell(3).setCellValue(vo.getWorkOrderTotal());
-                dataRow1.createCell(4).setCellValue( vo.getDegreePraise());
-                dataRow1.createCell(5).setCellValue( vo.getTimeOut());
+                dataRow1.createCell(4).setCellValue(vo.getDegreePraise());
+                dataRow1.createCell(5).setCellValue(vo.getTimeOut());
                 BigDecimal answer = vo.getAnswer();
                 if (ObjectUtils.isEmpty(answer)) {
-                    answer=new BigDecimal(0);
+                    answer = new BigDecimal(0);
                 }
                 dataRow1.createCell(6).setCellValue(answer.toString());
                 BigDecimal maintain = vo.getMaintain();
                 if (ObjectUtils.isEmpty(maintain)) {
-                    maintain=new BigDecimal(0);
+                    maintain = new BigDecimal(0);
                 }
 
                 dataRow1.createCell(7).setCellValue(maintain.toString());
 
                 BigDecimal totalPrice = vo.getTotalPrice();
                 if (ObjectUtils.isEmpty(totalPrice)) {
-                    totalPrice=new BigDecimal(0);
+                    totalPrice = new BigDecimal(0);
                 }
-                dataRow1.createCell(8).setCellValue( totalPrice.toString());
+                dataRow1.createCell(8).setCellValue(totalPrice.toString());
 
             }
         }
@@ -3104,9 +3135,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         String startTime = DateUtils.startTime(state);
         String endTime = DateUtils.endTime();
 
-        RepairAnalysisVo vo=repairRecordService.repairAnalysis(startTime,endTime);
+        RepairAnalysisVo vo = repairRecordService.repairAnalysis(startTime, endTime);
 
-        Integer timeOutCount=repairRecordService.queryTimeOut(startTime,endTime);
+        Integer timeOutCount = repairRecordService.queryTimeOut(startTime, endTime);
 
         vo.setTimeOutCount(timeOutCount);
 
@@ -3123,7 +3154,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     @Override
     public CommonResult repairTrend(int state) throws Exception {
 
-        DateTimeFormatter dateTimeFormatter= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+//        当前时间
+        LocalDateTime now = LocalDateTime.now();
+
 
 //        本次时间
         String startTime = DateUtils.trendStartTime(state);
@@ -3137,34 +3172,40 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         ArrayList<RepairTrendVo> vos = new ArrayList<>();
 //      本年和去年
-        if (state==1) {
+        if (state == 1) {
 
             for (int i = 1; i <= 12; i++) {
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
-
-                LocalDateTime dateTime = sTime.plusMonths(i - 1);
-                LocalDateTime endTime = sTime.plusMonths(i);
-                LambdaQueryWrapper<RepairRecord> wrapper=new LambdaQueryWrapper<>();
-                wrapper.between(RepairRecord::getReportTime,dateTime,endTime);
-                int count = repairRecordService.count(wrapper);
-                repairTrendVo.setTrendCount(count);
+//              获取当前月份
+                int monthValue1 = now.getMonthValue();
+
+                if (i <= monthValue1) {
+                    LocalDateTime dateTime = sTime.plusMonths(i - 1);
+                    LocalDateTime endTime = sTime.plusMonths(i);
+                    LambdaQueryWrapper<RepairRecord> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.between(RepairRecord::getReportTime, dateTime, endTime);
+                    int count = repairRecordService.count(wrapper);
+                    repairTrendVo.setTrendCount(count);
+                    repairTrendVo.setTrendName(dateTime.getMonthValue() + "月");
+                }
 
                 LocalDateTime dDateTime = dsTime.plusMonths(i - 1);
                 LocalDateTime doubleEndTime = dsTime.plusMonths(i);
-                LambdaQueryWrapper<RepairRecord> dWrapper=new LambdaQueryWrapper<>();
-                dWrapper.between(RepairRecord::getReportTime,dDateTime,doubleEndTime);
+                LambdaQueryWrapper<RepairRecord> dWrapper = new LambdaQueryWrapper<>();
+                dWrapper.between(RepairRecord::getReportTime, dDateTime, doubleEndTime);
                 int dCount = repairRecordService.count(dWrapper);
                 repairTrendVo.setTrendComparisonCount(dCount);
 
-                repairTrendVo.setTrendName(dateTime.getMonthValue()+"月");
-                repairTrendVo.setTrendComparisonName(dDateTime.getMonthValue()+"月");
+                repairTrendVo.setTrendComparisonName(dDateTime.getMonthValue() + "月");
                 vos.add(repairTrendVo);
             }
 
-        }else if (state==2){
+        } else if (state == 2) {
             for (int i = 1; i <= 31; i++) {
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
 
+                int dayOfMonth = now.getDayOfMonth();
+
                 LocalDateTime dateTime = sTime.plusDays(i - 1);
                 LocalDateTime endTime = sTime.plusDays(i);
 
@@ -3175,67 +3216,77 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 int value2 = dDateTime.getMonthValue();
 
 //                  当前时间月份相同就可以添加
-                if (value==monthValue) {
-                    LambdaQueryWrapper<RepairRecord> wrapper=new LambdaQueryWrapper<>();
-                    wrapper.between(RepairRecord::getReportTime,dateTime,endTime);
+                if (value == monthValue && i <= dayOfMonth) {
+                    LambdaQueryWrapper<RepairRecord> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.between(RepairRecord::getReportTime, dateTime, endTime);
                     int count = repairRecordService.count(wrapper);
                     repairTrendVo.setTrendCount(count);
-                    repairTrendVo.setTrendName(value+"月"+dateTime.getDayOfMonth()+"号");
+                    repairTrendVo.setTrendName(value + "月" + dateTime.getDayOfMonth() + "号");
                 }
 //              对比的月份不相同就可以添加
-                if (value2!=monthValue) {
-                    LambdaQueryWrapper<RepairRecord> dWrapper=new LambdaQueryWrapper<>();
-                    dWrapper.between(RepairRecord::getReportTime,dDateTime,doubleEndTime);
+                if (value2 != monthValue) {
+                    LambdaQueryWrapper<RepairRecord> dWrapper = new LambdaQueryWrapper<>();
+                    dWrapper.between(RepairRecord::getReportTime, dDateTime, doubleEndTime);
                     int dCount = repairRecordService.count(dWrapper);
                     repairTrendVo.setTrendComparisonCount(dCount);
-                    repairTrendVo.setTrendComparisonName(value2+"月"+dDateTime.getDayOfMonth()+"号");
+                    repairTrendVo.setTrendComparisonName(value2 + "月" + dDateTime.getDayOfMonth() + "号");
                 }
 
                 vos.add(repairTrendVo);
             }
 
-        }else if (state==3){
+        } else if (state == 3) {
             for (int i = 1; i <= 7; i++) {
+//              获取当前星期
+                int value = now.getDayOfWeek().getValue();
+
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
 
-                LocalDateTime dateTime = sTime.plusDays(i - 1);
-                LocalDateTime endTime = sTime.plusDays(i);
-                LambdaQueryWrapper<RepairRecord> wrapper=new LambdaQueryWrapper<>();
-                wrapper.between(RepairRecord::getReportTime,dateTime,endTime);
-                int count = repairRecordService.count(wrapper);
-                repairTrendVo.setTrendCount(count);
+                if (i <= value) {
+                    LocalDateTime dateTime = sTime.plusDays(i - 1);
+                    LocalDateTime endTime = sTime.plusDays(i);
+                    LambdaQueryWrapper<RepairRecord> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.between(RepairRecord::getReportTime, dateTime, endTime);
+                    int count = repairRecordService.count(wrapper);
+                    repairTrendVo.setTrendCount(count);
+                    repairTrendVo.setTrendName(DateUtils.weekName(dateTime.getDayOfWeek().getValue()));
+                }
 
                 LocalDateTime dDateTime = dsTime.plusDays(i - 1);
                 LocalDateTime doubleEndTime = dsTime.plusDays(i);
-                LambdaQueryWrapper<RepairRecord> dWrapper=new LambdaQueryWrapper<>();
-                dWrapper.between(RepairRecord::getReportTime,dDateTime,doubleEndTime);
+                LambdaQueryWrapper<RepairRecord> dWrapper = new LambdaQueryWrapper<>();
+                dWrapper.between(RepairRecord::getReportTime, dDateTime, doubleEndTime);
                 int dCount = repairRecordService.count(dWrapper);
                 repairTrendVo.setTrendComparisonCount(dCount);
 
-                repairTrendVo.setTrendName(DateUtils.weekName(dateTime.getDayOfWeek().getValue()));
                 repairTrendVo.setTrendComparisonName(DateUtils.weekName(dDateTime.getDayOfWeek().getValue()));
                 vos.add(repairTrendVo);
             }
-        }else if (state==4){
+        } else if (state == 4) {
             for (int i = 1; i <= 24; i++) {
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
 
-                LocalDateTime dateTime = sTime.plusHours(i - 1);
-                LocalDateTime endTime = sTime.plusHours(i);
-                LambdaQueryWrapper<RepairRecord> wrapper=new LambdaQueryWrapper<>();
-                wrapper.between(RepairRecord::getReportTime,dateTime,endTime);
-                int count = repairRecordService.count(wrapper);
-                repairTrendVo.setTrendCount(count);
+//                获取当前小时
+                int hour = now.getHour();
+
+                if (i <= hour) {
+                    LocalDateTime dateTime = sTime.plusHours(i - 1);
+                    LocalDateTime endTime = sTime.plusHours(i);
+                    LambdaQueryWrapper<RepairRecord> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.between(RepairRecord::getReportTime, dateTime, endTime);
+                    int count = repairRecordService.count(wrapper);
+                    repairTrendVo.setTrendCount(count);
+                    repairTrendVo.setTrendName(dateTime.getHour() + "点");
+                }
 
                 LocalDateTime dDateTime = dsTime.plusHours(i - 1);
                 LocalDateTime doubleEndTime = dsTime.plusHours(i);
-                LambdaQueryWrapper<RepairRecord> dWrapper=new LambdaQueryWrapper<>();
-                dWrapper.between(RepairRecord::getReportTime,dDateTime,doubleEndTime);
+                LambdaQueryWrapper<RepairRecord> dWrapper = new LambdaQueryWrapper<>();
+                dWrapper.between(RepairRecord::getReportTime, dDateTime, doubleEndTime);
                 int dCount = repairRecordService.count(dWrapper);
                 repairTrendVo.setTrendComparisonCount(dCount);
 
-                repairTrendVo.setTrendName(dateTime.getHour()+"点");
-                repairTrendVo.setTrendComparisonName(dDateTime.getHour()+"点");
+                repairTrendVo.setTrendComparisonName(dDateTime.getHour() + "点");
                 vos.add(repairTrendVo);
             }
         }
@@ -3246,6 +3297,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
     /**
      * 总数据汇总
+     *
      * @return
      * @throws Exception
      */
@@ -3253,19 +3305,19 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     public CommonResult repairSummarizing() throws Exception {
 
         List<RepairSummarizingVo> vos = new ArrayList<>();
-        for (int i = 0; i < 5 ; i++) {
+        for (int i = 0; i < 5; i++) {
             String startTime = DateUtils.startTime(i);
             String endTime = DateUtils.endTime();
-            RepairSummarizingVo vo=repairRecordService.repairSummarizing(startTime,endTime);
-            if (i==0) {
+            RepairSummarizingVo vo = repairRecordService.repairSummarizing(startTime, endTime);
+            if (i == 0) {
                 vo.setDateName("全部");
-            }else if (i==1){
+            } else if (i == 1) {
                 vo.setDateName("本年");
-            }else if (i==2){
+            } else if (i == 2) {
                 vo.setDateName("本月");
-            }else if (i==3){
+            } else if (i == 3) {
                 vo.setDateName("本周");
-            }else {
+            } else {
                 vo.setDateName("今天");
             }
             vos.add(vo);

src/main/java/com/repair/controller/RepairSystemMessagesController.java

@@ -2,12 +2,18 @@ package com.repair.controller;
 
 
 import com.repair.api.RepairSystemMessagesControllerAPI;
+import com.repair.common.utils.AesUtils;
 import com.repair.common.utils.paramUtils;
+import com.repair.model.enumModel.eIsSuper;
+import com.repair.model.pojo.RepairAdmin;
 import com.repair.model.pojo.RepairSystemMessages;
+import com.repair.model.pojo.RepairUser;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.SystemMessagePageVo;
+import com.repair.services.RepairAdminService;
 import com.repair.services.RepairSystemMessagesService;
+import com.repair.services.RepairUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,6 +30,10 @@ import org.springframework.web.bind.annotation.RestController;
 public class RepairSystemMessagesController implements RepairSystemMessagesControllerAPI {
 
     @Autowired
+    private RepairUserService repairUserService;
+    @Autowired
+    private RepairAdminService repairAdminService;
+    @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
     @Override
@@ -83,5 +93,50 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         int uRsm = repairSystemMessagesService.updateRepairSystemMessages(rsm);
         return CommonResult.ok();
     }
+
+    @Override
+    public CommonResult queryManageMessagePage(int currentPage, int pageCount, String userhead) {
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法，无法获取消息数据！");
+        }
+
+        //发送人
+        Integer userId = 0;//超级管理员用ID为0
+        if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+            if (user == null) {
+                return CommonResult.fail("管理端账号未与移动端账号绑定，无法获取消息数据！");
+            }
+            userId = user.getId();
+        }
+
+        PageUtils<SystemMessagePageVo> result = repairSystemMessagesService.querySystemMessagePage(currentPage, pageCount, userId);
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult readAllManageMessage(String userhead) {
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法，无法进行已读操作！");
+        }
+
+        //发送人
+        Integer userId = 0;//超级管理员用ID为0
+        if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+            if (user == null) {
+                return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行已读操作！");
+            }
+            userId = user.getId();
+        }
+
+        repairSystemMessagesService.readAllManageMessage(userId);
+
+        return CommonResult.ok();
+    }
 }
 

src/main/java/com/repair/mapper/RepairRecordMapper.java

@@ -33,11 +33,11 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<RepairTechnicianVo> queryExamineOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId);
 
-    RepairManageCountVo queryManageCount(@Param("schoolId") Integer schoolId);
+    RepairManageCountVo queryManageCount(@Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     IPage<RepairRecordPageVo> queryNotTimeout(IPage<RepairRecordPageVo> page, @Param("stateStr") String stateStr, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("schoolId") Integer schoolId);
 
-    IPage<RepairRecordPageVo> queryTimeout(IPage<RepairRecordPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
+    IPage<RepairRecordTimeoutPageVo> queryTimeout(IPage<RepairRecordTimeoutPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
 
     IPage<pendingOrderVo> queryPendingOrder(IPage<pendingOrderVo> page);
 
@@ -82,7 +82,7 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     List<MaintenanceGoodsVo>  maintenanceGoodsExport(String startTime, String endTime);
 
     DetailsVo queryDetailData(@Param("recordId") Integer recordId);
-	
+
     RepairAnalysisVo repairAnalysis(@Param("startTime")String startTime,@Param("endTime") String endTime);
 
     Integer queryTimeOut(@Param("startTime")String startTime,@Param("endTime") String endTime);

src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java

@@ -0,0 +1,131 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.repair.model.enumModel.eSchool;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/1 星期二 14:20
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class RepairRecordTimeoutPageVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+    /**
+     * 工单编号
+     */
+    private String recordNo;
+    /**
+     * 报修区域
+     */
+    private String areaName;
+    /**
+     * 用户ID
+     */
+    @JsonIgnore
+    private int userId;
+    /**
+     * 姓名
+     */
+    private String userName;
+    /**
+     * 电话
+     */
+    private String userPhone;
+    /**
+     * 报修物品
+     */
+    private String articleName;
+    /**
+     * 故障描述
+     */
+    private String description;
+
+    /**
+     * 校区ID
+     */
+    private Integer schoolId;
+
+    /**
+     * 校区名称
+     */
+    private String school;
+
+    public String getSchool() {
+        return eSchool.stringOf(schoolId);
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    /**
+     * 订单维修状态
+     */
+    @JsonIgnore
+    private int maintenanceState;
+    /**
+     * 报修时间
+     */
+    private Date reportTime;
+    /**
+     * 技术员
+     */
+    private String maintenancerName;
+
+    /**
+     * 超时未接
+     */
+    private String timeoutStr;
+
+    /**
+     * 维修超时
+     */
+    private String maintenanceTimeout;
+
+    /**
+     * 出现派单按钮
+     */
+    private int dispatch;
+
+    /**
+     * 出现协作审核按钮
+     */
+    private int collaborate;
+
+    /**
+     * 出现转单审核按钮
+     */
+    private int transfer;
+
+    /**
+     * 出现关单按钮
+     */
+    private int close;
+
+    /**
+     * 出现改价按钮
+     */
+    private int changePrice;
+
+    /**
+     * 出现回复按钮
+     */
+    private int reply;
+
+    /**
+     * 出现延时按钮
+     */
+    private int delayed;
+    /**
+     * 出现详情按钮
+     */
+    private int details;
+}

src/main/java/com/repair/model/vo/RepairSummarizingVo.java

@@ -4,24 +4,36 @@ import lombok.Data;
 
 @Data
 public class RepairSummarizingVo {
-//    时间
-    private String dateName;
-    //    总单数
-    private Integer totalCount;
+
     //    待审核
     private Integer checkCount;
+
     //    待接单
     private Integer receivingCount;
+
+    //    待处理
+    private Integer disposeCount;
+
+    //    待确认
+    private Integer affirmCount;
+
     //    维修中
     private Integer maintainCount;
+
     //    已完成
     private Integer accomplishCount;
-    //    已关单
-    private Integer shutCount;
+
     //    已取消
     private Integer cancelCount;
-    //    待处理
-    private Integer disposeCount;
-    //    待确认
-    private Integer affirmCount;
+
+    //    已关单
+    private Integer shutCount;
+
+    //    总单数
+    private Integer totalCount;
+
+    //    时间
+    private String dateName;
+
+
 }

src/main/java/com/repair/services/RepairRecordService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -43,11 +44,11 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId);
 
-    RepairManageCountVo queryManageCount(Integer schoolId);
+    RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime);
 
     PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
 
-    PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
+    PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
 
     PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount);
 
@@ -98,6 +99,6 @@ public interface RepairRecordService extends IService<RepairRecord> {
     Integer queryTimeOut(String startTime, String endTime);
 
     RepairSummarizingVo repairSummarizing(String startTime, String endTime);
-	
+
     DetailsVo queryDetailData(Integer recordId);
 }

src/main/java/com/repair/services/RepairSystemMessagesService.java

@@ -32,4 +32,6 @@ public interface RepairSystemMessagesService extends IService<RepairSystemMessag
 
     PageUtils<SystemMessagePageVo> querySystemMessagePage(int currentPage, int pageCount, Integer userId);
 
+    int readAllManageMessage(int userId);
+
 }

src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java

@@ -53,7 +53,11 @@ public class RepairArticleTypeServiceImpl extends ServiceImpl<RepairArticleTypeM
 
     @Override
     public int deleteRepairArticleTypeById(int id) {
-        int result = repairArticleTypeMapper.deleteById(id);
+        QueryWrapper<RepairArticleType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(e -> e.eq("id", id)
+                .or()
+                .eq("parent_id", id));
+        int result = repairArticleTypeMapper.delete(queryWrapper);
         return result;
     }
 

src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java

@@ -133,8 +133,8 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
-    public RepairManageCountVo queryManageCount(Integer schoolId) {
-        RepairManageCountVo result = repairRecordMapper.queryManageCount(schoolId);
+    public RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime) {
+        RepairManageCountVo result = repairRecordMapper.queryManageCount(schoolId, keyWord, startTime, endTime);
         return result;
     }
 
@@ -148,11 +148,11 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
-    public PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId) {
-        Page<RepairRecordPageVo> page = new Page<>();
+    public PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId) {
+        Page<RepairRecordTimeoutPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime, schoolId);
+        IPage<RepairRecordTimeoutPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime, schoolId);
         return new PageUtils(result);
     }
 
@@ -339,7 +339,7 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         RepairSummarizingVo vo=repairRecordMapper.repairSummarizing(startTime,endTime);
         return vo;
     }
-	
+
     @Override
     public DetailsVo queryDetailData(Integer recordId) {
         DetailsVo result = repairRecordMapper.queryDetailData(recordId);

src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java

@@ -80,4 +80,14 @@ public class RepairSystemMessagesServiceImpl extends ServiceImpl<RepairSystemMes
         IPage<SystemMessagePageVo> result = repairSystemMessagesMapper.querySystemMessagePage(page, userId);
         return new PageUtils(result);
     }
+
+    @Override
+    public int readAllManageMessage(int userId) {
+        QueryWrapper<RepairSystemMessages> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("recipient_id", userId);
+        RepairSystemMessages rsm = new RepairSystemMessages();
+        rsm.setIsRead(1);
+        int result = repairSystemMessagesMapper.update(rsm,queryWrapper);
+        return result;
+    }
 }

src/main/resources/mapper/repair/RepairRecordMapper.xml

@@ -42,9 +42,13 @@
     <select id="queryMyRepairRecordList" resultType="com.repair.model.vo.MyRepairRecordVo"
             resultMap="repairRecordOwnMap">
         select
-        case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time) and rr.maintenance_state &lt;= 7 and rr.is_duty = 0 when true then '超时未接'
+        case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
+        rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
+        rdr.receiving_time) and rr.maintenance_state &lt;= 7 and rr.is_duty = 0 when true then '超时未接'
         else null end as timeout_disp_str,
-        case ((date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time) and rr.maintenance_state &lt;= 7 and rr.is_duty = 0 when true then '维修超时'
+        case ((date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and
+        rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
+        minute) &lt;= rdv.finish_time) and rr.maintenance_state &lt;= 7 and rr.is_duty = 0 when true then '维修超时'
         else null end as timeout_rece_str,
         rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
         as area_name,rr.address,rr.description,rat.name as article_name,rr.image,rr.maintenance_state as state_id from
@@ -193,63 +197,136 @@
     <select id="queryManageCount" resultType="com.repair.model.vo.RepairManageCountVo" resultMap="repairManageCountMap">
         select
         (select Count(*) from repair_record where deleted = 0
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
+        and maintenance_state != 4
         ) as all_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
-        and school_id = #{schoolId}
+            and school_id = #{schoolId}
         </if>
-        )  as dispatch_count,
+        ) as dispatch_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
-        )  as maintenance_count,
+        ) as maintenance_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
-        )  as logistics_count,
+        ) as logistics_count,
         (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
         ) as examine_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
-        )  as finished_count,
+        ) as finished_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
         ) as canceled_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9
+        <if test="keyWord != null and keyWord != ''">
+            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
         ) as closed_count,
-        (select Count(*) as cs from (select rr3.* from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0 and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
-        where rr3.is_duty = 0 and rr3.deleted = 0 and rr3.maintenance_state &lt;= 7
+        (SELECT count(*) as cs FROM (
+        select rdr.users_id as
+        user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
+        and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
+        rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
+        rdr.receiving_time)
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="keyWord != null and keyWord != ''">
+            and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
-            and rr3.school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         UNION
-        select rr4.* from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0 and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
-        where rr4.is_duty = 0 and rr4.deleted = 0 and rr4.maintenance_state &lt;= 7
+        select
+        rdv.user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
+        and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and
+        rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
+        minute) &lt;= rdv.finish_time)
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="keyWord != null and keyWord != ''">
+            and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord} '%')
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
         <if test="schoolId != null and schoolId != ''">
-            and rr4.school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
-        ) c) as timeout_count
+        ) t) as timeout_count
     </select>
 
+    <!--管理端工单分页数据-->
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
         <result property="id" column="id"/>
         <result property="recordNo" column="record_no"/>
@@ -268,7 +345,8 @@
 
     <!--除已超时外的其他数据获取方式-->
     <select id="queryNotTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        select rr.school_id,rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
+        select rr.school_id,rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as
+        area_name,rr.user_name,rr.user_phone,rat.name as
         article_name,
         rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
         from repair_record rr
@@ -281,6 +359,9 @@
             <if test="stateStr != null and stateStr != ''">
                 and (rr.maintenance_state ${stateStr}
             </if>
+            <if test="stateStr == null or stateStr == ''">
+                and rr.maintenance_state != 4
+            </if>
             <if test="keyWord != null and keyWord != ''">
                 and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like
                 '%' #{keyWord} '%')
@@ -292,54 +373,83 @@
         order by rr.report_time desc
     </select>
 
+    <resultMap type="com.repair.model.vo.RepairRecordTimeoutPageVo" id="repairRecordTimeoutPageMap">
+        <result property="id" column="id"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="articleName" column="article_name"/>
+        <result property="areaName" column="area_name"/>
+        <result property="description" column="description"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="maintenancerName" column="maintenancer_name"/>
+        <result property="details" column="details"/>
+        <result property="maintenanceState" column="maintenance_state"/>
+        <result property="timeoutStr" column="timeout_str"/>
+        <result property="maintenanceTimeout" column="maintenance_timeout"/>
+        <result property="userId" column="user_id"/>
+    </resultMap>
+
     <!--#已超时获取方式-->
-    <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        SELECT * FROM (
-        select rr3.school_id,rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
-        area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
-        rr3.description,rr3.report_time,concat((select user_name from repair_user where id = rdr.users_id),'-','接单超时') as maintenancer_name,rr3.maintenance_state
-        from repair_record rr3
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0
-        and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
+    <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordTimeoutPageVo"
+            resultMap="repairRecordTimeoutPageMap">
+        select t.school_id,t.user_id,t.details,t.id,t.record_no,t.area_name,t.user_name,t.user_phone,rat.name as
+        article_name,t.description,t.report_time,t.maintenance_state,ru.user_name as maintenancer_name,ru.user_phone as
+        maintenancer_phone,
+        case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
+        rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
+        rdr.receiving_time) when true then '超时未接' else null end as timeout_str,
+        case ((date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and
+        rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
+        minute) &lt;= rdv.finish_time) when true then '维修超时' else null end as maintenance_timeout
+        FROM (
+        select rr.school_id,rdr.users_id as user_id,1 as details,rr.id,rr.record_no,rr.area_id as
+        area_name,rr.user_name,rr.user_phone,rr.price,rr.maintenance_state,rr.article_id,rr.report_time,rr.description
+        from repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
+        and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
+        rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
+        rdr.receiving_time)
         <where>
-            and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.maintenance_state &lt;= 7
+            and rr.deleted = 0 and rr.is_duty = 0 and rr.maintenance_state &lt;= 7
             <if test="keyWord != null and keyWord != ''">
-                and (rr3.area_id like '%' #{keyWord} '%' or rr3.user_name like '%' #{keyWord} '%' or rr3.user_phone like
-                '%' #{keyWord} '%')
+                and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord} '%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr3.report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
             <if test="schoolId != null and schoolId != ''">
-                and rr3.school_id = #{schoolId}
+                and rr.school_id = #{schoolId}
             </if>
         </where>
-        UNION ALL
-        select rr4.school_id,rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
-        area_name,rr4.user_name,rr4.user_phone,rat.name as
-        article_name,
-        rr4.description,rr4.report_time,concat((select user_name from repair_user where id = rdv.user_id),'-','维修超时') as maintenancer_name,rr4.maintenance_state
-        from repair_record rr4
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
-        and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
+        UNION
+        select rr.school_id,rdv.user_id,1 as details,rr.id,rr.record_no,rr.area_id as
+        area_name,rr.user_name,rr.user_phone,rr.price,rr.maintenance_state,rr.article_id,rr.report_time,rr.description
+        from repair_record rr
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
+        and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and
+        rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
+        minute) &lt;= rdv.finish_time)
         <where>
-            and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.maintenance_state &lt;= 7
+            and rr.deleted = 0 and rr.is_duty = 0 and rr.maintenance_state &lt;= 7
             <if test="keyWord != null and keyWord != ''">
-                and (rr4.area_id like '%' #{keyWord} '%' or rr4.user_name like '%' #{keyWord} '%' or rr4.user_phone like
-                '%' #{keyWord} '%')
+                and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord} '%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr4.report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
             <if test="schoolId != null and schoolId != ''">
-                and rr4.school_id = #{schoolId}
+                and rr.school_id = #{schoolId}
             </if>
         </where>
         ) t
+        left join repair_dispatch_record rdr on rdr.users_id =t.user_id and rdr.deleted = 0 and rdr.record_id = t.id and
+        rdr.is_lose_efficacy = 0
+        left join repair_receiving rdv on rdv.user_id =t.user_id and rdv.deleted = 0 and rdv.record_id = t.id and
+        rdv.is_lose_efficacy = 0
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = t.article_id
+        left join repair_user ru on ru.deleted = 0 and ru.id = t.user_id
         order by t.report_time desc
     </select>
 
@@ -408,12 +518,12 @@
         select rdr.users_id as user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
-        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = 1
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = #{schoolId}
         UNION
         select rdv.user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  from repair_record rr
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
-        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = 1) t) as timeout_count,
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = #{schoolId}) t) as timeout_count,
         (select Count(*) from repair_record rr8
         where rr8.deleted = 0 and rr8.school_id = #{schoolId} and rr8.maintenance_state = 9) as closed_count
     </select>
@@ -537,7 +647,9 @@
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0
-        and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
+        and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
+        rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
+        rdr.receiving_time)
         <where>
             and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.maintenance_state &lt;= 7
             <if test="keyWord != null and keyWord != ''">
@@ -560,7 +672,9 @@
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0
-        and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
+        and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and
+        rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
+        minute) &lt;= rdv.finish_time)
         <where>
             and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.maintenance_state &lt;= 7
             <if test="keyWord != null and keyWord != ''">
@@ -661,21 +775,19 @@
         (select Count(*) from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id
         where rr.deleted = 0 and rr.maintenance_state >= 7 and rr.school_id = #{schoolId}) as finish_count,
-        (select Count(*) as cs from (select rr3.*
-        from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0
+        (SELECT count(*) as cs FROM (
+        select rdr.users_id as user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  from repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
-        where rr3.is_duty = 0 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = #{schoolId}
         UNION
-        select rr4.* from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
+        select rdv.user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  from repair_record rr
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
-        where rr4.is_duty = 0 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0 and rr.school_id = #{schoolId}) t) as timeout_count
     </select>
 
-<select id="repairCampusTotal" resultType="com.repair.model.vo.RepairCampusVo">
+    <select id="repairCampusTotal" resultType="com.repair.model.vo.RepairCampusVo">
         SELECT rs.id,
                count(rr.school_id) as orders_total,
                rs.`name`           as school_name,
@@ -961,7 +1073,8 @@
         <result property="price" column="price"/>
     </resultMap>
     <select id="queryDetailData" resultType="com.repair.model.vo.DetailsVo" resultMap="detailDatasMap">
-        select rr.id,rr.maintenance_state,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,
+        select rr.id,rr.maintenance_state,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as
+        area_name,rr.address,rat.name as article_name,
         rr.description,rr.voice,rr.voice_length,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price
         from repair_record rr
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id

target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,92 @@
+{
+  "groups": [
+    {
+      "name": "openid",
+      "type": "com.repair.config.WxOpenidConfig",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "tencentcloud",
+      "type": "com.repair.config.SmsConfig",
+      "sourceType": "com.repair.config.SmsConfig"
+    }
+  ],
+  "properties": [
+    {
+      "name": "openid.appid",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.appkey",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.granttype",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.ipconfig",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.ocode",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.shappid",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.shsecret",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.xappid",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "openid.xsecret",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "tencentcloud.sdk-appid",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.secret-i-d",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.secret-key",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.sign-name",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.sms-min",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.template-id",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    }
+  ],
+  "hints": []
+}

target/classes/mapper/repair/RepairAdminMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairAdminMapper">
+
+</mapper>

target/classes/mapper/repair/RepairAreaMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairAreaMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairSchoolVo" id="repairSchoolMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryRepairSchools" resultMap="repairSchoolMap">
+        select id,name from repair_area where parent_id = 0 and deleted = 0
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairArticleTypeMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairArticleTypeMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairArticleTypeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryArticleTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairArticleTypeMap">
+       select id,name from repair_article_type
+        <where>
+            and deleted = 0 and parent_id = 0
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
+            </if>
+        </where>
+    </select>
+
+
+    <resultMap type="com.repair.model.vo.RepairArticleChildVo" id="repairArticleChildMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="childId" column="child_id"/>
+    </resultMap>
+
+    <select id="queryArticleChildList" resultType="com.repair.model.vo.RepairArticleChildVo" resultMap="repairArticleChildMap">
+        SELECT CONCAT_WS(',', GROUP_CONCAT(rt.id separator','), rat.id) as child_id,rat.id,rat.`name` FROM repair_article_type rat
+        left join repair_article_type rt on rt.deleted = 0 and rt.parent_id = rat.id
+        where rat.deleted = 0 and rat.parent_id = 0 and rat.school_id = #{schoolId}
+        group by rat.id
+
+    </select>
+    <!--order by locate(#{keyWord},rat.name) desc 按关键字模糊查询排序-->
+
+</mapper>

target/classes/mapper/repair/RepairClassesSettingsMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairClassesSettingsMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="startDate" column="start_date"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+
+    <select id="queryClassesSettingList" resultType="com.repair.model.vo.ClassesSettingVo" resultMap="repairClassesListMap">
+        SELECT rcs.id,rcs.user_id,rcs.start_date,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        ,(select GROUP_CONCAT(color) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_color
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rcs.start_date BETWEEN #{startTime} and #{endTime}
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.ClassesDataVo" id="repairClassesDataMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+    <select id="queryClassesDatas" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startDate != null and startDate != ''">
+                and rcs.start_date = CURRENT_DATE()
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryClassesData" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0 and rcs.start_date = CURRENT_DATE()
+            <if test="userId != null and userId != ''">
+                and rcs.user_id = ${userId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairCloseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairCloseMapper">
+
+</mapper>

target/classes/mapper/repair/RepairCollaborateRecordMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairCollaborateRecordMapper">
+
+    <resultMap type="com.repair.model.vo.CollaborateRecordVo" id="repairCollaborateRecordMap">
+        <result property="id" column="id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="state" column="state"/>
+    </resultMap>
+
+    <select id="queryCollaborateRecordList" resultType="com.repair.model.vo.CollaborateRecordVo" resultMap="repairCollaborateRecordMap">
+        select id,record_id,'转单' as state from repair_transfer_record
+        <where>
+            and deleted = 0 and approval_statu = 2
+            <if test="recordIds != null and recordIds.size() > 0">
+                and record_id in
+                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
+                    ${recordId}
+                </foreach>
+            </if>
+        </where>
+        UNION ALL
+        select id,record_id,'协作' as state from repair_collaborate_record
+        <where>
+            and deleted = 0 and approval_statu = 2
+            <if test="recordIds != null and recordIds.size() > 0">
+                and record_id in
+                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
+                    ${recordId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.CollaborateDetailVo" id="repairCollaborateDetailMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="collaboratorName" column="collaborator_name"/>
+        <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+    <select id="queryCollaborateDetail" resultType="com.repair.model.vo.CollaborateDetailVo" resultMap="repairCollaborateDetailMap">
+        select rcr.id,rcr.voice_length,rus.user_name,GROUP_CONCAT(CONCAT(ru.id,'-',ru.user_name)) as collaborator_name,rcr.voice,rcr.remark from repair_collaborate_record rcr
+        left join repair_user ru on ru.deleted = 0 and find_in_set(ru.id,rcr.collaborator)
+        left join repair_user rus on rus.deleted = 0 and rus.id = rcr.user_id
+        where rcr.deleted = 0 and rcr.approval_statu = 2 and rcr.record_id = #{recordId}
+        group by rcr.id
+    </select>
+</mapper>

target/classes/mapper/repair/RepairConsumablesMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairConsumablesMapper">
+
+    <resultMap type="com.repair.model.vo.ConsumablePageVo" id="repairConsumablePageMap">
+        <result property="id" column="id"/>
+        <result property="consumeName" column="consume_name"/>
+        <result property="price" column="price"/>
+        <result property="number" column="number"/>
+        <result property="totalPrice" column="total_price"/>
+        <result property="articleName" column="article_name"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="queryConsumablePageList" resultType="com.repair.model.vo.ConsumablePageVo" resultMap="repairConsumablePageMap">
+        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
+        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
+        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
+        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
+        <where>
+            and rcs.deleted = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rcs.update_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by rr.report_time desc,rcs.update_time desc
+    </select>
+
+    <resultMap type="com.repair.model.vo.ConsumableExcelVo" id="repairConsumableExcelMap">
+        <result property="id" column="id"/>
+        <result property="consumeName" column="consume_name"/>
+        <result property="price" column="price"/>
+        <result property="number" column="number"/>
+        <result property="totalPrice" column="total_price"/>
+        <result property="articleName" column="article_name"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="queryConsumableExcelList" resultType="com.repair.model.vo.ConsumableExcelVo" resultMap="repairConsumableExcelMap">
+        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
+        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
+        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
+        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
+        <where>
+            and rcs.deleted = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rcs.update_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by rr.report_time desc,rcs.update_time desc
+    </select>
+
+    <resultMap type="com.repair.model.vo.ChangeConsumesVo" id="repairChangeConsumesMap">
+        <result property="id" column="id"/>
+        <result property="articleId" column="article_id"/>
+        <result property="consumeId" column="consume_id"/>
+        <result property="consumeName" column="consume_name"/>
+        <result property="price" column="price"/>
+        <result property="number" column="number"/>
+    </resultMap>
+    <select id="repairChangeConsumes" resultType="com.repair.model.vo.ChangeConsumesVo" resultMap="repairChangeConsumesMap">
+        select id,article_id,consume_id,consume_name,price,number from repair_consumables
+        <where>
+            and deleted = 0
+            <if test="recordId != null and recordId != ''">
+                and record_id = #{recordId}
+            </if>
+        </where>
+        order by update_time desc
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairConsumeMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.ConsumeVo" id="repairConsumeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="price" column="price"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="artileName" column="artile_name"/>
+        <result property="entryName" column="entry_name"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="queryConsumeList" resultType="com.repair.model.vo.ConsumeVo" resultMap="repairConsumeMap">
+       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted) as artile_name FROM `repair_consume` rc
+        left join repair_admin ra on ra.id = rc.update_user and ra.deleted = 0
+        left join repair_area rae on rae.id = rc.school_id and rae.deleted = 0
+        <where>
+            and rc.deleted = 0
+            <if test="name != null and name != ''">
+                and rc.name like '%' #{name} '%'
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rc.update_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.RepairConsumeVo" id="repairConsumePageMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="content" column="content"/>
+        <result property="price" column="price"/>
+        <result property="articleId" column="article_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="articleName" column="article_name"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="schoolId" column="school_id"/>
+    </resultMap>
+
+    <select id="queryConsumePageList" resultType="com.repair.model.vo.RepairConsumeVo" resultMap="repairConsumePageMap">
+        select rc.school_id,rc.update_time,rc.id,rc.name,rc.content,rc.price,rc.article_id,ra.username as user_name,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id)) as article_name from repair_consume rc
+        left join repair_admin ra on rc.update_user = ra.id and ra.deleted = 0
+        <where>
+            and rc.deleted = 0
+            <if test="name != null and name != ''">
+                and rc.name like '%' #{name} '%'
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rc.update_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+    </select>
+
+
+    <resultMap type="com.repair.model.vo.RepairArticleConsumeVo" id="repairArticleConsumeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="articleId" column="article_id"/>
+        <result property="price" column="price"/>
+    </resultMap>
+
+    <select id="queryArticleConsumes" resultType="com.repair.model.vo.RepairArticleConsumeVo" resultMap="repairArticleConsumeMap">
+        select id,article_id,name,price from repair_consume
+        <where>
+            and deleted =0
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
+            </if>
+            <if test="keyWork != null and keyWork != ''">
+                and name like '%' #{keyWork} '%'
+            </if>
+            <if test="findInSet != null and findInSet != ''">
+                and (${findInSet})
+            </if>
+        </where>
+    </select>
+    <select id="queryArticleConsumesName" resultType="com.repair.model.vo.RepairArticleConsumeVo">
+        select id,article_id,name,price from repair_consume
+        <where>
+        and deleted =0
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        <if test="findInSet != null and findInSet != ''">
+            and (${findInSet})
+        </if>
+        </where>
+    </select>
+</mapper>

target/classes/mapper/repair/RepairDispatchRecordMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairDispatchRecordMapper">
+    <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
+        <result property="userId" column="users_id"/>
+        <result property="cardNumber" column="card_number"/>
+    </resultMap>
+
+    <select id="queryRepairCardNumber" resultType="com.repair.model.vo.RepairCardNumberVo" resultMap="repairCardNumberMap">
+        SELECT ru.card_number,rdr.users_id FROM repair_dispatch_record rdr
+        left join repair_user ru on ru.deleted = 0 and ru.id = rdr.users_id
+        <where>
+            and rdr.deleted = 0 and rdr.is_lose_efficacy = 0
+            <if test="recordId != null and recordId != ''">
+                and rdr.record_id = #{recordId}
+            </if>
+        </where>
+    </select>
+
+
+</mapper>

target/classes/mapper/repair/RepairEvaluateMapper.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairEvaluateMapper">
+
+    <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
+        <result property="id" column="id"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="description" column="description"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="maintenancerName" column="maintenancer_name"/>
+        <result property="star" column="star"/>
+        <result property="content" column="content"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <select id="queryEvaluatePageList" resultType="com.repair.model.vo.EvaluateVo" resultMap="repairEvaluatePageMap">
+        select
+        re.id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
+        from repair_evaluate re
+        left join repair_record rr on rr.id = re.record_id and rr.deleted = 0
+        <where>
+            and re.deleted = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rr.user_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and re.create_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by re.create_time desc
+    </select>
+
+    <resultMap type="com.repair.model.vo.RecordEvaluateVo" id="repairRecordEvaluateMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="maintenancerId" column="maintenancer_id"/>
+    </resultMap>
+    <!--当前时间-24小时-->
+    <select id="queryEvaluateList" resultType="com.repair.model.vo.RecordEvaluateVo" resultMap="repairRecordEvaluateMap">
+        SELECT rr.id,rr.user_id,rr.maintenancer_id FROM repair_record rr
+        where rr.deleted = 0 and rr.maintenance_state = 7 and rr.update_time &lt;= #{dateStr}
+        and NOT EXISTS (select id from repair_evaluate where deleted = 0 and record_id = rr.id)
+    </select>
+</mapper>

target/classes/mapper/repair/RepairLeaveMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairLeaveMessageMapper">
+
+</mapper>

target/classes/mapper/repair/RepairNoticeSettingMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairNoticeSettingMapper">
+
+    <resultMap type="com.repair.model.vo.NoticePageVo" id="repairNoticePageMap">
+        <result property="id" column="id"/>
+        <result property="content" column="content"/>
+        <result property="userName" column="username"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isTop" column="is_top"/>
+    </resultMap>
+
+    <select id="queryNoticePageList" resultType="com.repair.model.vo.NoticePageVo" resultMap="repairNoticePageMap">
+        SELECT rns.id,rns.content,ra.username,rns.update_time,rns.is_top FROM repair_notice_setting rns
+        left join repair_admin ra on ra.id = rns.update_user and ra.deleted = 0
+        <where>
+            and rns.deleted =0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rns.update_time BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by rns.update_time desc
+    </select>
+</mapper>

target/classes/mapper/repair/RepairPayRecordMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairPayRecordMapper">
+    <resultMap type="com.repair.model.pojo.RepairPayRecord" id="repairPayMap">
+        <result property="id" column="id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="payNo" column="pay_no"/>
+        <result property="payPrice" column="pay_price"/>
+        <result property="isSuccess" column="is_success"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+    <select id="queryPaymentData" resultType="com.repair.model.pojo.RepairPayRecord" resultMap="repairPayMap">
+        select rpr.id,rpr.record_id,rpr.user_id,rpr.pay_no,rpr.pay_price,rpr.is_success,rpr.remark from repair_pay_record rpr
+        inner join repair_record rr on rr.deleted = 0 and rr.record_no = #{recordNo} and rr.id = rpr.record_id
+        where rpr.deleted = 0
+    </select>
+    <select id="queryExport" resultType="com.repair.model.vo.QueryExportVo">
+        SELECT row_number() over ( ORDER BY dc.pay_time ) AS id, dc.*
+        FROM
+        (SELECT
+        rpr.create_time AS pay_time,
+        rr.record_no AS record_no,
+        rpr.pay_no AS pay_no,
+        ru.user_name as user_name,
+        rpr.pay_price as pay_price,
+        (SELECT SUM(rrr.refund_price) FROM repair_refund_record rrr WHERE rrr.record_id=rpr.record_id and
+        rrr.is_success=1 and rrr.deleted=0) as refund_total_price
+        FROM
+        `repair_pay_record` rpr
+        LEFT JOIN repair_record rr ON rr.deleted = 0
+        AND rpr.record_id = rr.id
+        LEFT JOIN repair_user ru on rpr.user_id=ru.id and ru.deleted=0
+        where
+        rpr.is_success=1 AND rpr.deleted=0
+        ) dc
+        <where>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+            <if test="keyWord != null and keyWord !='' ">
+                and (dc.user_name like '%' #{keyWord} '%' or dc.record_no like '%' #{keyWord} '%')
+            </if>
+
+        </where>
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairReceivingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairReceivingMapper">
+
+</mapper>

target/classes/mapper/repair/RepairRefundRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairRefundRecordMapper">
+
+</mapper>

target/classes/mapper/repair/RepairSchoolMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairSchoolMapper">
+
+</mapper>

target/classes/mapper/repair/RepairShiftSettingsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairShiftSettingsMapper">
+
+</mapper>

target/classes/mapper/repair/RepairSystemMessagesMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairSystemMessagesMapper">
+    <resultMap type="com.repair.model.vo.SystemMessagePageVo" id="systemMessagePageMap">
+        <result property="id" column="id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="isRead" column="is_read"/>
+        <result property="content" column="content"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="querySystemMessagePage" resultType="com.repair.model.vo.SystemMessagePageVo" resultMap="systemMessagePageMap">
+        select rsm.id,rsm.record_id,rr.record_no,rsm.is_read,rsm.content,rsm.update_time from repair_system_messages rsm
+        left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
+        where rsm.deleted = 0 and rsm.recipient_id = #{userId}
+        order by rsm.update_time desc
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairSystemSettingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairSystemSettingMapper">
+
+</mapper>

target/classes/mapper/repair/RepairTrackRecordMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairTrackRecordMapper">
+    <resultMap type="com.repair.model.vo.TrackDetailsVo" id="detailDatasMap">
+        <result property="id" column="id"/>
+        <result property="maintenanceState" column="maintenance_state"/>
+        <result property="state" column="state"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+    <select id="queryDetailData" resultType="com.repair.model.vo.TrackDetailsVo" resultMap="detailDatasMap">
+        select id,maintenance_state,content as state,create_time from repair_track_record
+        where deleted = 0
+        <if test="recordId != null and recordId != ''">
+            and record_id = #{recordId}
+        </if>
+        order by create_time asc
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairTransferRecordMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairTransferRecordMapper">
+    <resultMap type="com.repair.model.vo.TransferDetailVo" id="repairTransferDetailMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+    <select id="queryTransferDetail" resultType="com.repair.model.vo.TransferDetailVo" resultMap="repairTransferDetailMap">
+        SELECT rtr.id,rtr.voice_length,ru.user_name,rtr.voice,rtr.remark FROM repair_transfer_record rtr
+        left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
+        where rtr.deleted = 0 and rtr.approval_statu = 2 and rtr.record_id = #{recordId}
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairUserMapper.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairUserMapper">
+
+    <resultMap type="com.repair.model.vo.RepairUserVo" id="repairUserPageMap">
+        <result property="id" column="id"/>
+        <result property="cardNumber" column="card_number"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="teamId" column="team_id"/>
+        <result property="teamName" column="team_name"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="userZzid" column="user_zzid"/>
+        <result property="userZzname" column="user_zzname"/>
+        <result property="buildId" column="build_id"/>
+        <result property="buildName" column="build_name"/>
+        <result property="articleId" column="article_id"/>
+        <result property="articleName" column="article_name"/>
+        <result property="workType" column="work_type"/>
+        <result property="workTypeName" column="work_type_name"/>
+        <result property="acceptanceTime" column="acceptance_assess_time"/>
+        <result property="maintenanceTime" column="maintenance_assess_time"/>
+    </resultMap>
+
+    <select id="queryUserPageList" resultType="com.repair.model.vo.RepairUserVo" resultMap="repairUserPageMap">
+        select ru.card_number,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.article_id,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,ru.article_id)) as article_name,ru.user_name, ru.user_phone, ru.team_id, case ru.team_id when 0 then '校方人员' else '第三方人员' end as team_name, ru.school_id,ra.name as school_name,
+        ru.user_zzid,case ru.user_zzid when 3 then '后勤人员' else '维修师傅' end as user_zzname,ru.build_id,(select GROUP_CONCAT(name) from repair_area where find_in_set(id,ru.build_id)) as build_name,ru.work_type,rwt.name as work_type_name from repair_user ru
+        left join repair_area ra on ra.id = ru.school_id and ra.deleted = 0
+        left join repair_work_type rwt on rwt.id = ru.work_type and ra.deleted = 0
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2 or ru.user_zzid = 3)
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = ${schoolId}
+            </if>
+            <if test="teamId != null and teamId != ''">
+                and ru.team_id = ${teamId}
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.RepairLogisticsVo" id="repairLogisticsMap">
+        <result property="id" column="id"/>
+    </resultMap>
+
+    <select id="queryLogisticsList" resultType="com.repair.model.vo.RepairLogisticsVo" resultMap="repairLogisticsMap">
+        select id from repair_user ru
+        where EXISTS (select id from repair_record where deleted = 0 and id = #{recordId} and school_id = ru.school_id)
+        and ru.user_zzid = 3 and ru.deleted = 0
+    </select>
+
+
+    <resultMap type="com.repair.model.vo.UserDataVo" id="userDataMap">
+        <result property="id" column="id"/>
+        <result property="state" column="state"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="startDate" column="start_date"/>
+        <result property="articleId" column="article_id"/>
+        <result property="acceptanceAssessTime" column="acceptance_assess_time"/>
+        <result property="maintenanceAssessTime" column="maintenance_assess_time"/>
+    </resultMap>
+    <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
+        select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
+        left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
+        left join repair_article_type rat on rat.deleted = 0 and ( FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        where ru.id = #{userId} and ru.deleted = 0
+    </select>
+
+    <resultMap type="com.repair.model.vo.CollaboratorVo" id="collaboratorMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="workTypeName" column="work_type_name"/>
+        <result property="state" column="state"/>
+    </resultMap>
+    <select id="queryCollaborator" resultType="com.repair.model.vo.CollaboratorVo" resultMap="collaboratorMap">
+        select ru.id,ru.user_name,ru.user_phone,rwt.name as work_type_name,ru.state
+        from repair_user ru
+        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
+            <if test="userId != null and userId != ''">
+                and ru.id != #{userId}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = #{schoolId}
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.AddressBookVo" id="addressBookMap">
+        <result property="id" column="id"/>
+        <result property="teamId" column="team_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="workType" column="work_type"/>
+        <result property="workTypeName" column="work_type_name"/>
+        <result property="state" column="state"/>
+        <result property="acceptanceTime" column="acceptance_assess_time"/>
+        <result property="maintenanceTime" column="maintenance_assess_time"/>
+    </resultMap>
+    <select id="queryAddressBook" resultType="com.repair.model.vo.AddressBookVo" resultMap="addressBookMap">
+        select ru.team_id,ru.id,ru.user_name,ru.user_phone,ru.work_type,rwt.name as work_type_name,ru.state,ru.state,ru.acceptance_assess_time,ru.maintenance_assess_time
+        from repair_user ru
+        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
+            <if test="userId != null and userId != ''">
+                and ru.id != #{userId}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = #{schoolId}
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserPageBySchoolId" resultType="com.repair.model.vo.AddressBookVo" resultMap="addressBookMap">
+        select ru.team_id,ru.id,ru.user_name,ru.user_phone,ru.work_type,rwt.name as work_type_name,ru.state,ru.state,ru.acceptance_assess_time,ru.maintenance_assess_time
+        from repair_user ru
+        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = #{schoolId}
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.AutoDispatchUserVo" id="AutoDispatchUserMap">
+        <result property="id" column="id"/>
+        <result property="state" column="state"/>
+        <result property="workType" column="work_type"/>
+        <result property="rdrCount" column="rdr_count"/>
+        <result property="buildId" column="build_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="acceptanceTime" column="acceptance_assess_time"/>
+        <result property="maintenanceTime" column="maintenance_assess_time"/>
+        <result property="startDate" column="start_date"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="articleId" column="article_id"/>
+    </resultMap>
+
+    <select id="autoDispatchUser" resultType="com.repair.model.vo.AutoDispatchUserVo" resultMap="AutoDispatchUserMap">
+        select * from (
+        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0 and assigned_time like '%' #{dateNow} '%' and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
+        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and start_date = #{dateNow}
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        <if test="keyWord != null and keyWord != ''">
+            and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
+        </if>
+        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+        order by t.rdr_count
+    </select>
+
+    <!--获取协作下拉人员信息-->
+    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="collaboratorUserMap">
+        <result property="id" column="id"/>
+        <result property="name" column="user_name"/>
+    </resultMap>
+    <select id="queryCollaboratorUser" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="collaboratorUserMap">
+        select ru.id,ru.user_name from repair_user ru
+        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and rcs.shift_id != '' and rcs.start_date = #{dateNow}
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != #{userId}
+    </select>
+
+
+    <resultMap type="com.repair.model.vo.PositiveReviewVo" id="positiveReviewMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="finishCount" column="finish_count"/>
+        <result property="evaluateCount" column="evaluate_count"/>
+    </resultMap>
+    <select id="queryPositiveReviewPage" resultType="com.repair.model.vo.PositiveReviewVo" resultMap="positiveReviewMap">
+        select ru.id,ru.user_name, (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7 and find_in_set(ru.id,maintenancer_id)) as finish_count,
+        (select Count(*) from repair_record rr
+        inner join repair_evaluate re on re.deleted = 0 and re.star > 3 and re.record_id = rr.id
+        where rr.deleted = 0 and rr.maintenance_state = 7 and find_in_set(ru.id,rr.maintenancer_id)) as evaluate_count
+        from repair_user ru
+        where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
+    </select>
+    
+    <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
+        select * from (
+        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
+        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+        order by t.rdr_count
+    </select>
+</mapper>

target/classes/mapper/repair/RepairWorkTypeMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairWorkTypeMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairWorkTypeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryWorkTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairWorkTypeMap">
+       select id,name from repair_work_type where deleted = 0
+    </select>
+</mapper>

target/classes/mapper/repair/WxAccessTokenMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.WxAccessTokenMapper">
+
+</mapper>

target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=repair_system
+groupId=com.repair
+version=0.0.1-SNAPSHOT

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

@@ -0,0 +1,348 @@
+com\repair\AutoCode.class
+com\repair\services\impl\RepairShiftSettingsServiceImpl.class
+com\repair\mapper\RepairPayRecordMapper.class
+com\repair\model\vo\RepairTrendVo.class
+com\repair\common\utils\AesUtils.class
+com\repair\model\vo\AddressBookVo.class
+com\repair\model\vo\ClassesDataVo.class
+com\repair\api\RepairEvaluateControllerAPI.class
+com\repair\common\utils\ExcelExportUtil.class
+com\repair\core\JwtAuthenticationInterceptor.class
+com\repair\model\vo\SystemMessagePageVo.class
+com\repair\services\RepairCollaborateRecordService.class
+com\repair\model\vo\MasterHomepageVo.class
+com\repair\api\LoginControllerAPI.class
+com\repair\mapper\RepairTrackRecordMapper.class
+com\repair\model\enumModel\ePayPageStatu.class
+com\repair\model\vo\TrackDetailsVo.class
+com\repair\api\RepairTransferRecordControllerAPI.class
+com\repair\mapper\RepairEvaluateMapper.class
+com\repair\model\vo\MaintenanceTechnicianVo.class
+com\repair\MybatisPlusApplication.class
+com\repair\model\pojo\RepairCollaborateRecord.class
+com\repair\services\impl\RepairEvaluateServiceImpl.class
+com\repair\services\RepairConsumeService.class
+com\repair\model\pojo\RepairClassesSettings.class
+com\repair\model\pojo\RepairConsume.class
+com\repair\api\RepairArticleTypeControllerAPI.class
+com\repair\model\vo\ConsumableExcelVo.class
+com\repair\model\vo\ReportExportVo.class
+com\repair\model\pojo\RepairConsumables.class
+com\repair\model\vo\shiftSettingVo.class
+com\repair\mapper\RepairAdminMapper.class
+com\repair\mapper\RepairReceivingMapper.class
+com\repair\services\RepairRefundRecordService.class
+com\repair\model\enumModel\eDispatchType.class
+com\repair\model\request\insertRepairClassesRequest.class
+com\repair\common\utils\WeiXiaoUtil.class
+com\repair\model\vo\RepairCardNumberVo.class
+com\repair\model\pojo\RepairPayRecord.class
+com\repair\handler\MyMetaObjectHandler.class
+com\repair\model\enumModel\eIsSuccess.class
+com\repair\model\vo\SystemMenuTreeVo.class
+com\repair\controller\RepairSchoolController.class
+com\repair\services\RepairCloseService.class
+com\repair\api\RepairWorkTypeControllerAPI.class
+com\repair\handle\NonStaticResourceHttpRequestHandler.class
+com\repair\model\vo\AlterPriceShowVo.class
+com\repair\mapper\RepairConsumeMapper.class
+com\repair\model\request\insertRepairConsumeRequest.class
+com\repair\model\vo\ConsumeVo.class
+com\repair\model\vo\PositiveReviewVo.class
+com\repair\services\RepairNoticeSettingService.class
+com\repair\model\request\MobileRevertRequest.class
+com\repair\controller\RepairRecordController.class
+com\repair\api\RepairReceivingControllerAPI.class
+com\repair\model\vo\RepairRecordTimeoutPageVo.class
+com\repair\core\CORSConfiguration.class
+com\repair\services\impl\RepairClassesSettingsServiceImpl.class
+com\repair\services\impl\RepairCollaborateRecordServiceImpl.class
+com\repair\controller\RepairClassesSettingsController.class
+com\repair\common\utils\DateUtils.class
+com\repair\controller\RepairArticleTypeController.class
+com\repair\services\impl\WxAccessTokenServiceImpl.class
+com\repair\api\RepairPayRecordControllerAPI.class
+com\repair\model\result\BaseResult.class
+com\repair\model\request\repairRecordRequest.class
+com\repair\services\impl\RepairSystemMessagesServiceImpl.class
+com\repair\model\vo\ProsperityRepairPayRecordsVo.class
+com\repair\model\result\PageUtils.class
+com\repair\services\impl\RepairNoticeSettingServiceImpl.class
+com\repair\controller\WxAccessTokenController.class
+com\repair\model\vo\pendingOrderVo.class
+com\repair\model\pojo\UnitTimeHelpModel.class
+com\repair\services\impl\RepairDispatchRecordServiceImpl.class
+com\repair\common\utils\WxUtil$1.class
+com\repair\common\utils\UUIDUtils.class
+com\repair\mapper\RepairSchoolMapper.class
+com\repair\model\vo\routeDataVo.class
+com\repair\model\enumModel\eStatu.class
+com\repair\services\RepairWorkTypeService.class
+com\repair\mapper\RepairConsumablesMapper.class
+com\repair\model\enumModel\eIsTop.class
+com\repair\model\enumModel\eUserZZ.class
+com\repair\services\impl\RepairWorkTypeServiceImpl.class
+com\repair\api\RepairClassesSettingsControllerAPI.class
+com\repair\model\vo\RepairClassesVo.class
+com\repair\model\pojo\RepairArea.class
+com\repair\model\vo\NoticePageVo.class
+com\repair\services\impl\RepairReceivingServiceImpl.class
+com\repair\model\request\insertRepairUserRequest.class
+com\repair\model\vo\RepairSchoolVo.class
+com\repair\model\vo\RepairSummarizingVo.class
+com\repair\model\vo\RepairConsumeVo.class
+com\repair\model\result\CommonResult.class
+com\repair\common\exception\EmsException.class
+com\repair\model\request\cooperationOrdersRequest.class
+com\repair\controller\RepairReceivingController.class
+com\repair\controller\RepairEvaluateController.class
+com\repair\services\impl\RepairConsumeServiceImpl.class
+com\repair\model\vo\ClassesSettingVo.class
+com\repair\controller\RepairRefundRecordController.class
+com\repair\model\request\insertRepairAssociationRequest.class
+com\repair\model\vo\RepairRecordPageVo.class
+com\repair\model\request\timeVo.class
+com\repair\controller\RepairConsumablesController.class
+com\repair\services\WxAccessTokenService.class
+com\repair\api\RepairShiftSettingsControllerAPI.class
+com\repair\model\pojo\RepairTransferRecord.class
+com\repair\common\utils\MyX509TrustManager.class
+com\repair\common\utils\ValidateCode.class
+com\repair\model\vo\TransferDetailVo.class
+com\repair\services\RepairDispatchRecordService.class
+com\repair\api\RepairNoticeSettingControllerAPI.class
+com\repair\controller\RepairDispatchRecordController.class
+com\repair\services\RepairClassesSettingsService.class
+com\repair\model\enumModel\eDispatchResult.class
+com\repair\model\pojo\RepairEvaluate.class
+com\repair\services\RepairTrackRecordService.class
+com\repair\model\enumModel\eRecordStatu.class
+com\repair\model\vo\RepairLogisticsVo.class
+com\repair\mapper\RepairDispatchRecordMapper.class
+com\repair\model\pojo\RepairRecord.class
+com\repair\api\RepairSchoolControllerAPI.class
+com\repair\model\pojo\RepairArticleType.class
+com\repair\api\RepairCloseControllerAPI.class
+com\repair\model\pojo\RepairClose.class
+com\repair\common\utils\WeiXiaoUtil$1.class
+com\repair\model\vo\RepairArticleTreeVo.class
+com\repair\common\utils\SeqUtils.class
+com\repair\model\vo\RepairAreaVo.class
+com\repair\services\RepairRecordService.class
+com\repair\controller\RepairConsumeController.class
+com\repair\mapper\RepairLeaveMessageMapper.class
+com\repair\api\RepairCollaborateRecordControllerAPI.class
+com\repair\model\vo\ShiftSettingDataVo.class
+com\repair\model\enumModel\eFileType.class
+com\repair\model\vo\UserScheduleVo.class
+com\repair\model\request\collaborateApplyRequest.class
+com\repair\model\request\WxPayRequest.class
+com\repair\model\pojo\RepairNoticeSetting.class
+com\repair\config\SmsConfig.class
+com\repair\services\RepairPayRecordService.class
+com\repair\common\utils\HttpsClient.class
+com\repair\model\vo\RepairArticleTreeVo$RepairArticleTreeVoBuilder.class
+com\repair\model\vo\RepairWorkTypeVo.class
+com\repair\common\utils\ExcelUtils.class
+com\repair\common\utils\StrUtils.class
+com\repair\services\impl\RepairCloseServiceImpl.class
+com\repair\model\vo\LoginVo.class
+com\repair\model\request\RefundableAmountRequest.class
+com\repair\services\impl\RepairSystemSettingServiceImpl.class
+com\repair\common\result\Code.class
+com\repair\controller\LoginController$2.class
+com\repair\mapper\RepairAreaMapper.class
+com\repair\model\vo\AddressBookListVo.class
+com\repair\mapper\RepairNoticeSettingMapper.class
+com\repair\model\request\UserScheduleRequest.class
+com\repair\services\RepairShiftSettingsService.class
+com\repair\common\utils\JaxbUtil$CollectionWrapper.class
+com\repair\common\utils\WxUtil.class
+com\repair\model\vo\ClassesSettingPageVo.class
+com\repair\controller\RepairAreaController.class
+com\repair\model\vo\RepairTechnicianVo.class
+com\repair\services\impl\RepairArticleTypeServiceImpl.class
+com\repair\model\enumModel\eApprovalStatu.class
+com\repair\api\RepairConsumeControllerAPI.class
+com\repair\controller\RepairCloseController.class
+com\repair\model\pojo\RepairSchool.class
+com\repair\model\vo\MaintenanceWorkerVo.class
+com\repair\common\exception\MyCustomException.class
+com\repair\controller\RepairSystemSettingController.class
+com\repair\model\vo\RepairAreaTreeVo.class
+com\repair\controller\LoginController$1.class
+com\repair\controller\RepairAdminController.class
+com\repair\core\SwaggerConfiguration.class
+com\repair\model\vo\StatisticsVo.class
+com\repair\model\request\transferApplyRequest.class
+com\repair\services\RepairLeaveMessageService.class
+com\repair\mapper\RepairSystemSettingMapper.class
+com\repair\model\result\PayResult.class
+com\repair\model\vo\NoticeVo.class
+com\repair\model\request\loginRequest.class
+com\repair\model\vo\UploadFileVo.class
+com\repair\api\RepairSystemSettingControllerAPI.class
+com\repair\mapper\RepairUserMapper.class
+com\repair\model\pojo\WxAccessToken.class
+com\repair\model\request\updateRepairAreaRequest.class
+com\repair\annotation\PassToken.class
+com\repair\config\MySecurity.class
+com\repair\model\vo\CollaborateDetailVo.class
+com\repair\model\enumModel\eUserStatu.class
+com\repair\api\RepairSystemMessagesControllerAPI.class
+com\repair\model\vo\RepairManageCountVo.class
+com\repair\common\utils\SendSms.class
+com\repair\controller\RepairWorkTypeController.class
+META-INF\spring-configuration-metadata.json
+com\repair\core\CORSConfiguration$1.class
+com\repair\model\pojo\RepairDispatchRecord.class
+com\repair\model\vo\ChangePriceConsumeVo.class
+com\repair\mapper\RepairShiftSettingsMapper.class
+com\repair\model\vo\wxLoginVo.class
+com\repair\controller\RepairPayRecordController.class
+com\repair\api\RepairDispatchRecordControllerAPI.class
+com\repair\mapper\RepairRecordMapper.class
+com\repair\model\request\updateRepairArticleTypeRequest.class
+com\repair\services\impl\RepairSchoolServiceImpl.class
+com\repair\model\request\queryAccountPageRequest.class
+com\repair\common\utils\paramUtils.class
+com\repair\services\impl\RepairRefundRecordServiceImpl.class
+com\repair\services\impl\RepairLeaveMessageServiceImpl.class
+com\repair\model\vo\MaintenanceGoodsVo.class
+com\repair\services\RepairReceivingService.class
+com\repair\api\RepairRecordControllerAPI.class
+com\repair\model\vo\EvaluateVo.class
+com\repair\mapper\RepairClassesSettingsMapper.class
+com\repair\model\request\insertConsumablesRequest.class
+com\repair\model\vo\ConsumablePageVo.class
+com\repair\common\utils\JaxbUtil.class
+com\repair\model\vo\RepairCampusVo.class
+com\repair\common\utils\HttpUtils.class
+com\repair\common\utils\TimeExchange$1.class
+com\repair\model\request\updateRepairAdminRequest.class
+com\repair\model\request\repairPayRequest.class
+com\repair\model\request\updateUserDataRequest.class
+com\repair\model\vo\TeamWorkCountVo.class
+com\repair\controller\RepairCollaborateRecordController.class
+com\repair\controller\RepairLeaveMessageController.class
+com\repair\services\impl\RepairConsumablesServiceImpl.class
+com\repair\model\pojo\RepairWorkType.class
+com\repair\common\utils\CommonUtil.class
+com\repair\model\vo\RecordEvaluateVo.class
+com\repair\model\request\transferRequest.class
+com\repair\common\utils\DelayedUtils$2.class
+com\repair\api\RepairRefundRecordControllerAPI.class
+com\repair\aop\LoginCheckAspect.class
+com\repair\model\vo\WxCodeVo.class
+com\repair\model\pojo\RepairTrackRecord.class
+com\repair\common\utils\EncryptionUtil.class
+com\repair\controller\LoginController.class
+com\repair\model\pojo\RepairUser.class
+com\repair\model\result\EndPay.class
+com\repair\model\result\TongYiReturn.class
+com\repair\common\utils\MimeTypeUtils.class
+com\repair\model\vo\ChangeConsumesVo.class
+com\repair\model\vo\CollaborateDataVo.class
+com\repair\mapper\RepairArticleTypeMapper.class
+com\repair\services\impl\RepairRecordServiceImpl.class
+com\repair\model\pojo\RepairLeaveMessage.class
+com\repair\model\vo\RepairArticleTypeTreeVo.class
+com\repair\model\vo\CollaboratorVo.class
+com\repair\model\pojo\RepairSystemMessages.class
+com\repair\common\utils\DelayedUtils$1.class
+com\repair\mapper\RepairSystemMessagesMapper.class
+com\repair\model\vo\RepairArticleTypeTreeVo$RepairArticleTypeTreeVoBuilder.class
+com\repair\controller\RepairTrackRecordController.class
+com\repair\model\vo\RepairArticleChildVo.class
+com\repair\services\RepairSystemMessagesService.class
+com\repair\api\RepairConsumablesControllerAPI.class
+com\repair\mapper\RepairCloseMapper.class
+com\repair\model\vo\AutoDispatchUserVo.class
+com\repair\model\vo\RepairArticleConsumeVo.class
+com\repair\config\WxOpenidConfig.class
+com\repair\common\utils\TimeExchange.class
+com\repair\controller\RepairTransferRecordController.class
+com\repair\model\vo\DetailsVo.class
+com\repair\model\enumModel\eTechnicianStatu.class
+com\repair\services\RepairArticleTypeService.class
+com\repair\model\enumModel\eIsSuper.class
+com\repair\api\RepairAreaControllerAPI.class
+com\repair\model\request\updateRepairClassesRequest.class
+com\repair\common\utils\JWTUtil.class
+com\repair\services\RepairUserService.class
+com\repair\model\request\transferOrderRequest.class
+com\repair\model\pojo\RepairRefundRecord.class
+com\repair\model\vo\SystemMenuTreeVo$SystemMenuTreeVoBuilder.class
+com\repair\controller\RepairNoticeSettingController.class
+com\repair\controller\RepairSystemMessagesController.class
+com\repair\model\enumModel\eWeekStatu.class
+com\repair\services\impl\RepairTransferRecordServiceImpl.class
+com\repair\services\RepairSystemSettingService.class
+com\repair\model\pojo\RepairSystemSetting.class
+com\repair\mapper\WxAccessTokenMapper.class
+com\repair\model\vo\ClassSettingDateVo.class
+com\repair\model\vo\ClassesSettingPageDataVo.class
+com\repair\api\RepairLeaveMessageControllerAPI.class
+com\repair\api\RepairUserControllerAPI.class
+com\repair\config\MyBatisPlusConfig.class
+com\repair\mapper\RepairWorkTypeMapper.class
+com\repair\model\request\repairLeaveMessageRequest.class
+com\repair\services\impl\RepairAreaServiceImpl.class
+com\repair\services\impl\RepairPayRecordServiceImpl.class
+com\repair\model\request\updateRepairShiftRequest.class
+com\repair\model\vo\UserDataVo.class
+com\repair\model\vo\QueryExportVo.class
+com\repair\services\RepairEvaluateService.class
+com\repair\controller\MaintenanceConsumeablesRequest.class
+com\repair\model\request\AlterPriceRequest.class
+com\repair\model\pojo\RepairShiftSettings.class
+com\repair\model\vo\RepairRecordCountVo.class
+com\repair\services\RepairTransferRecordService.class
+com\repair\common\utils\WxConstants.class
+com\repair\model\request\DelayedRequest.class
+com\repair\model\request\freezeRepairAdminRequest.class
+com\repair\model\request\updateAddressBookRequest.class
+com\repair\core\JwtlnterceptorConfig.class
+com\repair\model\result\WechatUnifiedOrder.class
+com\repair\services\impl\RepairAdminServiceImpl.class
+com\repair\model\vo\RepairAnalysisVo.class
+com\repair\model\vo\RepairUserVo.class
+com\repair\model\vo\SystemMenuVo.class
+com\repair\mapper\RepairTransferRecordMapper.class
+com\repair\common\utils\smsUtil.class
+com\repair\annotation\UserLoginCheck.class
+com\repair\common\utils\DelayedUtils.class
+com\repair\controller\RepairUserController.class
+com\repair\model\request\updateRepairConsumeRequest.class
+com\repair\controller\RepairShiftSettingsController.class
+com\repair\api\RepairTrackRecordControllerAPI.class
+com\repair\common\utils\SHA1.class
+com\repair\api\RepairAdminControllerAPI.class
+com\repair\services\RepairAdminService.class
+com\repair\model\vo\MyRepairRecordVo.class
+com\repair\services\RepairSchoolService.class
+com\repair\annotation\ControllerIsShow.class
+com\repair\common\utils\RSAUtils.class
+com\repair\model\vo\SystemMenuVo$SystemMenuVoBuilder.class
+com\repair\common\exception\EmsExceptionHandler.class
+com\repair\services\RepairAreaService.class
+com\repair\model\vo\RepairAreaTreeVo$RepairAreaTreeVoBuilder.class
+com\repair\model\request\RevertRequest.class
+com\repair\model\request\finishOrderRequest.class
+com\repair\model\vo\WxOpenVo.class
+com\repair\services\impl\RepairUserServiceImpl.class
+com\repair\common\result\ResponseStatusEnum.class
+com\repair\services\impl\RepairTrackRecordServiceImpl.class
+com\repair\mapper\RepairCollaborateRecordMapper.class
+com\repair\model\request\ReceiveSendOrdersRequest.class
+com\repair\common\utils\DictionaryCompare.class
+com\repair\model\pojo\RepairAdmin.class
+com\repair\mapper\RepairRefundRecordMapper.class
+com\repair\model\request\insertRepairShiftSettingRequest.class
+com\repair\services\RepairConsumablesService.class
+com\repair\model\request\changePasswordRequest.class
+com\repair\model\enumModel\ePayStatu.class
+com\repair\model\enumModel\eSchool.class
+com\repair\model\vo\CollaborateRecordVo.class
+com\repair\model\pojo\RepairReceiving.class
+com\repair\model\result\Wx_user.class

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

@@ -0,0 +1,333 @@
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairEvaluateController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eFileType.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairPayRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCollaborateRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairWorkTypeMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairWorkType.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ChangePriceConsumeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRefundRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eSchool.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxConstants.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArea.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\aop\LoginCheckAspect.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemSetting.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\WxAccessTokenController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SendSms.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairReceivingController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\PageUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ChangeConsumesVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTrackRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairCollaborateRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairNoticeSettingController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eRecordStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MyRepairRecordVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemMessagesControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairArticleTypeMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\MybatisPlusApplication.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\WxOpenidConfig.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumablesControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\smsUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\CommonUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairConsumeRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairDispatchRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\changePasswordRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateRecordVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairConsumeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairWorkTypeServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairNoticeSettingControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumeControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SHA1.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairWorkTypeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\ePayPageStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\PayResult.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMessagePageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAreaService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairArticleTypeRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemMessagesMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTrackRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassSettingDateVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairCardNumberVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\UnitTimeHelpModel.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\PassToken.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\JWTUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\AesUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairDispatchRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRefundRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumablesMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairUserControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairLeaveMessageService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\EvaluateVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ShiftSettingDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairWorkTypeController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairConsumeRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertConsumablesRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\WxAccessTokenServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairNoticeSettingService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\SmsConfig.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsSuccess.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleConsumeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairLogisticsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairUserController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WeiXiaoUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\TransferDetailVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemSettingService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairPayRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairLeaveMessage.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\Code.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\shiftSettingVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\ControllerIsShow.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairLeaveMessageController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\wxLoginVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemSettingServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\WxCodeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairShiftSettingsServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\PositiveReviewVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AlterPriceShowVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\WxPayRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AddressBookVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\DetailsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\JaxbUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\pendingOrderVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumablePageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\DelayedRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumablesController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\ResponseStatusEnum.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MaintenanceTechnicianVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRefundRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairLeaveMessageRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairReceivingMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemSettingControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArticleType.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairSummarizingVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumablesService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MimeTypeUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\ePayStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\StatisticsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eTechnicianStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairReceiving.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAreaControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\ReceiveSendOrdersRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\EndPay.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\WxAccessTokenService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSchoolControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSchoolController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RecordEvaluateVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AddressBookListVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAdminService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairPayRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairClassesSettingsService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairUser.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\EncryptionUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferApplyRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairShiftSettingsControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCollaborateRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DictionaryCompare.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairArticleTypeServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairArticleTypeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ReportExportVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairShiftSettingRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTransferRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairShiftSettings.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateAddressBookRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsumables.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\StrUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairDispatchRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemMessages.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRefundRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSchoolMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairWorkTypeControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\LoginController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairNoticeSettingMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairEvaluateControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumeMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairClassesSettingsMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eApprovalStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairEvaluateMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAnalysisVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairRecordRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTrackRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairReceivingControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumeServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MasterHomepageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTransferRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaTreeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UploadFileVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MaintenanceWorkerVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\WxAccessToken.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AutoDispatchUserVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemMessagesService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuTreeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemMessagesServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eDispatchResult.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsSuper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairUserRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRefundRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairClassesRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClassesSettings.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairNoticeSettingServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\UUIDUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\CommonResult.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairClassesRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTrackRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserScheduleVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eWeekStatu.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairManageCountVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSchool.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\timeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumablesServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAdminRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\LoginControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsume.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairUserVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelExportUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairPayRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DateUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCollaborateRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\cooperationOrdersRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\collaborateApplyRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCloseMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\routeDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MySecurity.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairShiftSettingsMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairNoticeSetting.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAdminController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAreaServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\TongYiReturn.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairSchoolVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SeqUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\paramUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\HttpsClient.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleChildVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ProsperityRepairPayRecordsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\UserLoginCheck.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaboratorVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ValidateCode.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handle\NonStaticResourceHttpRequestHandler.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairClassesVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MyX509TrustManager.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairDispatchRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairReceivingService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTrackRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\AutoCode.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSchoolService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\CORSConfiguration.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCloseControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferOrderRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSchoolServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairArticleTypeControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClose.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairAssociationRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsException.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCollaborateRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MaintenanceGoodsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTrackRecordControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairEvaluate.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairShiftSettingsService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\AlterPriceRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumeController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageDataVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAreaController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairAdmin.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\RSAUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\MyCustomException.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairUserMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairUserServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\LoginVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairTrendVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairTechnicianVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairArticleTypeController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtlnterceptorConfig.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\TimeExchange.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairUserService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsExceptionHandler.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\SwaggerConfiguration.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumableExcelVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairClassesSettingsController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\finishOrderRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsTop.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAdminMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\loginRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\Wx_user.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairReceivingServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handler\MyMetaObjectHandler.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\TeamWorkCountVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DelayedUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserZZ.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAreaMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairEvaluateService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MyBatisPlusConfig.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eDispatchType.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairClassesSettingsControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairLeaveMessageMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairShiftRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairCampusVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemMessagesController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTransferRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTransferRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordCountVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairLeaveMessageControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairWorkTypeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RefundableAmountRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAreaRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordPageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairClassesSettingsServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordTimeoutPageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCloseController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTransferRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairShiftSettingsController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\QueryExportVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCloseServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateDetailVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairPayRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRecord.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateUserDataRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemSettingMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\WxOpenVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemSettingController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RevertRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\UserScheduleRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAdminServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairDispatchRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTypeTreeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCollaborateRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\WxAccessTokenMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAdminControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\queryAccountPageRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\WechatUnifiedOrder.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairPayRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairPayRecordMapper.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTreeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCloseService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\TrackDetailsVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\HttpUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtAuthenticationInterceptor.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTransferRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\MobileRevertRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\freezeRepairAdminRequest.java

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1,2 @@
+com\repair\MybatisPlusApplicationTests.class
+com\repair\WrapperTest.class

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\WrapperTest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\MybatisPlusApplicationTests.java