测试接口

.idea/workspace.xml

@@ -2,8 +2,25 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/MobileRevertRequest.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/controller/RepairLeaveMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.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$/target/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.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/mapper/RepairUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.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/RepairUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.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/RepairUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -19,11 +36,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <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="476">
-              <caret line="1338" column="60" selection-start-line="1338" selection-start-column="60" selection-end-line="1338" selection-end-column="60" />
+            <state relative-caret-position="545">
+              <caret line="459" column="60" selection-start-line="459" selection-start-column="45" selection-end-line="459" selection-end-column="60" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -31,41 +48,82 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="269">
+              <caret line="110" column="18" selection-start-line="110" selection-start-column="18" selection-end-line="110" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="334">
-              <caret line="67" column="137" selection-start-line="67" selection-start-column="137" selection-end-line="67" selection-end-column="137" />
+            <state relative-caret-position="161">
+              <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="186" column="32" selection-start-line="186" selection-start-column="16" selection-end-line="186" selection-end-column="32" />
-              <folding>
-                <element signature="e#2405#2409#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="230">
+              <caret line="10" column="18" lean-forward="true" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="598">
+              <caret line="33" column="71" selection-start-line="33" selection-start-column="71" selection-end-line="33" selection-end-column="71" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="700">
+              <caret line="50" column="166" selection-start-line="50" selection-start-column="166" selection-end-line="50" selection-end-column="166" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+            <state relative-caret-position="42">
+              <caret line="91" column="17" lean-forward="true" selection-start-line="91" selection-start-column="17" selection-end-line="91" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="62">
+              <caret line="257" column="31" selection-start-line="257" selection-start-column="16" selection-end-line="257" selection-end-column="31" />
+              <folding>
+                <element signature="e#2405#2409#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.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="16">
-              <caret line="57" column="62" selection-start-line="57" selection-start-column="62" selection-end-line="57" selection-end-column="62" />
+            <state relative-caret-position="617">
+              <caret line="155" column="68" lean-forward="true" selection-start-line="155" selection-start-column="68" selection-end-line="155" selection-end-column="68" />
             </state>
           </provider>
         </entry>
@@ -82,36 +140,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>autoDispatchUser</find>
-      <find>repairShiftSettingsService.getRepairsShiftIdByHour</find>
-      <find>非工作时间的最小时间不能小于起止时间的开始时间</find>
-      <find>InsertRepairRecord</find>
-      <find>receiveOrders</find>
-      <find>queryPendingOrder</find>
-      <find>delete</find>
-      <find>insertMaintenanceConsumables</find>
-      <find>repairChangeConsumes</find>
-      <find>up</find>
       <find>insertConsumableBatch</find>
       <find>queryRepairTechnicianCount</find>
       <find>getTechnicianCountByUserId</find>
       <find>queryChangePriceConsumables</find>
       <find>queryTimeout</find>
       <find>queryManagePage</find>
-      <find>queryNotTimeout</find>
       <find>queryTeamWorkCount</find>
       <find>queryTeamWorkPending</find>
       <find>queryLogisticsList</find>
       <find>revokeRepairRecordById</find>
       <find>Login</find>
-      <find>transferToLogistics</find>
       <find>revert</find>
-      <find>抢单</find>
       <find>queryTeamWorkPage</find>
       <find>queryTeamWorkExamine</find>
       <find>queryManageCount</find>
       <find>insertRepairAdmin</find>
       <find>回复</find>
