管理端账号和移动端账号关联

.idea/workspace.xml

@@ -2,35 +2,37 @@
 <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/ChangeConsumesVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangePriceConsumeVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.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/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/config/MyBatisPlusConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.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/RepairConsumeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.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$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.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/RepairConsumablesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumablesMapper.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/mapper/RepairConsumeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumeMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/cooperationOrdersRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/cooperationOrdersRequest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/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/impl/RepairConsumablesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.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/RepairShiftSettingsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.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/resources/mapper/repair/RepairConsumablesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.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$/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$/target/classes/mapper/repair/RepairConsumablesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumablesMapper.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/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/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,20 +47,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="668">
-              <caret line="250" column="49" selection-start-line="250" selection-start-column="49" selection-end-line="250" selection-end-column="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.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="367">
-              <caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
+            <state relative-caret-position="762">
+              <caret line="448" column="9" selection-start-line="448" selection-start-column="9" selection-end-line="448" selection-end-column="9" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -67,40 +60,40 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="208">
-              <caret line="112" column="56" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="56" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.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="390">
-              <caret line="42" column="30" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="30" />
+            <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="imports" expanded="true" />
+                <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/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="137">
-              <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.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="322">
-              <caret line="19" column="22" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
+            <state relative-caret-position="161">
+              <caret line="70" column="86" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="86" />
             </state>
           </provider>
         </entry>
@@ -117,36 +110,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>finished_count</find>
-      <find>#</find>
-      <find>RepairTechnicianVo</find>
-      <find>DateNo</find>
-      <find>queryTeamWorkExamine</find>
-      <find>timeout_count</find>
-      <find>queryMyRepairRecordList</find>
-      <find>queryUserData</find>
-      <find>&quot;,&quot;</find>
-      <find>&quot;,&quot;+</find>
-      <find>.con</find>
-      <find>queryArticleConsumes</find>
-      <find>getRepairParentArticleTypes</find>
-      <find>HH:mm</find>
-      <find>queryConsumeMaterial</find>
-      <find>insertRepairRecord</find>
-      <find>queryPageRepairUsers</find>
-      <find>getRepairsByShiftIds</find>
       <find>autoDispatchUser</find>
       <find>repairShiftSettingsService.getRepairsShiftIdByHour</find>
       <find>非工作时间的最小时间不能小于起止时间的开始时间</find>
       <find>InsertRepairRecord</find>
       <find>receiveOrders</find>
-      <find>抢单</find>
       <find>queryPendingOrder</find>
-      <find>queryChangePriceConsumables</find>
-      <find>repairChangeConsumes</find>
       <find>delete</find>
-      <find>insertConsumableBatch</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>insertRepairAdmin</find>
+      <find>transferToLogistics</find>
+      <find>revert</find>
+      <find>抢单</find>
+      <find>queryTeamWorkPage</find>
+      <find>queryTeamWorkExamine</find>
+      <find>queryManageCount</find>
+      <find>回复</find>
     </findStrings>
     <replaceStrings>
       <replace>Consume</replace>
@@ -187,26 +180,15 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java" />
         <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/mapper/RepairRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <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/impl/RepairRecordServiceImpl.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" />
@@ -219,25 +201,36 @@
         <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/api/RepairRecordControllerAPI.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" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangePriceConsumeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumablesMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" />
         <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/api/RepairConsumablesControllerAPI.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/RevertRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
   </component>
@@ -269,7 +262,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -682,12 +675,12 @@
       <workItem from="1690247776483" duration="78760000" />
       <workItem from="1690506045062" duration="61277000" />
       <workItem from="1690850680543" duration="167784000" />
-      <workItem from="1691462847133" duration="14595000" />
+      <workItem from="1691462847133" duration="25657000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="606957000" />
+    <option name="totallyTimeSpent" value="618019000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -699,10 +692,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <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" weight="0.40262583" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16151386" />
       <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" />
@@ -714,7 +707,7 @@
       <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" visible="true" weight="0.3679558" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.38121548" />
       <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" />
@@ -779,7 +772,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>292</line>
+          <line>309</line>
           <properties />
           <option name="timeStamp" value="146" />
         </line-breakpoint>
@@ -815,33 +808,27 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>72</line>
+          <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>198</line>
+          <line>203</line>
           <properties />
           <option name="timeStamp" value="232" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>219</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
+          <line>647</line>
           <properties />
-          <option name="timeStamp" value="236" />
+          <option name="timeStamp" value="240" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>233</line>
+          <line>288</line>
           <properties />
-          <option name="timeStamp" value="238" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>647</line>
-          <properties />
-          <option name="timeStamp" value="240" />
+          <option name="timeStamp" value="242" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -851,381 +838,379 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+    <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="2990">
-          <caret line="145" column="113" selection-start-line="145" selection-start-column="113" selection-end-line="145" selection-end-column="113" />
+        <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/api/RepairUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesSettingPageDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="38" column="114" selection-start-line="38" selection-start-column="114" selection-end-line="38" selection-end-column="114" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3529">
-          <caret line="197" selection-start-line="197" selection-end-line="197" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairShiftSettingsMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+      <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>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemSettingServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="272">
+          <caret line="53" selection-start-line="53" selection-end-line="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangePriceConsumeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="84" column="80" selection-start-line="84" selection-start-column="11" selection-end-line="84" selection-end-column="80" />
+        <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" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/CORSConfiguration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="29" column="53" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="53" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="33" column="36" selection-start-line="33" selection-start-column="18" selection-end-line="33" selection-end-column="36" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="83" selection-start-line="83" selection-end-line="83" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.3/spring-webmvc-5.3.3.jar!/org/springframework/web/servlet/DispatcherServlet.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="26">
+          <caret line="553" selection-start-line="553" selection-end-line="553" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/SwaggerConfiguration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="101">
-          <caret line="38" selection-start-line="38" selection-end-line="50" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumablesMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
+        <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="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairArticleTypeRequest.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairConsumeRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="47" column="20" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="20" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.3/spring-aop-5.3.3.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="66" column="79" selection-start-line="66" selection-start-column="79" selection-end-line="66" selection-end-column="79" />
+        <state relative-caret-position="292">
+          <caret line="69" selection-start-line="69" selection-end-line="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.3/spring-aop-5.3.3.jar!/org/springframework/aop/framework/CglibAopProxy.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="33" column="48" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="48" />
+        <state relative-caret-position="292">
+          <caret line="445" selection-start-line="445" selection-end-line="445" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
+    <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="1541">
-          <caret line="82" column="65" selection-start-line="82" selection-start-column="65" selection-end-line="82" selection-end-column="65" />
+        <state relative-caret-position="345">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.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="552">
-          <caret line="31" column="170" selection-start-line="31" selection-start-column="170" selection-end-line="31" selection-end-column="170" />
+        <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/resources/mapper/repair/RepairUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="135" column="58" selection-start-line="135" selection-start-column="58" selection-end-line="135" selection-end-column="58" />
+        <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/common/utils/DelayedUtils.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="141">
-          <caret line="79" selection-start-line="79" selection-end-line="79" />
+        <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="imports" expanded="true" />
+            <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/controller/RepairShiftSettingsController.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="1028">
-          <caret line="159" column="10" selection-start-line="159" selection-start-column="10" selection-end-line="159" selection-end-column="10" />
+        <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/request/repairRecordRequest.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="1151">
-          <caret line="60" column="26" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="26" />
+        <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/resources/mapper/repair/RepairRecordMapper.xml">
+    <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="269">
-          <caret line="305" column="33" selection-start-line="305" selection-start-column="16" selection-end-line="305" selection-end-column="33" />
-          <folding>
-            <element signature="e#2405#2409#0" expanded="true" />
-          </folding>
+        <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>
       </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/api/RepairConsumablesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="163" column="75" selection-start-line="163" selection-start-column="58" selection-end-line="163" selection-end-column="75" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.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="667">
