修改待接单逻辑

.idea/workspace.xml

@@ -2,36 +2,17 @@
 <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/vo/UnreadMessageCountVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.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/api/RepairUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.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/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/insertRepairUserRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairUserRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.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/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/RepairDispatchRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.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/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/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/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/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/" />
@@ -64,92 +45,123 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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="723">
-              <caret line="104" column="21" selection-start-line="104" selection-start-column="16" selection-end-line="104" selection-end-column="21" />
+            <state relative-caret-position="149">
+              <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="e#1456#1457#0" expanded="true" />
+                <element signature="e#1512#1513#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/api/RepairUserControllerAPI.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="315">
-              <caret line="18" column="33" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="33" />
+            <state relative-caret-position="368">
+              <caret line="349" column="74" selection-start-line="349" selection-start-column="74" selection-end-line="349" selection-end-column="74" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#35156#35160#0" expanded="true" />
+                <element signature="e#35276#35280#0" expanded="true" />
+                <element signature="e#35356#35360#0" expanded="true" />
+                <element signature="e#35888#35892#0" expanded="true" />
+                <element signature="e#36019#36023#0" expanded="true" />
+                <element signature="e#36096#36100#0" expanded="true" />
+                <element signature="e#37909#37913#0" expanded="true" />
+                <element signature="e#38034#38038#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/RepairUserController.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="-782">
-              <caret line="8" column="48" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="48" />
+            <state relative-caret-position="246">
+              <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
+              <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/controller/RepairClassesSettingsController.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="103">
-              <caret line="245" column="53" selection-start-line="245" selection-start-column="53" selection-end-line="245" selection-end-column="53" />
+            <state relative-caret-position="253">
+              <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.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="299">
-              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+            <state relative-caret-position="509">
+              <caret line="227" column="36" selection-start-line="227" selection-start-column="36" selection-end-line="227" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+      <file pinned="false" current-in-tab="false">
+        <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="474">
-              <caret line="119" column="128" selection-start-line="119" selection-start-column="128" selection-end-line="119" selection-end-column="128" />
+            <state relative-caret-position="529">
+              <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+              <folding>
+                <element signature="e#458#459#0" expanded="true" />
+                <element signature="e#498#499#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/RepairRecordController.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="269">
-              <caret line="3587" column="36" selection-start-line="3587" selection-start-column="24" selection-end-line="3587" selection-end-column="36" />
+            <state relative-caret-position="32">
+              <caret line="82" column="5" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="e#1075#1076#0" expanded="true" />
+                <element signature="e#1166#1167#0" expanded="true" />
+                <element signature="e#1339#1340#0" expanded="true" />
+                <element signature="e#1376#1377#0" expanded="true" />
+                <element signature="e#1409#1410#0" expanded="true" />
+                <element signature="e#1443#1444#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/RepairPayRecordController.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="131">
-              <caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
+            <state relative-caret-position="338">
+              <caret line="68" column="65" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="65" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
+        <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="295">
-              <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
+            <state relative-caret-position="14">
+              <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="148" column="70" selection-start-line="148" selection-start-column="70" selection-end-line="148" selection-end-column="70" />
             </state>
           </provider>
         </entry>