+      <find>queryTeamWorkFinished</find>
+      <find>queryTeamWorkfI</find>
+      <find>wxAccessTokenService</find>
+      <find>transferToLogistics</find>
+      <find>抢单</find>
+      <find>派单</find>
+      <find>添加</find>
+      <find>获取派单</find>
+      <find>receiveSendOrders</find>
+      <find>queryPageRepairUsers</find>
+      <find>autoDispatchUser</find>
+      <find>and (rr.maintenance_state</find>
+      <find>queryNotTimeout</find>
     </findStrings>
     <replaceStrings>
       <replace>Consume</replace>
@@ -152,19 +210,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaboratorVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/teamWorkCountVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java" />
@@ -173,8 +223,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" />
         <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/mapper/RepairUserMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
@@ -191,18 +239,28 @@
         <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/controller/RepairConsumablesController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/MobileRevertRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <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/common/utils/WeiXiaoUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
       </list>
     </option>
   </component>
@@ -235,10 +293,10 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="974" />
-    <option name="height" value="1039" />
+    <option name="x" value="-73" />
+    <option name="y" value="416" />
+    <option name="width" value="1936" />
+    <option name="height" value="1048" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -508,24 +566,24 @@
     <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\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
-    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.repair.model.vo" />
       <recent name="com.repair.model.request" />
+      <recent name="com.repair.model.vo" />
       <recent name="com.repair.api" />
       <recent name="com.repair.model.enumModel" />
       <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\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -648,12 +706,12 @@
       <workItem from="1690247776483" duration="78760000" />
       <workItem from="1690506045062" duration="61277000" />
       <workItem from="1690850680543" duration="167784000" />
-      <workItem from="1691462847133" duration="26006000" />
+      <workItem from="1691462847133" duration="33729000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="618368000" />
+    <option name="totallyTimeSpent" value="626091000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -668,7 +726,7 @@
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16151386" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18230277" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -679,8 +737,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.42231947" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.38121548" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.50875276" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.46498907" />
       <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" />
@@ -781,12 +839,6 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>78</line>
-          <properties />
-          <option name="timeStamp" value="230" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
           <line>203</line>
           <properties />
           <option name="timeStamp" value="232" />
@@ -803,6 +855,12 @@
           <properties />
           <option name="timeStamp" value="242" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java</url>
+          <line>87</line>
+          <properties />
+          <option name="timeStamp" value="243" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -811,385 +869,384 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="617">
-          <caret line="84" column="33" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesSettingPageDataVo.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.3/spring-core-5.3.3.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="148">
-          <caret line="32" column="30" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="32" selection-end-column="30" />
+        <state relative-caret-position="292">
+          <caret line="102" selection-start-line="102" selection-end-line="102" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        <state relative-caret-position="681">
+          <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="248" column="5" selection-start-line="248" selection-start-column="5" selection-end-line="248" selection-end-column="5" />
+        <state relative-caret-position="61">
+          <caret line="25" column="29" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="29" />
+          <folding>
+            <element signature="e#487#488#0" expanded="true" />
+            <element signature="e#540#541#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="53" selection-start-line="53" selection-end-line="53" />
+        <state relative-caret-position="138">
+          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangePriceConsumeVo.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="125">
-          <caret line="14" column="33" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="33" />
+        <state relative-caret-position="404">
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/CORSConfiguration.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="115">
-          <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="263">
+          <caret line="101" column="40" selection-start-line="101" selection-start-column="40" selection-end-line="101" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="51" column="9" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="9" />
+        <state relative-caret-position="149">
+          <caret line="640" column="51" lean-forward="true" selection-start-line="640" selection-start-column="51" selection-end-line="640" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" 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="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.3/spring-webmvc-5.3.3.jar!/org/springframework/web/servlet/DispatcherServlet.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="553" selection-start-line="553" selection-end-line="553" />
+        <state relative-caret-position="532">
+          <caret line="327" selection-start-line="327" selection-end-line="327" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/SwaggerConfiguration.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <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="202">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumablesMapper.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="414">
-          <caret line="27" column="47" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="22" column="7" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="7" />
+          <caret line="30" column="30" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="30" />
         </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/TeamWorkCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="690">
+          <caret line="36" column="30" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.3/spring-aop-5.3.3.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="69" selection-start-line="69" selection-end-line="69" />
+        <state relative-caret-position="598">
+          <caret line="33" column="36" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.3/spring-aop-5.3.3.jar!/org/springframework/aop/framework/CglibAopProxy.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="445" selection-start-line="445" selection-end-line="445" />
+        <state relative-caret-position="19">
+          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairLeaveMessageRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="433">
+          <caret line="22" column="28" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.3/spring-core-5.3.3.jar!/org/springframework/cglib/proxy/MethodProxy.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="102" selection-start-line="102" selection-end-line="102" />
+        <state relative-caret-position="276">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="681">
-          <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
+        <state relative-caret-position="437">
+          <caret line="28" column="22" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="61">
-          <caret line="25" column="29" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="29" />
-          <folding>
-            <element signature="e#487#488#0" expanded="true" />
-            <element signature="e#540#541#0" expanded="true" />
-          </folding>
+        <state>
+          <caret column="23" lean-forward="true" selection-start-column="23" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        <state relative-caret-position="295">
+          <caret line="76" column="20" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
         </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/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="37" selection-start-line="37" selection-end-line="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-257">
+          <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state relative-caret-position="16">
+          <caret line="57" column="62" selection-start-line="57" selection-start-column="62" selection-end-line="57" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
+    <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="509">
-          <caret line="48" column="44" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="44" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="177">
+          <caret line="278" column="11" selection-start-line="278" selection-start-column="8" selection-end-line="278" selection-end-column="11" />
         </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/model/request/RevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="101" column="40" selection-start-line="101" selection-start-column="40" selection-end-line="101" selection-end-column="40" />
+        <state relative-caret-position="253">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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="149">
-          <caret line="640" column="51" lean-forward="true" selection-start-line="640" selection-start-column="51" selection-end-line="640" selection-end-column="51" />
+        <state relative-caret-position="295">
+          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.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="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="210" column="63" selection-start-line="210" selection-start-column="41" selection-end-line="210" selection-end-column="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.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="532">
-          <caret line="327" selection-start-line="327" selection-end-line="327" />
+        <state relative-caret-position="541">
+          <caret line="66" column="56" selection-start-line="66" selection-start-column="34" selection-end-line="66" selection-end-column="56" />
         </state>
       </provider>
     </entry>
     <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="269">
-          <caret line="37" column="216" selection-start-line="37" selection-start-column="216" selection-end-line="37" selection-end-column="216" />
+        <state relative-caret-position="578">
+          <caret line="51" column="121" lean-forward="true" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="121" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/WxAccessTokenServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="299">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/WxAccessTokenMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="135" column="64" lean-forward="true" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="64" />
+        <state relative-caret-position="276">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/WxAccessTokenService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="30" column="30" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="30" />
+        <state relative-caret-position="276">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WeiXiaoUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="36" column="30" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="30" />
+        <state relative-caret-position="517">
+          <caret line="48" column="64" lean-forward="true" selection-start-line="48" selection-start-column="64" selection-end-line="48" selection-end-column="64" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.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="598">
-          <caret line="33" column="36" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="36" />
+        <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/pojo/RepairLeaveMessage.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="19">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+        <state relative-caret-position="253">
+          <caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairLeaveMessageRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/MobileRevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="433">
-          <caret line="22" column="28" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="28" />
+        <state relative-caret-position="253">
+          <caret line="13" column="28" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="48" column="34" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="34" />
+        <state relative-caret-position="655">
+          <caret line="52" column="72" selection-start-line="52" selection-start-column="72" selection-end-line="52" selection-end-column="72" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="30" column="16" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="16" />
+        <state relative-caret-position="161">
+          <caret line="13" column="38" lean-forward="true" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
         </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/request/ReceiveSendOrdersRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="614">
-          <caret line="141" column="12" selection-start-line="141" selection-start-column="12" selection-end-line="141" selection-end-column="12" />
+        <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/LoginVo.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="276">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state relative-caret-position="2155">
+          <caret line="103" column="34" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="946">
-          <caret line="108" column="9" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
+        <state relative-caret-position="411">
+          <caret line="38" column="37" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="28" column="22" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="22" />
+        <state relative-caret-position="-230">
+          <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/api/RepairAdminControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="23" lean-forward="true" selection-start-column="23" selection-end-column="23" />
+        <state relative-caret-position="476">
+          <caret line="198" column="75" selection-start-line="198" selection-start-column="59" selection-end-line="198" selection-end-column="75" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="700">
+          <caret line="50" column="166" selection-start-line="50" selection-start-column="166" selection-end-line="50" selection-end-column="166" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.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="295">
-          <caret line="76" column="20" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+        <state relative-caret-position="598">
+          <caret line="33" column="71" selection-start-line="33" selection-start-column="71" selection-end-line="33" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.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="-257">
-          <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
+        <state relative-caret-position="617">
+          <caret line="155" column="68" lean-forward="true" selection-start-line="155" selection-start-column="68" selection-end-line="155" selection-end-column="68" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="334">
-          <caret line="67" column="137" selection-start-line="67" selection-start-column="137" selection-end-line="67" selection-end-column="137" />
+        <state relative-caret-position="42">
+          <caret line="91" column="17" lean-forward="true" selection-start-line="91" selection-start-column="17" selection-end-line="91" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="186" column="32" selection-start-line="186" selection-start-column="16" selection-end-line="186" selection-end-column="32" />
+        <state relative-caret-position="62">
+          <caret line="257" column="31" selection-start-line="257" selection-start-column="16" selection-end-line="257" selection-end-column="31" />
           <folding>
             <element signature="e#2405#2409#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+        <state relative-caret-position="161">
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
+    <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/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="57" column="62" selection-start-line="57" selection-start-column="62" selection-end-line="57" selection-end-column="62" />
+        <state relative-caret-position="230">
+          <caret line="10" column="18" lean-forward="true" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <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="476">
-          <caret line="1338" column="60" selection-start-line="1338" selection-start-column="60" selection-end-line="1338" selection-end-column="60" />
+        <state relative-caret-position="545">
+          <caret line="459" column="60" selection-start-line="459" selection-start-column="45" selection-end-line="459" selection-end-column="60" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="110" column="18" selection-start-line="110" selection-start-column="18" selection-end-line="110" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -99,12 +99,10 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "根据校区ID获取团队工单报修分页数据", notes = "根据校区ID获取团队工单报修分页数据", httpMethod = "GET")
     CommonResult queryTeamWorkPage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int state, @RequestParam int schoolId);
 