-          <caret line="34" column="45" lean-forward="true" selection-start-line="34" selection-start-column="45" selection-end-line="34" selection-end-column="45" />
+        <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/services/impl/RepairDispatchRecordServiceImpl.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="617">
-          <caret line="84" column="33" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="33" />
+        <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/controller/RepairRecordController.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="887">
-          <caret line="594" column="28" selection-start-line="594" selection-start-column="28" selection-end-line="594" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="253">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <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="-296">
-          <caret line="71" column="34" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="34" />
+        <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/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <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="269">
+          <caret line="37" column="216" selection-start-line="37" selection-start-column="216" selection-end-line="37" selection-end-column="216" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesSettingPageDataVo.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="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="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/model/pojo/RepairConsumables.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="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="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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.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="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="414">
+          <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/api/RepairConsumeControllerAPI.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="272">
-          <caret line="53" selection-start-line="53" selection-end-line="53" />
+        <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="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangePriceConsumeVo.java">
+    <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="125">
-          <caret line="14" column="33" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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="file://$PROJECT_DIR$/src/main/java/com/repair/core/CORSConfiguration.java">
+    <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="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="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/core/JwtAuthenticationInterceptor.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="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="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="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.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="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="269">
+          <caret line="48" column="34" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="34" />
         </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/services/RepairRecordService.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="295">
+          <caret line="30" column="16" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="16" />
         </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/controller/LoginController.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="614">
+          <caret line="141" column="12" selection-start-line="141" selection-start-column="12" selection-end-line="141" selection-end-column="12" />
         </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/LoginVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="13" column="29" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/java/com/repair/mapper/RepairConsumablesMapper.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="414">
-          <caret line="27" column="47" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="47" />
+        <state relative-caret-position="295">
+          <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/resources/mapper/repair/RepairConsumablesMapper.xml">
+    <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="394">
-          <caret line="69" column="122" selection-start-line="69" selection-start-column="122" selection-end-line="69" selection-end-column="122" />
+        <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>
       </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/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="19" column="22" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
+        <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="file://$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.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="483">
-          <caret line="27" column="41" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="41" />
+        <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/common/utils/TimeExchange.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="137">
-          <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="115">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </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/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="953">
-          <caret line="53" column="6" selection-start-line="53" selection-start-column="6" selection-end-line="53" selection-end-column="6" />
-          <folding>
-            <element signature="e#487#488#0" expanded="true" />
-            <element signature="e#540#541#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="161">
+          <caret line="70" column="86" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="86" />
         </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">
+    <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="184">
-          <caret line="22" column="7" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="7" />
+        <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/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="42" column="30" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="30" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/services/impl/RepairConsumablesServiceImpl.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="208">
-          <caret line="112" column="56" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="56" />
+        <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>
       </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/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="668">
-          <caret line="250" column="49" selection-start-line="250" selection-start-column="49" selection-end-line="250" selection-end-column="49" />
+        <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>
       </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/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
+        <state relative-caret-position="762">
+          <caret line="448" column="9" selection-start-line="448" selection-start-column="9" selection-end-line="448" selection-end-column="9" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

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

@@ -21,7 +21,7 @@ public interface RepairAdminControllerAPI {
 
     @PostMapping(value = "/insertRepairAdmin")
     @ApiOperation(value = "添加账号", notes = "添加账号数据", httpMethod = "POST")
-    CommonResult InsertRepairAdmin(@Validated @RequestBody RepairAdmin repairAdmin, BindingResult bindingResult);
+    CommonResult InsertRepairAdmin(@Validated @RequestBody RepairAdmin repairAdmin, @RequestHeader("user_head") String userhead, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageRepairAdmin")
     @ApiOperation(value = "账号分页数据", notes = "账号分页数据", httpMethod = "GET")

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

@@ -61,11 +61,11 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/queryManageCount")
     @ApiOperation(value = "工单状态数量", notes = "工单状态数量", httpMethod = "GET")
-    CommonResult queryManageCount();
+    CommonResult queryManageCount(@RequestParam Integer schoolId, @RequestHeader("user_head") String userhead);
 
     @GetMapping(value = "/queryManagePage")
     @ApiOperation(value = "工单管理工单数据", notes = "工单管理工单数据", httpMethod = "GET")
-    CommonResult queryManagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int state, String keyWord, String startTime, String endTime);
+    CommonResult queryManagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestHeader("user_head") String userhead, @RequestParam int state, String keyWord, String startTime, String endTime, @RequestParam Integer schoolId);
 
     @GetMapping(value = "/queryPendingOrder")
     @ApiOperation(value = "待处理池分页数据", notes = "待处理池分页数据", httpMethod = "GET")