@@ -166,36 +178,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>selectPage</find>
-      <find>insertRepairDispatchRecord</find>
-      <find>queryPageRepairUser</find>
-      <find>微校授权</find>
-      <find>已派单</find>
-      <find>派单</find>
-      <find>//下班之后或者值班接的单不考核 将报修工单中的is_duty改为1</find>
-      <find>StringUtils.join(users.stream().map(AutoDispatchUserVo::</find>
-      <find>//只获取不是值班 或下班后的排班数据</find>
-      <find>cooperationOrders</find>
-      <find>collaborateApply</find>
-      <find>getRepairRecordCount</find>
-      <find>queryRepairRecordCount</find>
-      <find>son</find>
-      <find>System.out.println(</find>
-      <find>getRepairRecordCountByUserId</find>
-      <find>auto</find>
-      <find>queryPageRepairUsers</find>
-      <find>queryCollaboratorUser</find>
-      <find>queryPageCollaborator</find>
-      <find>InsertRepairUser</find>
-      <find>userhead</find>
       <find>支付</find>
-      <find>repairPayment</find>
       <find>revokeRepairRecordById</find>
-      <find>insertRepairUserSetting</find>
       <find>downloadRepairClassesSettingExcel</find>
-      <find>queryManagePage</find>
       <find>closeOrder</find>
       <find>closePCOrder</find>
+      <find>json</find>
+      <find>协作待审核</find>
+      <find>处理中</find>
+      <find>insertMaintenanceConsumables</find>
+      <find>insertRepairUserSetting</find>
+      <find>InsertRepairUser</find>
+      <find>updateRepairAdmin</find>
+      <find>InsertRepairAdmin</find>
+      <find>insertRepairAdmin</find>
+      <find>维修中</find>
+      <find>delayed</find>
+      <find>repairPayment</find>
+      <find>StringUtils.join</find>
+      <find>queryManagePage</find>
+      <find>queryTeamWorkTimeout</find>
+      <find>finishOrder</find>
+      <find>queryTeamWorkPage</find>
+      <find>queryTeamWorkPending</find>
+      <find>queryTimeout</find>
+      <find>queryManageCount</find>
+      <find>queryNotTimeout</find>
+      <find>RepairRecordPageVo</find>
+      <find>repairTotalData</find>
+      <find>repairSummarizing</find>
+      <find>as dispatch_count</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -236,9 +248,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.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/model/vo/RepairRecordTimeoutPageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
@@ -248,16 +257,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairAreaService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
@@ -272,21 +278,27 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairUserRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.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/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.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/model/vo/RepairManageCountVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
       </list>
     </option>
   </component>
@@ -318,7 +330,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -481,6 +493,16 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
+              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="repair" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
               <item name="result" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -711,12 +733,12 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="59887000" />
+      <workItem from="1692753806714" duration="73910000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="908102000" />
+    <option name="totallyTimeSpent" value="922125000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -728,7 +750,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -740,11 +762,11 @@
       <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 content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.20350109" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.14605543" />
       <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.6345733" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8353591" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.6684902" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.8249453" />
       <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" />
@@ -760,7 +782,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.7073561" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.8238512" />
       <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" />
@@ -779,18 +801,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.15405117" />
+      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.08422175" />
       <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.607221" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.13894968" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.6629834" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.83369803" />
       <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.29834256" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.29431072" />
       <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" />
@@ -799,7 +821,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.22761194" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.9671773" />
       <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" />
@@ -859,7 +881,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>117</line>
+          <line>120</line>
           <properties />
           <option name="timeStamp" value="244" />
         </line-breakpoint>
@@ -907,7 +929,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>284</line>
+          <line>288</line>
           <properties />
           <option name="timeStamp" value="322" />
         </line-breakpoint>
@@ -919,7 +941,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1224</line>
+          <line>1227</line>
           <properties />
           <option name="timeStamp" value="331" />
         </line-breakpoint>
@@ -943,62 +965,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/CommonResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="41" column="64" selection-start-line="41" selection-start-column="64" selection-end-line="41" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="15" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="40" column="29" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="24" column="29" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="61" column="7" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <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="315">
-          <caret line="46" column="49" selection-start-line="46" selection-start-column="26" selection-end-line="46" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UnreadMessageCountVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="13" column="33" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <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="152">
-          <caret line="98" column="62" selection-start-line="98" selection-start-column="62" selection-end-line="98" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
     <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="623">
@@ -1062,18 +1028,6 @@
         </state>
       </provider>
     </entry>
-    <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="-2014">
-          <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/pendingOrderVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-920">
@@ -1151,13 +1105,6 @@
         </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="368">
-          <caret line="16" column="55" lean-forward="true" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairUserRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="46">
@@ -1172,13 +1119,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="26" column="27" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="805">
@@ -1235,9 +1175,30 @@
         </state>
       </provider>
     </entry>
+    <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="32">
+          <caret line="643" selection-start-line="643" selection-end-line="643" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="245" column="53" selection-start-line="245" selection-start-column="53" selection-end-line="245" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <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="384">
+          <caret line="217" column="36" selection-start-line="217" selection-start-column="36" selection-end-line="217" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
     <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="315">
+        <state relative-caret-position="177">
           <caret line="18" column="33" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="33" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1245,72 +1206,156 @@
         </state>
       </provider>
     </entry>
+    <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="88">
+          <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-782">
-          <caret line="8" column="48" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="48" />
+        <state relative-caret-position="476">
+          <caret line="52" column="40" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
+        <state relative-caret-position="338">
+          <caret line="68" column="65" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="65" />
         </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/controller/RepairAdminController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="48" column="50" selection-start-line="48" selection-start-column="50" selection-end-line="48" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <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="14">
+          <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <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="32">
-          <caret line="643" selection-start-line="643" selection-end-line="643" />
+          <caret line="82" column="5" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1075#1076#0" expanded="true" />
+            <element signature="e#1166#1167#0" expanded="true" />
+            <element signature="e#1339#1340#0" expanded="true" />
+            <element signature="e#1376#1377#0" expanded="true" />
+            <element signature="e#1409#1410#0" expanded="true" />
+            <element signature="e#1443#1444#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
+        <state relative-caret-position="15">
+          <caret line="148" column="70" selection-start-line="148" selection-start-column="70" selection-end-line="148" selection-end-column="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="701">
+          <caret line="46" column="25" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <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="295">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+          <caret line="55" column="19" selection-start-line="55" selection-start-column="19" selection-end-line="55" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.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="103">
-          <caret line="245" column="53" selection-start-line="245" selection-start-column="53" selection-end-line="245" selection-end-column="53" />
+        <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/RepairRecordPageVo.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="253">
+          <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <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="723">
-          <caret line="104" column="21" selection-start-line="104" selection-start-column="16" selection-end-line="104" selection-end-column="21" />
+        <state relative-caret-position="509">
+          <caret line="227" column="36" selection-start-line="227" selection-start-column="36" selection-end-line="227" selection-end-column="36" />
+        </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="246">
+          <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </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/model/vo/RepairManageCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="3587" column="36" selection-start-line="3587" selection-start-column="24" selection-end-line="3587" selection-end-column="36" />
+        <state relative-caret-position="529">
+          <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#458#459#0" expanded="true" />
+            <element signature="e#498#499#0" expanded="true" />
           </folding>
         </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/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="349" column="74" selection-start-line="349" selection-start-column="74" selection-end-line="349" selection-end-column="74" />
+          <folding>
+            <element signature="e#35156#35160#0" expanded="true" />
+            <element signature="e#35276#35280#0" expanded="true" />
+            <element signature="e#35356#35360#0" expanded="true" />
+            <element signature="e#35888#35892#0" expanded="true" />
+            <element signature="e#36019#36023#0" expanded="true" />
+            <element signature="e#36096#36100#0" expanded="true" />
+            <element signature="e#37909#37913#0" expanded="true" />
+            <element signature="e#38034#38038#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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="474">
-          <caret line="119" column="128" selection-start-line="119" selection-start-column="128" selection-end-line="119" selection-end-column="128" />
+        <state relative-caret-position="149">
+          <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1456#1457#0" expanded="true" />
+            <element signature="e#1512#1513#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -17,6 +17,10 @@ import java.lang.reflect.InvocationTargetException;
 @Api(tags = {"RepairAdminController"}, value = "账号")
 public interface RepairAdminControllerAPI {
 
+    @GetMapping(value = "/resetPassword")
+    @ApiOperation(value = "重置密码", notes = "重置密码", httpMethod = "GET")
+    CommonResult resetPassword(@RequestParam String id);
+
     @PostMapping(value = "/insertRepairAdmin")
     @ApiOperation(value = "添加账号", notes = "添加账号数据", httpMethod = "POST")
     CommonResult InsertRepairAdmin(@Validated @RequestBody RepairAdmin repairAdmin, @RequestHeader("user_head") String userhead, BindingResult bindingResult);

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

@@ -225,10 +225,10 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairSummarizing")
     @ApiOperation(value = "总数据汇总统计", notes = "总数据汇总统计", httpMethod = "GET")
-    CommonResult repairSummarizing() throws Exception;
+    CommonResult repairSummarizing();
 
     @GetMapping(value = "/repairTotalData")
     @ApiOperation(value = "总数据分析", notes = "总数据分析", httpMethod = "GET")
-    CommonResult repairTotalData() throws Exception;
+    CommonResult repairTotalData();
 
 }

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

@@ -41,6 +41,23 @@ public class RepairAdminController implements RepairAdminControllerAPI {
     private RepairAdminService repairAdminService;
 
     /**
+     * 重置密码
+     * @param id
+     * @return
+     */
+    @Override
+    public CommonResult resetPassword(String id) {
+        RepairAdmin ra = new RepairAdmin();
+        ra.setId(id);
+        ra.setPassword(AesUtils.encrypt("123456"));
+        int updateResult = repairAdminService.updateRepairAdmin(ra);
+        if(updateResult <= 0){
+            return CommonResult.fail("重置密码失败");
+        }
+        return CommonResult.ok("重置密码成功");
+    }
+
+    /**
      * 添加账号数据
      * 只有超级管理员能添加账号
      * @param ra account 账号

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

@@ -194,6 +194,11 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 return CommonResult.fail("报修工单不存在，报价失败");
             }
 
+            //判断是否已报价
+            if(rr.getPrice() != null){
+                return CommonResult.fail("报修工单已报过价，请勿重复报价");
+            }
+
             if (rr.getMaintenanceState() == eRecordStatu.Finished.getValue()
                     || rr.getMaintenanceState() == eRecordStatu.Canceled.getValue()
                     || rr.getMaintenanceState() == eRecordStatu.Closed.getValue()) {

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

@@ -1,6 +1,7 @@
 package com.repair.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -109,6 +111,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     @Override
     public CommonResult repairPayment(repairPayRequest rpr, BindingResult bindingResult) {
+        System.out.println("开始支付"+ JSON.toJSON(rpr));
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -143,6 +146,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             return CommonResult.fail("支付失败");
         }
 
+        System.out.println("支付结束"+ JSON.toJSON(CommonResult.ok("支付成功")));
         return CommonResult.ok("支付成功");
     }
 

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

@@ -850,14 +850,19 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     if (r.getMaintenanceState() == 1) {
                         r.setState("待接单");
                         r.setClose(1);
+                        r.setDelayed(1);
                     } else if (r.getMaintenanceState() == 2) {
                         r.setState("维修中");
+                        r.setDelayed(1);
                     } else if (r.getMaintenanceState() == 3) {
                         r.setState("待处理");
+                        r.setDelayed(1);
                     } else if (r.getMaintenanceState() == 4) {
                         r.setState("待确认");
+                        r.setDelayed(1);
                     } else if (r.getMaintenanceState() == 5 || r.getMaintenanceState() == 6) {
                         r.setState(r.getMaintenanceState() == 5 ? "转单待审核" : "协作待审核");
+                        r.setDelayed(1);
                     } else if (r.getMaintenanceState() == 7) {
                         r.setState("已完成");
                     } else if (r.getMaintenanceState() == 8) {
@@ -865,7 +870,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     } else if (r.getMaintenanceState() == 9) {
                         r.setState("已关单");
                     }
-                    r.setDelayed(1);
                 }
                 break;
             case 1:
@@ -913,7 +917,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已取消");
-                    r.setDelayed(1);
                 }
                 break;
             case 7:
@@ -993,11 +996,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
 
             /**
-             * 全部 待处理 待审核 维修中
+             * 全部 待处理
              * 有耗材记录就显示改价按钮
              * 出现改价按钮
              */
-            if (state == 0 || state == 2 || state == 3 || state == 4) {
+            if (state == 0 || state == 3) {
                 List<RepairConsumables> consumables = repairConsumablesService.getRepairsByRecordIds(recordIds);
                 for (RepairRecordPageVo r : result.getList()) {
                     if (r.getMaintenanceState() == eRecordStatu.ToLogistics.getValue()
@@ -2845,14 +2848,17 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                         Integer integer = maintainTimeOutMap.get(id);
                         BigDecimal a = new BigDecimal(integer);
                         BigDecimal c = b;
+
+//                        接单总次数
+                        List<Integer> integers = sendCountMap.get(id);
+                        BigDecimal bigDecimal1 = new BigDecimal(integers.size());
+                        c = c.add(bigDecimal1);
 //                接单
                         if (sendTimeOutMap.containsKey(id)) {
                             Integer integer1 = sendTimeOutMap.get(id);
                             BigDecimal bigDecimal = new BigDecimal(integer1);
                             a = a.add(bigDecimal);
-                            List<Integer> integers = sendCountMap.get(id);
-                            BigDecimal bigDecimal1 = new BigDecimal(integers.size());
-                            c = c.add(bigDecimal1);
+
                         }
 
                         BigDecimal bigDecimal = a.divide(c, 2, BigDecimal.ROUND_HALF_UP);
@@ -3425,7 +3431,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @throws Exception
      */
     @Override
-    public CommonResult repairSummarizing() throws Exception {
+    public CommonResult repairSummarizing(){
 
         List<RepairSummarizingVo> vos = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
@@ -3456,7 +3462,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @throws Exception
      */
     @Override
-    public CommonResult repairTotalData() throws Exception {
+    public CommonResult repairTotalData(){
         RepairTotalDataVo vo=repairRecordService.repairTotalData();
         return CommonResult.ok(vo);
     }
@@ -3763,7 +3769,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setContent("已完成");
             rtr.setUserId(senderId);
             rtr.setUserZzstr("技术员");
-            rtr.setImage(StringUtils.join(data.getImages()));
+            rtr.setImage(StringUtils.join(data.getImages(),','));
             rtr.setVoice(data.getVoice());
             rtr.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);

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

@@ -15,6 +15,14 @@ public class RepairManageCountVo {
      */
     private int allCount;
 
+    public int getAllCount() {
+        return dispatchCount + maintenanceCount + logisticsCount + examineCount + finishedCount + canceledCount + closedCount;
+    }
+
+    public void setAllCount(int allCount) {
+        this.allCount = allCount;
+    }
+
     /**
      * 待接单
      */

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

@@ -1,6 +1,7 @@
 package com.repair.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eSchool;
 import lombok.Data;
 
@@ -79,11 +80,38 @@ public class RepairRecordPageVo {
      * 报修时间
      */
     private Date reportTime;
+
+    /**
+     * 待接单师傅/接单师傅
+     */
+    @JsonIgnore
+    private String rdrName;
+
+    /**
+     * 维修师傅
+     */
+    @JsonIgnore
+    private String rdvName;
+
     /**
      * 技术员
      */
     private String maintenancerName;
 
+    public String getMaintenancerName() {
+        String name = maintenancerName;
+        if(maintenanceState == eRecordStatu.Dispatch.getValue()){
+            name = rdrName != null ? rdrName : maintenancerName;
+        }else if(maintenanceState == eRecordStatu.Maintenance.getValue()){
+            name = rdvName != null ? rdvName : maintenancerName;
+        }
+        return name;
+    }
+
+    public void setMaintenancerName(String maintenancerName) {
+        this.maintenancerName = maintenancerName;
+    }
+
     /**
      * 出现派单按钮
      */

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

@@ -1,6 +1,7 @@
 package com.repair.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.repair.model.enumModel.eRecordStatu;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -86,6 +87,14 @@ public class RepairTechnicianVo {
      */
     private String state;
 
+    public String getState() {
+        return state == null ? eRecordStatu.stringOf(maintenanceState) : state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
     /**
      * 工单状态ID
      */

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

@@ -194,7 +194,6 @@
     </select>
 
     <resultMap type="com.repair.model.vo.RepairManageCountVo" id="repairManageCountMap">
-        <result property="allCount" column="all_count"/>
         <result property="dispatchCount" column="dispatch_count"/>
         <result property="maintenanceCount" column="maintenance_count"/>
         <result property="logisticsCount" column="logistics_count"/>
@@ -207,38 +206,30 @@
 
     <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
+        (select Count(*) from repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
+        where rr.deleted = 0 and rr.maintenance_state = 1
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or 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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         ) as dispatch_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2
+        (select Count(*) from repair_record rr
+         left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and rr.maintenance_state = 2
+         where rr.deleted = 0 and rr.maintenance_state = 2
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or 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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         ) as maintenance_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3
@@ -350,7 +341,8 @@
         <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="rdvName" column="rdvName"/>
+        <result property="rdrName" column="rdrName"/>
         <result property="userId" column="user_id"/>
     </resultMap>
 
@@ -359,8 +351,10 @@
         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
+        rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state,(select user_name from repair_user where id = rdv.user_id and deleted = 0) as rdvName,(select user_name from repair_user where id = rdr.users_id and deleted = 0) as rdrName
         from repair_record rr
+        left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and rdv.finish_time is null and rr.maintenance_state = 2
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.receiving_time is null and rr.maintenance_state = 1
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
         <where>
             and rr.deleted = 0
@@ -561,7 +555,7 @@
     <select id="queryTeamWorkPending" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} 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,
-        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price
+        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,(select user_name from repair_user where deleted = 0 and id = rdr.users_id) as 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
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
@@ -573,7 +567,7 @@
     <select id="queryTeamWorkMaintenance" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select case ((date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} 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 timeout_str,
-        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price
+        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,(select user_name from repair_user where deleted = 0 and id = rdv.user_id) as 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
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -194,7 +194,6 @@
     </select>
 
     <resultMap type="com.repair.model.vo.RepairManageCountVo" id="repairManageCountMap">
-        <result property="allCount" column="all_count"/>
         <result property="dispatchCount" column="dispatch_count"/>
         <result property="maintenanceCount" column="maintenance_count"/>
         <result property="logisticsCount" column="logistics_count"/>
@@ -207,38 +206,30 @@
 
     <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
+        (select Count(*) from repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
+        where rr.deleted = 0 and rr.maintenance_state = 1
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or 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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         ) as dispatch_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2
+        (select Count(*) from repair_record rr
+         left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and rr.maintenance_state = 2
+         where rr.deleted = 0 and rr.maintenance_state = 2
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or 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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         ) as maintenance_count,
         (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3
@@ -350,7 +341,8 @@
         <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="rdvName" column="rdvName"/>
+        <result property="rdrName" column="rdrName"/>
         <result property="userId" column="user_id"/>
     </resultMap>
 
@@ -359,8 +351,10 @@
         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
+        rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state,(select user_name from repair_user where id = rdv.user_id and deleted = 0) as rdvName,(select user_name from repair_user where id = rdr.users_id and deleted = 0) as rdrName
         from repair_record rr
+        left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and rdv.finish_time is null and rr.maintenance_state = 2
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.receiving_time is null and rr.maintenance_state = 1
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
         <where>
             and rr.deleted = 0
@@ -561,7 +555,7 @@
     <select id="queryTeamWorkPending" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} 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,
-        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price
+        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,(select user_name from repair_user where deleted = 0 and id = rdr.users_id) as 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
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
@@ -573,7 +567,7 @@
     <select id="queryTeamWorkMaintenance" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
         select case ((date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} 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 timeout_str,
-        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price
+        rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,(select user_name from repair_user where deleted = 0 and id = rdv.user_id) as 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
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id