-
     @PostMapping(value = "/receiveSendOrders")
     @ApiOperation(value = "派单", notes = "派单", httpMethod = "POST")
     CommonResult receiveSendOrders(@RequestBody ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception;
 
-
     @GetMapping(value = "/dropDown")
     @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
     CommonResult dropDown() throws Exception;
@@ -113,7 +111,6 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "协作审核", notes = "协作审核", httpMethod = "POST")
     CommonResult cooperationOrders(@RequestBody cooperationOrdersRequest cor, BindingResult bindingResult) throws Exception;
 
-
     @GetMapping(value = "/details")
     @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")
     CommonResult details(@RequestParam int recordId) throws Exception;
@@ -130,17 +127,14 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "改价物品种类下拉框", notes = "改价物品种类下拉框", httpMethod = "GET")
     CommonResult alterPriceGoodsType(@RequestParam int schoolId) throws Exception;
 
-
     @GetMapping(value = "/alterPriceGoodsName")
     @ApiOperation(value = "改价耗材名称下拉框", notes = "改价耗材名称下拉框", httpMethod = "GET")
     CommonResult alterPriceGoodsName(@RequestParam int schoolId, int articleId) throws Exception;
 
-
     @PostMapping(value = "/alterPrice")
     @ApiOperation(value = "改价", notes = "改价", httpMethod = "POST")
     CommonResult alterPrice(@RequestBody AlterPriceRequest apr, BindingResult bindingResult) throws Exception;
 