@@ -133,7 +133,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/alterPriceGoodsName")
     @ApiOperation(value = "改价耗材名称下拉框", notes = "改价耗材名称下拉框", httpMethod = "GET")
-    CommonResult alterPriceGoodsName(@RequestParam int articleId) throws Exception;
+    CommonResult alterPriceGoodsName(@RequestParam int schoolId, int articleId) throws Exception;
 
 
     @PostMapping(value = "/alterPrice")
@@ -141,4 +141,13 @@ public interface RepairRecordControllerAPI {
     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;
+
+    @PostMapping(value = "/revert")
+    @ApiOperation(value = "回复", notes = "回复", httpMethod = "POST")
+    CommonResult revert(@RequestBody RevertRequest rr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
+
+
 }

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

@@ -21,6 +21,8 @@ public class MaintenanceConsumeablesRequest {
      */
     @NotNull(message = "报修记录ID不能为空")
     private Integer recordId;
+
+
     /**
      * 耗材集合
      */

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

@@ -5,12 +5,14 @@ import com.repair.common.utils.*;
 import com.repair.model.enumModel.eIsSuper;
 import com.repair.model.enumModel.eStatu;
 import com.repair.model.pojo.RepairAdmin;
+import com.repair.model.pojo.RepairUser;
 import com.repair.model.request.freezeRepairAdminRequest;
 import com.repair.model.request.updateRepairAdminRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.services.RepairAdminService;
+import com.repair.services.RepairUserService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -40,10 +42,12 @@ public class RepairAdminController implements RepairAdminControllerAPI {
 
     @Autowired
     private RepairAdminService repairAdminService;
+    @Autowired
+    private RepairUserService repairUserService;
 
     /**
      * 添加账号数据
-     *
+     * 只有超级管理员能添加账号
      * @param ra account 账号
      *           password 密码
      *           username 用户名称
@@ -51,12 +55,24 @@ public class RepairAdminController implements RepairAdminControllerAPI {
      * @return
      */
     @Override
-    public CommonResult InsertRepairAdmin(@RequestBody RepairAdmin ra, BindingResult bindingResult) {
+    public CommonResult InsertRepairAdmin(@RequestBody RepairAdmin ra, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            return CommonResult.fail("只有超级管理员才能添加账号！");
+        }
+
+        //根据微校卡号判断移动端是否存在数据
+        RepairUser user = repairUserService.getRepairByCardNumber(ra.getCardNumber());
+        if(user == null){
+            return CommonResult.fail("此账号无法与移动端用户信息进行绑定，新增账号失败");
+        }
+
         RepairAdmin data = repairAdminService.getRepairByAccount(ra.getAccount());
         if (data != null) {
             return CommonResult.fail("该账号已存在！");

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

@@ -253,6 +253,9 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
 
             List<RepairConsumables> rcDatas = new ArrayList<>();
             for (insertConsumablesRequest rc : data.getConsumes()) {
+                if (rc.getArticleId() == null) {
+                    return CommonResult.fail("报修物品ID不能为空");
+                }
                 if (rc.getConsumeId() == null) {
                     return CommonResult.fail("耗材ID不能为空");
                 }
@@ -268,8 +271,11 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 RepairConsumables rcData = new RepairConsumables();
                 if (rc.getId() != null && rc.getId() > 0) {
                     rcData.setId(rc.getId());
+                }else{
+                    rcData.setId(0);
                 }
                 rcData.setRecordId(data.getRecordId());
+                rcData.setArticleId(rc.getArticleId());
                 rcData.setConsumeId(rc.getConsumeId());
                 rcData.setConsumeName(rc.getConsumeName());
                 rcData.setNumber(rc.getNumber());
@@ -277,6 +283,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 rcData.setTotalPrice(new BigDecimal(rcData.getNumber()).multiply(rcData.getPrice()));
                 rcDatas.add(rcData);
             }
+            //获取原有的耗材记录数据
+            List<ChangeConsumesVo> oldConsumables = repairConsumablesService.repairChangeConsumes(data.getRecordId());
 
             RepairRecord rr = repairRecordService.getRepairById(data.getRecordId());
             if (rr == null) {
@@ -289,7 +297,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 return CommonResult.fail("当前报修工单状态发生变化，改价失败");
             }
 
-            boolean result = repairConsumablesService.insertConsumableBatch(rcDatas);
+            boolean result = repairConsumablesService.saveorUpdateConsumableBatch(rcDatas);
 
             if (!result) {
                 throw new Exception("改价失败！");
@@ -303,12 +311,10 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 throw new Exception("改价失败！");
             }
 
-            //获取原有的耗材记录数据
-            List<ChangeConsumesVo> oldConsumables = repairConsumablesService.repairChangeConsumes(rr.getId());
-            List<Integer> newDatas = data.getConsumes().stream().map(insertConsumablesRequest::getId).collect(Collectors.toList());
+            List<Integer> newDatas = rcDatas.stream().map(RepairConsumables::getId).collect(Collectors.toList());
             List<Integer> oldDatas = oldConsumables.stream().map(ChangeConsumesVo::getId).collect(Collectors.toList());
             //oldData集合不在newDatas集合中的内容
-            List<Integer> ids = newDatas.stream().filter(item -> !oldDatas.contains(item)).collect(Collectors.toList());
+            List<Integer> ids = oldDatas.stream().filter(item -> !newDatas.contains(item)).collect(Collectors.toList());
 
             if(ids.size() > 0){
                 int deleted = repairConsumablesService.deletedConsumableByIds(ids);

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

@@ -90,6 +90,16 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             return CommonResult.fail(st);
         }
 
+        //只有待确认能转后勤
+        RepairRecord rr = repairRecordService.getRepairById(rlmr.getRecordId());
+        if(rr == null){
+            return CommonResult.fail("报修单不存在，转后勤失败");
+        }
+
+        if(rr.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()){
+            return CommonResult.fail("待确认的报修单才能进行转后勤操作");
+        }
+
         /**
          * 获取报修工单对应校区的所有后勤人员
          */
@@ -111,7 +121,6 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
         boolean result = repairLeaveMessageService.inserBatchLeaveMessage(datas);
 
         //将工单状态更改为待处理
-        RepairRecord rr = new RepairRecord();
         rr.setId(rlmr.getRecordId());
         rr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
 

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

@@ -18,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -63,6 +65,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     private RepairArticleTypeService repairArticleTypeService;
     @Autowired
     private RepairTrackRecordService repairTrackRecordService;
+    @Autowired
+    private RepairConsumeService repairConsumeService;
+    @Autowired
+    private RepairAdminService repairAdminService;
 
     @Autowired
     private WeiXiaoUtil weiXiaoUtil;
@@ -108,13 +114,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             //楼栋条件 员工必填楼栋 满足楼栋条件才能派
             List<AutoDispatchUserVo> users = repairUserService.autoDispatchUser(rrr.getSchoolId(), dateNow, rrr.getArticleId(), rrr.getBuildId());
 
-            String shiftStr = StringUtils.join(users.stream().map(AutoDispatchUserVo::getArticleId).collect(Collectors.toList()),",");
+            String shiftStr = StringUtils.join(users.stream().map(AutoDispatchUserVo::getArticleId).collect(Collectors.toList()), ",");
             List<String> shifts = Arrays.asList(shiftStr.split(",")).stream().distinct().collect(Collectors.toList());
             RepairDispatchRecord rdr = null;
             //只获取不是值班 或下班后的排班数据
             List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsShiftIdByHour(shifts, dateHour);
             for (AutoDispatchUserVo user : users) {
-                List<RepairShiftSettings> datas = shiftDatas.stream().filter(e -> (","+user.getShiftId()+",").contains((","+e.getId()+","))).collect(Collectors.toList());
+                List<RepairShiftSettings> datas = shiftDatas.stream().filter(e -> ("," + user.getShiftId() + ",").contains(("," + e.getId() + ","))).collect(Collectors.toList());
                 if (datas.size() <= 0) {
                     continue;
                 }
@@ -186,7 +192,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("报修单提交失败！");
             }
 
-            if(rdr != null){
+            if (rdr != null) {
                 rdr.setRecordId(result);
                 rdr.setUsersId(rrr.getUserId());
                 int dispatch = repairDispatchRecordService.insertRepairDispatchRecord(rdr);
@@ -397,8 +403,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
-    public CommonResult queryManageCount() {
-        RepairManageCountVo result = repairRecordService.queryManageCount();
+    public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead) {
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法，无法获取工单数据！");
+        }
+        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            schoolId = null;
+        }
+        RepairManageCountVo result = repairRecordService.queryManageCount(schoolId);
         return CommonResult.ok(result);
     }
 
@@ -415,7 +429,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * 已超时  8
      */
     @Override
-    public CommonResult queryManagePage(int currentPage, int pageCount, int state, String keyWord, String startTime, String endTime) {
+    public CommonResult queryManagePage(int currentPage, int pageCount, @RequestHeader("user_head") String userhead, int state, String keyWord, String startTime, String endTime, Integer schoolId) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -425,6 +439,15 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
         }
 
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法，无法获取工单数据！");
+        }
+        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            schoolId = null;
+        }
+
         PageUtils<RepairRecordPageVo> result = null;
         /**
          * 出现延时按钮
@@ -434,7 +457,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         String stateStr = null;
         switch (state) {
             case 0:
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     if (r.getMaintenanceState() == 1) {
                         r.setState("待接单");
@@ -456,7 +479,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 1:
                 stateStr = "=1)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     //待接单才能关单
                     r.setState("待接单");
@@ -465,7 +488,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 2:
                 stateStr = "=2)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("维修中");
                     r.setDelayed(1);
@@ -473,7 +496,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 3:
                 stateStr = "=3)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("待处理");
                     r.setDelayed(1);
@@ -481,7 +504,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 4:
                 stateStr = "=5 or rr.maintenance_state = 6)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("待审核");
                     r.setDelayed(1);
@@ -489,14 +512,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 5:
                 stateStr = "=7)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已完成");
                 }
                 break;
             case 6:
                 stateStr = "=8)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已取消");
                     r.setDelayed(1);
@@ -504,13 +527,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 7:
                 stateStr = "=9)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已关单");
                 }
                 break;
             case 8:
-                result = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime);
+                result = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime, schoolId);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已超时");
                 }
@@ -592,7 +615,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             //判断是否存在派单数据
             int dispatchCount = repairDispatchRecordService.queryDispatchCount(recordId);
-            if(dispatchCount > 0){
+            if (dispatchCount > 0) {
                 return CommonResult.fail("该工单存在待处理人，接单失败！");
             }
 
@@ -730,14 +753,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("抢单成功");
     }
 
-/**
-* 派单
+    /**
+     * 派单
      *
      * @param rsor
      * @param bindingResult
      * @return
      * @throws Exception
- */
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult receiveSendOrders(ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception {
@@ -786,7 +809,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.fail("派单失败");
     }
 
- /**
+    /**
      * 协作下拉框
      *
      * @return
@@ -1079,6 +1102,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     public CommonResult alterPriceGoodsType(int schoolId) throws Exception {
+        if (ObjectUtils.isEmpty(schoolId)) {
+            return CommonResult.fail("显示失败");
+        }
+
         LambdaQueryWrapper<RepairArticleType> wrapper = new LambdaQueryWrapper<>();
         wrapper.select(RepairArticleType::getId, RepairArticleType::getName)
                 .eq(RepairArticleType::getSchoolId, schoolId)
@@ -1090,12 +1117,17 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     /**
+     * 耗材名称下拉
+     *
      * @param articleId
      * @return
      * @throws Exception
      */
     @Override
-    public CommonResult alterPriceGoodsName(int articleId) throws Exception {
+    public CommonResult alterPriceGoodsName(int schoolId, int articleId) throws Exception {
+        if (ObjectUtils.isEmpty(schoolId) || ObjectUtils.isEmpty(articleId)) {
+            return CommonResult.fail("显示失败");
+        }
 
 
         LambdaQueryWrapper<RepairArticleType> wrapper = new LambdaQueryWrapper<>();
@@ -1103,27 +1135,258 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 .eq(RepairArticleType::getParentId, articleId);
         List<RepairArticleType> list = repairArticleTypeService.list(wrapper);
 
-        ArrayList<Integer> integers = new ArrayList<>();
+        ArrayList<String> strings = new ArrayList<>();
+        strings.add(articleId + "");
 
-        list.forEach(rat->{
-            Integer id = rat.getId();
-            integers.add(id);
+        list.forEach(repairArticleType -> {
+            String id = repairArticleType.getId() + "";
+            strings.add(id);
         });
 
-        LambdaQueryWrapper<RepairConsumables> consumablesWrapper=new LambdaQueryWrapper<>();
-        consumablesWrapper.in(RepairConsumables::getArticleId,integers)
-                        .select();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < strings.size(); i++) {
+            sb.append("FIND_IN_SET(" + strings.get(i) + ",article_id)");
+            if (i + 1 != strings.size()) {
+                sb.append(" or ");
+            }
+        }
 
-        repairConsumablesService.list(consumablesWrapper);
+        String sss = sb.toString();
 
+        List<RepairArticleConsumeVo> consumeResult = repairConsumeService.queryArticleConsumesName(sss, schoolId);
 
 
-        return null;
+        return CommonResult.ok(consumeResult);
     }
 
+    /**
+     * 改价
+     *
+     * @param apr
+     * @param bindingResult
+     * @return
+     * @throws Exception
+     */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public CommonResult alterPrice(AlterPriceRequest apr, BindingResult bindingResult) throws Exception {
-        return null;
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        Integer recordId = apr.getRecordId();
+
+        List<Integer> ids = apr.getIds();
+
+        List<RepairConsumables> repairConsumables = apr.getRepairConsumables();
+//        当前报修记录
+        LambdaQueryWrapper<RepairConsumables> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(RepairConsumables::getId)
+                .eq(RepairConsumables::getRecordId, recordId);
+        List<RepairConsumables> list = repairConsumablesService.list(wrapper);
+        ArrayList<Integer> integers = new ArrayList<>();
+        list.forEach(rc -> {
+            Integer id = rc.getId();
+            integers.add(id);
+        });
+
+//        当为空时，维修是不要耗材的
+        if (ObjectUtils.isEmpty(repairConsumables)) {
+            boolean remove = repairConsumablesService.removeByIds(integers);
+            if (!remove) {
+                return CommonResult.fail("改价失败");
+            }
+        } else {
+//            将参数有主键的则修改，没有的则添加
+            for (RepairConsumables repairConsumable : repairConsumables) {
+                Integer id = repairConsumable.getId();
+                if (ObjectUtils.isEmpty(id)) {
+                    boolean save = repairConsumablesService.save(repairConsumable);
+                    if (!save) {
+                        return CommonResult.fail("改价失败");
+                    }
+                } else {
+                    boolean update = repairConsumablesService.updateById(repairConsumable);
+                    if (!update) {
+                        return CommonResult.fail("改价失败");
+                    }
+                }
+            }
+            for (Integer integer : integers) {
+                if (!(ids.contains(integer))) {
+                    boolean b = repairConsumablesService.removeById(integer);
+                    if (!b) {
+                        return CommonResult.fail("改价失败");
+                    }
+                }
+            }
+        }
+//        修改维修表总价
+        RepairRecord repairRecord = repairRecordService.getById(recordId);
+
+        repairRecord.setPrice(apr.getTotalPrice());
+        boolean update = repairRecordService.updateById(repairRecord);
+
+        //        追踪记录表
+        RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+        repairTrackRecord.setRecordId(recordId);
+        repairTrackRecord.setContent("改价");
+        boolean save = repairTrackRecordService.save(repairTrackRecord);
+
+        if (update && save) {
+            return CommonResult.ok("改价成功");
+        }
+
+        return CommonResult.fail("改价失败");
+    }
+
+    /**
+     * 延时
+     *
+     * @param dr
+     * @param bindingResult
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult delayed(DelayedRequest dr, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+        Integer recordId = dr.getRecordId();
+        //     接单
+        Integer receiving = dr.getReceiving();
+        //     维修
+        Integer maintain = dr.getMaintain();
+
+//派单记录
+        if (receiving > 0) {
+            LambdaQueryWrapper<RepairDispatchRecord> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(RepairDispatchRecord::getRecordId, recordId)
+                    .eq(RepairDispatchRecord::getIsLoseEfficacy, eDispatchResult.NotExpired.getValue());
+            List<RepairDispatchRecord> list = repairDispatchRecordService.list(wrapper);
+            list.forEach(repairDispatchRecord -> {
+                Integer acceptanceAssessTime = repairDispatchRecord.getAcceptanceAssessTime();
+                repairDispatchRecord.setAcceptanceAssessTime(acceptanceAssessTime + receiving);
+                repairDispatchRecordService.updateById(repairDispatchRecord);
+            });
+
+        }
+
+//        接单记录
+        if (maintain > 0) {
+            LambdaQueryWrapper<RepairReceiving> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(RepairReceiving::getRecordId, recordId)
+                    .eq(RepairReceiving::getIsLoseEfficacy, eDispatchResult.NotExpired.getValue());
+
+            List<RepairReceiving> list = repairReceivingService.list(wrapper);
+            list.forEach(repairReceiving -> {
+                Integer maintenanceAssessTime = repairReceiving.getMaintenanceAssessTime();
+                repairReceiving.setMaintenanceAssessTime(maintenanceAssessTime + maintain);
+                repairReceivingService.updateById(repairReceiving);
+            });
+        }
+
+//        追踪记录表
+        RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+        repairTrackRecord.setRecordId(recordId);
+        repairTrackRecord.setContent("延时");
+        boolean save = repairTrackRecordService.save(repairTrackRecord);
+
+        if (save) {
+            return CommonResult.ok("延时成功");
+        }
+
+        return CommonResult.fail("延时失败");
+
+    }
+
+    /**
+     * 回复
+     * 在订单是待确认状态下 用户能发送信息给后勤 此时订单状态改为待处理
+     * 后勤回复信息给用户   此时订单状态为待确认
+     * 如果是管理端回复的则记录
+     *
+     * @param rr
+     * @param bindingResult
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult revert(@RequestBody RevertRequest rr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        try {
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                return CommonResult.fail("操作人信息不合法，无法进行回复！");
+            }
+
+            //发送人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                senderId = user.getId();
+            }
+
+            RepairRecord data = repairRecordService.getRepairById(rr.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("回复失败！");
+            }
+
+            //内容
+            String content = rr.getContent();
+
+            RepairLeaveMessage repairLeaveMessage = new RepairLeaveMessage();
+            repairLeaveMessage.setRecordId(data.getId());
+            repairLeaveMessage.setRecipientId(recipientId);
+            repairLeaveMessage.setSenderId(senderId);
+            repairLeaveMessage.setContent(content);
+
+            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

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

@@ -26,4 +26,6 @@ public interface RepairConsumeMapper extends BaseMapper<RepairConsume> {
     IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<RepairArticleConsumeVo> queryArticleConsumes(@Param("schoolId") Integer schoolId, @Param("keyWork") String keyWork, @Param("findInSet") String findInSet);
+
+    List<RepairArticleConsumeVo> queryArticleConsumesName(String sss,int schoolId);
 }

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

@@ -31,11 +31,11 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<RepairTechnicianVo> queryExamineOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId);
 
-    RepairManageCountVo queryManageCount();
+    RepairManageCountVo queryManageCount(@Param("schoolId") Integer schoolId);
 
-    IPage<RepairRecordPageVo> queryNotTimeout(IPage<RepairRecordPageVo> page, @Param("stateStr") String stateStr, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<RepairRecordPageVo> queryNotTimeout(IPage<RepairRecordPageVo> page, @Param("stateStr") String stateStr, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("schoolId") Integer schoolId);
 
-    IPage<RepairRecordPageVo> queryTimeout(IPage<RepairRecordPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<RepairRecordPageVo> queryTimeout(IPage<RepairRecordPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
 
     IPage<pendingOrderVo> queryPendingOrder(IPage<pendingOrderVo> page, @Param("userId") Integer userId);
 

src/main/java/com/repair/model/pojo/RepairAdmin.java

@@ -23,6 +23,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * <p>
@@ -68,6 +69,14 @@ public class RepairAdmin implements Serializable {
     @NotBlank(message = "手机号不能为空")
     private String phone;
 
+    @ApiModelProperty(value = "微校卡号")
+    @NotBlank(message = "微校卡号不能为空")
+    private String cardNumber;
+
+    @ApiModelProperty(value = "校区ID 黄家湖：1；墨轩湖：2")
+    @NotNull(message = "校区不能为空")
+    private Integer schoolId;
+
     @ApiModelProperty(value = "是否是超级管理员 正常：0；超级管理员：1")
     private Integer isSuper;
 

src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java

@@ -51,7 +51,7 @@ public class RepairCollaborateRecord implements Serializable {
 
     @ApiModelProperty(value = "审批操作人ID")
     @NotNull(message = "审批操作人不能为空")
-    private Integer approverId;
+    private String approverId;
 
     @ApiModelProperty(value = "语音 可能做成语音文件上传的方式 然后这个字段记录语音文件名")
     @NotBlank(message = "语音不能为空")

src/main/java/com/repair/model/pojo/RepairTransferRecord.java

@@ -59,7 +59,7 @@ public class RepairTransferRecord implements Serializable {
 
     @ApiModelProperty(value = "审批操作人ID")
     @NotNull(message = "审批操作人不能为空")
-    private Integer approverId;
+    private String approverId;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

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

@@ -1,9 +1,36 @@
 package com.repair.model.request;
 
+import com.repair.model.pojo.RepairConsumables;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class AlterPriceRequest {
+//
+//    private Integer articleId;
+//
+//    private Integer consumeId;
+//
+//    private String consumeName;
+//
+//    private BigDecimal price;
+//
+//    private Double number;
+//
+//    private BigDecimal totalPrice;
+
+    @NotNull(message = "维修id不能为空")
+    private Integer recordId;
+
+    //所属维修表id
+    private List<Integer> ids;
 
+    private List<RepairConsumables> repairConsumables;
 
+    @NotNull(message = "总金额不能为空")
+    private BigDecimal totalPrice;
 }

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

@@ -0,0 +1,20 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DelayedRequest {
+
+    @NotNull(message = "维修表不能为空")
+    private Integer recordId;
+
+
+//     接单
+    private Integer receiving;
+//    维修
+    private Integer maintain;
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class RevertRequest {
+
+    @NotNull(message = "维修表不能为空")
+    private Integer recordId;
+
+    @NotNull(message = "内容不能为空")
+    private String content;
+}

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

@@ -14,7 +14,7 @@ public class cooperationOrdersRequest {
     private String[] collaborator;
 
     @NotNull(message = "审批人ID不能为空")
-    private Integer approverId;
+    private String approverId;
 
     @NotNull(message = "审批人状态不能为空")
     private Integer approverStatu;

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

@@ -19,6 +19,12 @@ public class insertConsumablesRequest {
     @NotNull(message = "耗材数据不能为空")
     private Integer id;
 
+    /**
+     * 报修物品ID
+     */
+    @NotNull(message = "报修物品ID不能为空")
+    private Integer articleId;
+
     @NotNull(message = "耗材数据不能为空")
     private Integer consumeId;
 

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

@@ -13,7 +13,7 @@ public class transferRequest {
 
     //    审批人Id
     @NotNull(message = "审批人不能为空")
-    private Integer approverId;
+    private String approverId;
 
     //  备注
     private String remark;

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

@@ -16,12 +16,18 @@ public class ChangeConsumesVo {
      * 数据ID
      */
     private int id;
+
+    /**
+     * 报修物品
+     */
+    private int articleId;
+
     /**
      * 耗材ID
      */
     private int consumeId;
     /**
-     * 耗材ID
+     * 耗材名称
      */
     private String consumeName;
     /**

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

@@ -10,6 +10,7 @@ import lombok.Data;
  */
 @Data
 public class TeamWorkCountVo {
+
     /**
      * 待审核
      */
@@ -31,6 +32,11 @@ public class TeamWorkCountVo {
     private int finishedCount;
 
     /**
+     * 待处理
+     */
+    private int logisticsCount;
+
+    /**
      * 已超时
      */
     private int timeoutCount;

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

@@ -38,6 +38,8 @@ public interface RepairConsumablesService extends IService<RepairConsumables> {
 
     boolean insertConsumableBatch(List<RepairConsumables> rns);
 
+    boolean saveorUpdateConsumableBatch(List<RepairConsumables> rns);
+
     List<ChangeConsumesVo> repairChangeConsumes(Integer recordId);
 
     int deletedConsumableByIds(List<Integer> ids);

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

@@ -34,4 +34,6 @@ public interface RepairConsumeService extends IService<RepairConsume> {
     RepairConsume queryConsumeByName(String namem, Integer schoolId);
 
     List<RepairArticleConsumeVo> queryArticleConsumes(Integer schoolId, String keyWork, String findInSet);
+
+    List<RepairArticleConsumeVo> queryArticleConsumesName(String sss,int schoolId);
 }

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

@@ -6,6 +6,7 @@ import com.repair.model.pojo.RepairRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.*;
+import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -45,11 +46,11 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId);
 
-    RepairManageCountVo queryManageCount();
+    RepairManageCountVo queryManageCount(Integer schoolId);
 
-    PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime);
+    PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
 
-    PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
+    PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
 
     PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount, Integer userId);
 

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

@@ -104,6 +104,12 @@ public class RepairConsumablesServiceImpl extends ServiceImpl<RepairConsumablesM
     }
 
     @Override
+    public boolean saveorUpdateConsumableBatch(List<RepairConsumables> rns) {
+        boolean result = this.saveOrUpdateBatch(rns);
+        return result;
+    }
+
+    @Override
     public List<ChangeConsumesVo> repairChangeConsumes(Integer recordId) {
         List<ChangeConsumesVo> result = repairConsumablesMapper.repairChangeConsumes(recordId);
         return result;

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

@@ -88,4 +88,9 @@ public class RepairConsumeServiceImpl extends ServiceImpl<RepairConsumeMapper, R
         return result;
     }
 
+    @Override
+    public List<RepairArticleConsumeVo> queryArticleConsumesName(String sss,int schoolId) {
+        List<RepairArticleConsumeVo> result= repairConsumeMapper.queryArticleConsumesName(sss,schoolId);
+        return result;
+    }
 }

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

@@ -133,26 +133,26 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
-    public RepairManageCountVo queryManageCount() {
-        RepairManageCountVo result = repairRecordMapper.queryManageCount();
+    public RepairManageCountVo queryManageCount(Integer schoolId) {
+        RepairManageCountVo result = repairRecordMapper.queryManageCount(schoolId);
         return result;
     }
 
     @Override
-    public PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime) {
+    public PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId) {
         Page<RepairRecordPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordPageVo> result = repairRecordMapper.queryNotTimeout(page, stateStr, keyWord, startTime, endTime);
+        IPage<RepairRecordPageVo> result = repairRecordMapper.queryNotTimeout(page, stateStr, keyWord, startTime, endTime, schoolId);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId) {
         Page<RepairRecordPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime);
+        IPage<RepairRecordPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime,schoolId);
         return new PageUtils(result);
     }
 

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

@@ -62,13 +62,14 @@
 
     <resultMap type="com.repair.model.vo.ChangeConsumesVo" id="repairChangeConsumesMap">
         <result property="id" column="id"/>
+        <result property="articleId" column="article_id"/>
         <result property="consumeId" column="consume_id"/>
         <result property="consumeName" column="consume_name"/>
         <result property="price" column="price"/>
         <result property="number" column="number"/>
     </resultMap>
     <select id="repairChangeConsumes" resultType="com.repair.model.vo.ChangeConsumesVo" resultMap="repairChangeConsumesMap">
-        select id,consume_id,consume_name,price,number from repair_consumables
+        select id,article_id,consume_id,consume_name,price,number from repair_consumables
         <where>
             and deleted = 0
             <if test="recordId != null and recordId != ''">

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

@@ -187,22 +187,57 @@
     <select id="queryManageCount" resultType="com.repair.model.vo.RepairManageCountVo" resultMap="repairManageCountMap">
         select
         (select Count(*) from repair_record where deleted = 0) as all_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1)  as dispatch_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2)  as maintenance_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3)  as logistics_count,
-        (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)) as examine_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7)  as finished_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8)  as canceled_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9) as closed_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1
+        <if test="schoolId != null and schoolId != ''">
+        and school_id = #{schoolId}
+        </if>
+        )  as dispatch_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        )  as maintenance_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        )  as logistics_count,
+        (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        ) as examine_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        )  as finished_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        ) as canceled_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        ) as closed_count,
         (select Count(*) as cs from (select rr3.* from repair_record rr3
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0 and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
         where rr3.maintenance_state = 1 and rr3.is_duty = 0 and rr3.deleted = 0
+        <if test="schoolId != null and schoolId != ''">
+            and rr3.school_id = #{schoolId}
+        </if>
         UNION ALL
         select rr4.* from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0 and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
-        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0) c) as timeout_count
+        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0
+        <if test="schoolId != null and schoolId != ''">
+            and school_id = #{schoolId}
+        </if>
+        ) c) as timeout_count
     </select>
 
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
@@ -228,6 +263,9 @@
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
         <where>
             and rr.deleted = 0