-
     @PostMapping(value = "/delayed")
     @ApiOperation(value = "延时", notes = "延时", httpMethod = "POST")
     CommonResult delayed(@RequestBody DelayedRequest dr, BindingResult bindingResult) throws Exception;
@@ -149,5 +143,7 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "回复", notes = "回复", httpMethod = "POST")
     CommonResult revert(@RequestBody RevertRequest rr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
-
+    @PostMapping(value = "/mobileReply")
+    @ApiOperation(value = "移动端回复", notes = "移动端回复", httpMethod = "POST")
+    CommonResult mobileReply(@RequestBody MobileRevertRequest mrr, BindingResult bindingResult) throws Exception;
 }

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

@@ -108,6 +108,7 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             return CommonResult.fail("该报修区域缺少后勤人员");
         }
 
+        //有可能有多个后勤
         List<RepairLeaveMessage> datas = new ArrayList<>();
         for (RepairLogisticsVo u : users) {
             RepairLeaveMessage data = new RepairLeaveMessage();

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

@@ -769,10 +769,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail(st);
         }
 
-//        维修人id
+        //维修人id
         Integer userId = rsor.getUserId();
         RepairUser repairUser = repairUserService.getById(userId);
-//          维修订单id
+        //维修订单id
         Integer recordId = rsor.getRecordId();
         RepairRecord repairRecord = repairRecordService.getById(recordId);
 
@@ -781,10 +781,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         repairRecord.setMaintenancerName(repairUser.getUserName());
         repairRecord.setMaintenancerPhone(repairUser.getUserPhone());
 
-//        修改维修订单
+        //修改维修订单
         boolean update = repairRecordService.updateById(repairRecord);
 
-//        添加派单记录
+        //添加派单记录
         RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
         repairDispatchRecord.setRecordId(recordId);
         repairDispatchRecord.setUsersId(userId);
@@ -801,7 +801,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         repairTrackRecord.setContent("派单");
         boolean save1 = repairTrackRecordService.save(repairTrackRecord);
 
-
         if (update || save || save1) {
             return CommonResult.ok("派单成功");
         }
@@ -1335,7 +1334,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             Integer senderId = 0;//超级管理员用ID为0
             if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
                 RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
-                if(user == null){
+                if (user == null) {
                     return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行回复！");
                 }
                 senderId = user.getId();
@@ -1393,6 +1392,62 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
+    public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        try {
+            RepairRecord data = repairRecordService.getRepairById(mrr.getRecordId());
+            if (data == null) {
+                return CommonResult.fail("报修单已失效，无法进行回复");
+            }
+
+            if (data.getMaintenanceState() != eRecordStatu.ToLogistics.getValue()) {
+                return CommonResult.fail("待处理维修单才能进行回复操作");
+            }
+
+            //接收人
+            Integer recipientId = data.getUserId();
+
+            //将工单数据状态改为待确认
+            data.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
+            int result = repairRecordService.updateRepairRecord(data);
+            if (result <= 0) {
+                throw new Exception("回复失败！");
+            }
+
+
+            RepairLeaveMessage repairLeaveMessage = new RepairLeaveMessage();
+            repairLeaveMessage.setRecordId(data.getId());
+            repairLeaveMessage.setRecipientId(recipientId);
+            repairLeaveMessage.setSenderId(mrr.getUserId());
+            repairLeaveMessage.setContent(mrr.getContent());
+
+            boolean mSave = repairLeaveMessageService.save(repairLeaveMessage);
+
+            if (!mSave) {
+                throw new Exception("回复失败！");
+            }
+
+            //        追踪记录表
+            RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+            repairTrackRecord.setRecordId(data.getId());
+            repairTrackRecord.setContent("回复");
+            boolean save = repairTrackRecordService.save(repairTrackRecord);
+
+            if (!save) {
+                throw new Exception("回复失败！");
+            }
+        } catch (Exception e) {
+            throw new Exception("回复失败！");
+        }
+
+        return CommonResult.ok("回复成功");
+    }
+
+    @Override
     public CommonResult closeOrders(int recordId, String userId, String reason) {
 
         //获取订单
@@ -1609,8 +1664,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * 待接单  2
      * 维修中  3
      * 已完成  4
-     * 已超时  5
-     * 已关单  6
+     * 待处理  5
+     * 已超时  6
+     * 已关单  7
      */
     @Override
     public CommonResult queryTeamWorkPage(int currentPage, int pageCount, int state, int schoolId) {
@@ -1630,9 +1686,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 result = repairRecordService.queryTeamWorkFinished(currentPage, pageCount, schoolId);
                 break;
             case 5:
-                result = repairRecordService.queryTeamWorkTimeout(currentPage, pageCount, schoolId, dateNow);
+                result = repairRecordService.queryTeamWorkLogistics(currentPage, pageCount, schoolId);
                 break;
             case 6:
+                result = repairRecordService.queryTeamWorkTimeout(currentPage, pageCount, schoolId, dateNow);
+                break;
+            case 7:
                 result = repairRecordService.queryTeamWorkClosed(currentPage, pageCount, schoolId);
                 break;
             default:

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

@@ -11,10 +11,7 @@ import com.repair.model.request.updateAddressBookRequest;
 import com.repair.model.request.updateUserDataRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
-import com.repair.model.vo.AddressBookListVo;
-import com.repair.model.vo.AddressBookVo;
-import com.repair.model.vo.CollaboratorVo;
-import com.repair.model.vo.RepairUserVo;
+import com.repair.model.vo.*;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairUserService;
 import org.apache.commons.lang3.StringUtils;
@@ -23,8 +20,10 @@ import org.springframework.validation.BindingResult;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -189,13 +188,15 @@ public class RepairUserController implements RepairUserControllerAPI {
 
     @Override
     public CommonResult queryPageRepairUsers(int currentPage, int pageCount, Integer recordId, String keyWord) {
+
         RepairRecord rr = repairRecordService.getRepairById(recordId);
 
-        if(rr == null){
+        if (rr == null) {
             return CommonResult.fail("维修单无效，获取维修师傅数据失败");
         }
 
-
+        String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        List<AutoDispatchUserVo> users = repairUserService.autoDispatchUser(recordId, dateNow, rr.getArticleId(), rr.getBuildId());
 
         return null;
     }

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

@@ -49,6 +49,8 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<RepairTechnicianVo> queryTeamWorkFinished(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId);
 
+    IPage<RepairTechnicianVo> queryTeamWorkLogistics(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId);
+
     IPage<RepairTechnicianVo> queryTeamWorkTimeout(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow);
 
     IPage<RepairTechnicianVo> queryTeamWorkClosed(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId);

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

@@ -29,5 +29,7 @@ public interface RepairUserMapper extends BaseMapper<RepairUser> {
 
     List<AddressBookVo> queryAddressBook(@Param("userId") Integer userId, @Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord);
 
-    List<AutoDispatchUserVo> autoDispatchUser(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId,@Param("buildId") Integer buildId);
+    List<AutoDispatchUserVo> autoDispatchUser(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId, @Param("buildId") Integer buildId);
+
+    IPage<AutoDispatchUserVo> autoDispatchUser(IPage<AutoDispatchUserVo> page, @Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId, @Param("buildId") Integer buildId, @Param("keyWord") String keyWord);
 }

src/main/java/com/repair/model/request/MobileRevertRequest.java

@@ -0,0 +1,27 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class MobileRevertRequest {
+
+    /**
+     * 维修数据ID
+     */
+    @NotNull(message = "维修数据ID不能为空")
+    private Integer recordId;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空")
+    private Integer userId;
+
+    /**
+     * 内容
+     */
+    @NotNull(message = "留言内容不能为空")
+    private String content;
+}

src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java

@@ -1,6 +1,5 @@
 package com.repair.model.request;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

src/main/java/com/repair/model/request/RevertRequest.java

@@ -7,9 +7,15 @@ import javax.validation.constraints.NotNull;
 @Data
 public class RevertRequest {
 
-    @NotNull(message = "维修表不能为空")
+    /**
+     * 维修数据ID
+     */
+    @NotNull(message = "维修数据ID不能为空")
     private Integer recordId;
 
-    @NotNull(message = "内容不能为空")
+    /**
+     * 内容
+     */
+    @NotNull(message = "留言内容不能为空")
     private String content;
 }

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

@@ -64,6 +64,8 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     PageUtils<RepairTechnicianVo> queryTeamWorkFinished(int currentPage, int pageCount, Integer schoolId);
 
+    PageUtils<RepairTechnicianVo> queryTeamWorkLogistics(int currentPage, int pageCount, Integer schoolId);
+
     PageUtils<RepairTechnicianVo> queryTeamWorkTimeout(int currentPage, int pageCount, Integer schoolId, String dateNow);
 
     PageUtils<RepairTechnicianVo> queryTeamWorkClosed(int currentPage, int pageCount, Integer schoolId);

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

@@ -47,5 +47,8 @@ public interface RepairUserService extends IService<RepairUser> {
     List<AddressBookVo> queryAddressBook(Integer userId, Integer schoolId, String keyWord);
 
     List<AutoDispatchUserVo> autoDispatchUser(Integer schoolId, String dateNow, Integer articleId, Integer buildId);
+
+    PageUtils<AutoDispatchUserVo> autoDispatchUser(int currentPage, int pageCount, Integer schoolId, String dateNow, Integer articleId,Integer buildId, String keyWord);
+
 }
 

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

@@ -208,6 +208,15 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
+    public PageUtils<RepairTechnicianVo> queryTeamWorkLogistics(int currentPage, int pageCount, Integer schoolId) {
+        Page<RepairTechnicianVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryTeamWorkLogistics(page, schoolId);
+        return new PageUtils(result);
+    }
+
+    @Override
     public PageUtils<RepairTechnicianVo> queryTeamWorkTimeout(int currentPage, int pageCount, Integer schoolId, String dateNow) {
         Page<RepairTechnicianVo> page = new Page<>();
         page.setCurrent(currentPage);

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

@@ -147,4 +147,13 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
 
         return result;
     }
+
+    @Override
+    public PageUtils<AutoDispatchUserVo> autoDispatchUser(int currentPage, int pageCount, Integer schoolId, String dateNow, Integer articleId, Integer buildId, String keyWord) {
+        Page<AutoDispatchUserVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<AutoDispatchUserVo> result = repairUserMapper.autoDispatchUser(page, schoolId, dateNow, articleId, buildId, keyWord);
+        return new PageUtils(result);
+    }
 }

src/main/resources/application-dev.yml

@@ -8,8 +8,8 @@ spring:
     allow-circular-references: true
   datasource:
     username: root
-    password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    password: root
+    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

src/main/resources/application.yml

@@ -5,13 +5,13 @@ server:
 
 spring:
   profiles:
-      active: dev
+      active: prod
   main:
     allow-circular-references: true
   datasource:
     username: root
-    password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=trueserverTimezone=Asia/Shanghai
+    password: root
+    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=trueserverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

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

@@ -454,7 +454,7 @@
     </select>
 
     <!--待处理-->
-    <select id="queryTeamWorkFinished" resultType="com.repair.model.vo.RepairTechnicianVo"
+    <select id="queryTeamWorkLogistics" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select rr.id,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.image,'待处理' as state from repair_record rr
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id

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

@@ -145,10 +145,11 @@
         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_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.assigned_time like '%' #{dateNow} '%' and rdr.users_id = ru.id
         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>
 
-
-
 </mapper>

target/classes/application-dev.yml

@@ -8,8 +8,8 @@ spring:
     allow-circular-references: true
   datasource:
     username: root
-    password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    password: root
+    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

target/classes/application.yml

@@ -5,13 +5,13 @@ server:
 
 spring:
   profiles:
-      active: dev
+      active: prod
   main:
     allow-circular-references: true
   datasource:
     username: root
-    password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=trueserverTimezone=Asia/Shanghai
+    password: root
+    url: jdbc:mysql://localhost:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=trueserverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -454,7 +454,7 @@
     </select>
 
     <!--待处理-->
-    <select id="queryTeamWorkFinished" resultType="com.repair.model.vo.RepairTechnicianVo"
+    <select id="queryTeamWorkLogistics" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select rr.id,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.image,'待处理' as state from repair_record rr
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id

target/classes/mapper/repair/RepairUserMapper.xml

@@ -145,10 +145,11 @@
         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_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.assigned_time like '%' #{dateNow} '%' and rdr.users_id = ru.id
         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>
 
-
-
 </mapper>

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

@@ -41,6 +41,7 @@ com\repair\mapper\RepairConsumeMapper.class
 com\repair\model\request\insertRepairConsumeRequest.class
 com\repair\model\vo\ConsumeVo.class
 com\repair\services\RepairNoticeSettingService.class
+com\repair\model\request\MobileRevertRequest.class
 com\repair\controller\RepairRecordController.class
 com\repair\api\RepairReceivingControllerAPI.class
 com\repair\core\CORSConfiguration.class

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

@@ -288,4 +288,5 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCloseService.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