+            <if test="schoolId != null and schoolId != ''">
+                and rr.schoolId = #{schoolId}
+            </if>
             <if test="stateStr != null and stateStr != ''">
                 and (rr.maintenance_state ${stateStr}
             </if>
@@ -262,6 +300,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rr3.report_time between #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr3.school_id = #{schoolId}
+            </if>
         </where>
         UNION ALL
         select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
@@ -282,6 +323,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rr4.report_time between #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr4.school_id = #{schoolId}
+            </if>
         </where>
         ) t
         order by t.report_time desc
@@ -319,6 +363,7 @@
         <result property="receivingCount" column="receiving_count"/>
         <result property="maintenanceCount" column="maintenance_count"/>
         <result property="finishedCount" column="finished_count"/>
+        <result property="logisticsCount" column="logistics_count"/>
         <result property="timeoutCount" column="timeout_count"/>
         <result property="closedCount" column="closed_count"/>
     </resultMap>
@@ -345,6 +390,8 @@
         where rr2.maintenance_state = 2 and rr2.school_id = #{schoolId} and rr2.deleted = 0) as maintenance_count,
         (select Count(*) from repair_record rr7
         where rr7.deleted = 0 and rr7.school_id = #{schoolId} and rr7.maintenance_state = 7) as finished_count,
+        (select Count(*) from repair_record rr9
+        where rr9.deleted = 0 and rr9.school_id = #{schoolId} and rr9.maintenance_state = 3) as logistics_count,
         (select Count(*) as cs from (select rr3.*
         from repair_record rr3
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
@@ -378,7 +425,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} when true then '超时未接' else null end as timeout_str,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 case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,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
         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
@@ -406,6 +453,15 @@
         order by rr.report_time DESC
     </select>
 
+    <!--待处理-->
+    <select id="queryTeamWorkFinished" 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
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 3
+        order by rr.report_time DESC
+    </select>
+
     <!--已超时-->
     <select id="queryTeamWorkTimeout" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">

target/classes/mapper/repair/RepairConsumablesMapper.xml

@@ -62,13 +62,14 @@
 
     <resultMap type="com.repair.model.vo.ChangeConsumesVo" id="repairChangeConsumesMap">
         <result property="id" column="id"/>
+        <result property="articleId" column="article_id"/>
         <result property="consumeId" column="consume_id"/>
         <result property="consumeName" column="consume_name"/>
         <result property="price" column="price"/>
         <result property="number" column="number"/>
     </resultMap>
     <select id="repairChangeConsumes" resultType="com.repair.model.vo.ChangeConsumesVo" resultMap="repairChangeConsumesMap">
-        select id,consume_id,consume_name,price,number from repair_consumables
+        select id,article_id,consume_id,consume_name,price,number from repair_consumables
         <where>
             and deleted = 0
             <if test="recordId != null and recordId != ''">

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -187,22 +187,22 @@
     <select id="queryManageCount" resultType="com.repair.model.vo.RepairManageCountVo" resultMap="repairManageCountMap">
         select
         (select Count(*) from repair_record where deleted = 0) as all_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1)  as dispatch_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2)  as maintenance_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3)  as logistics_count,
-        (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)) as examine_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7)  as finished_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8)  as canceled_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9) as closed_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1 and school_id = #{schoolId})  as dispatch_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2 and school_id = #{schoolId})  as maintenance_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3 and school_id = #{schoolId})  as logistics_count,
+        (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6) and school_id = #{schoolId}) as examine_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7 and school_id = #{schoolId})  as finished_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8 and school_id = #{schoolId})  as canceled_count,
+        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9 and school_id = #{schoolId}) as closed_count,
         (select Count(*) as cs from (select rr3.* from repair_record rr3
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0 and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
-        where rr3.maintenance_state = 1 and rr3.is_duty = 0 and rr3.deleted = 0
+        where rr3.maintenance_state = 1 and rr3.is_duty = 0 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
         UNION ALL
         select rr4.* from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0 and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
-        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0) c) as timeout_count
+        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count
     </select>
 
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
@@ -228,6 +228,9 @@
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
         <where>
             and rr.deleted = 0
+            <if test="schoolId != null and schoolId != ''">
+                and rr.schoolId = #{schoolId}
+            </if>
             <if test="stateStr != null and stateStr != ''">
                 and (rr.maintenance_state ${stateStr}
             </if>
@@ -262,6 +265,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rr3.report_time between #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr3.school_id = #{schoolId}
+            </if>
         </where>
         UNION ALL
         select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
@@ -282,6 +288,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rr4.report_time between #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr4.school_id = #{schoolId}
+            </if>
         </where>
         ) t
         order by t.report_time desc
@@ -319,6 +328,7 @@
         <result property="receivingCount" column="receiving_count"/>
         <result property="maintenanceCount" column="maintenance_count"/>
         <result property="finishedCount" column="finished_count"/>
+        <result property="logisticsCount" column="logistics_count"/>
         <result property="timeoutCount" column="timeout_count"/>
         <result property="closedCount" column="closed_count"/>
     </resultMap>
@@ -345,6 +355,8 @@
         where rr2.maintenance_state = 2 and rr2.school_id = #{schoolId} and rr2.deleted = 0) as maintenance_count,
         (select Count(*) from repair_record rr7
         where rr7.deleted = 0 and rr7.school_id = #{schoolId} and rr7.maintenance_state = 7) as finished_count,
+        (select Count(*) from repair_record rr9
+        where rr9.deleted = 0 and rr9.school_id = #{schoolId} and rr9.maintenance_state = 3) as logistics_count,
         (select Count(*) as cs from (select rr3.*
         from repair_record rr3
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
@@ -378,7 +390,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} when true then '超时未接' else null end as timeout_str,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 case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,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
         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
@@ -406,6 +418,15 @@
         order by rr.report_time DESC
     </select>
 
+    <!--待处理-->
+    <select id="queryTeamWorkFinished" 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
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 3
+        order by rr.report_time DESC
+    </select>
+
     <!--已超时-->
     <select id="queryTeamWorkTimeout" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">

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

@@ -261,6 +261,7 @@ com\repair\model\pojo\RepairShiftSettings.class
 com\repair\model\vo\RepairRecordCountVo.class
 com\repair\services\RepairTransferRecordService.class
 com\repair\common\utils\WxConstants.class
+com\repair\model\request\DelayedRequest.class
 com\repair\model\request\freezeRepairAdminRequest.class
 com\repair\model\request\updateAddressBookRequest.class
 com\repair\core\JwtlnterceptorConfig.class
@@ -286,6 +287,7 @@ com\repair\model\vo\SystemMenuVo$SystemMenuVoBuilder.class
 com\repair\common\exception\EmsExceptionHandler.class
 com\repair\services\RepairAreaService.class
 com\repair\model\vo\RepairAreaTreeVo$RepairAreaTreeVoBuilder.class
+com\repair\model\request\RevertRequest.class
 com\repair\model\request\finishOrderRequest.class
 com\repair\services\impl\RepairUserServiceImpl.class
 com\repair\common\result\ResponseStatusEnum.class

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

@@ -90,6 +90,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\pendingOrderVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumablePageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\DelayedRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumablesController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\ResponseStatusEnum.java
@@ -272,6 +273,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RevertRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAdminServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairDispatchRecordService.java