转单审核和协作审核

.idea/workspace.xml

@@ -2,42 +2,10 @@
 <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/api/RepairCloseControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.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 afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.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/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/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/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/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/mapper/RepairArticleTypeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairArticleTypeMapper.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/model/pojo/RepairConsumables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/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/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/impl/RepairArticleTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/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/RepairRefundRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairArticleTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairArticleTypeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.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/" />
@@ -52,59 +20,56 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="654" selection-start-line="654" selection-end-line="654" />
+            <state relative-caret-position="509">
+              <caret line="786" column="55" selection-start-line="786" selection-start-column="55" selection-end-line="786" selection-end-column="55" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.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="584">
-              <caret line="36" column="32" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="615">
+              <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
+            <state relative-caret-position="222">
+              <caret line="10" column="42" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="363">
-              <caret line="69" column="35" selection-start-line="69" selection-start-column="35" selection-end-line="69" selection-end-column="35" />
+            <state relative-caret-position="569">
+              <caret line="70" column="99" selection-start-line="70" selection-start-column="73" selection-end-line="70" selection-end-column="99" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1434">
-              <caret line="14" column="34" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="34" />
+            <state relative-caret-position="346">
+              <caret line="115" column="50" selection-start-line="115" selection-start-column="50" selection-end-line="115" selection-end-column="50" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="249">
-              <caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
+            <state relative-caret-position="162">
+              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -113,13 +78,28 @@
         </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/model/request/collaborateApplyRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="491">
-              <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="46">
+              <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="42" column="39" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="222">
+              <caret line="75" column="62" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="62" />
             </state>
           </provider>
         </entry>
@@ -136,14 +116,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getRepairsByRecordIds</find>
-      <find>shifts</find>
-      <find>.sort</find>
-      <find>isDuty</find>
-      <find>datas</find>
-      <find>sort</find>
-      <find>Array</find>
-      <find>shiftDatas</find>
       <find>getRepairsByShiftIds</find>
       <find>main</find>
       <find>endWorkTime</find>
@@ -166,6 +138,14 @@
       <find>repairRecord/getRepairRecordsByUserId</find>
       <find>getRepairRecordsByUserId</find>
       <find>join</find>
+      <find>My</find>
+      <find>queryMyRepairRecordList</find>
+      <find>queryManagePage</find>
+      <find>transferToLogistics</find>
+      <find>queryCollaborateRecordList</find>
+      <find>repairCollaborateRecordService</find>
+      <find>closeOrder</find>
+      <find>queryRepairCollaborate</find>
     </findStrings>
     <replaceStrings>
       <replace>Consume</replace>
@@ -206,8 +186,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/services/impl/RepairRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eUserStatu.java" />
@@ -253,9 +231,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.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/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
@@ -288,7 +268,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -700,12 +680,12 @@
       <workItem from="1689834821108" duration="40536000" />
       <workItem from="1690247776483" duration="78760000" />
       <workItem from="1690506045062" duration="61277000" />
-      <workItem from="1690850680543" duration="124276000" />
+      <workItem from="1690850680543" duration="128136000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="548854000" />
+    <option name="totallyTimeSpent" value="552714000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -717,10 +697,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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2439825" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2964989" />
       <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" />
@@ -731,8 +711,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.5325967" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.15469614" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.5317287" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.15317287" />
       <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" />
@@ -851,70 +831,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCloseControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="32" column="37" lean-forward="true" selection-start-line="32" selection-start-column="37" selection-end-line="32" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleTypeTreeVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="617">
-          <caret line="45" column="28" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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/resources/mapper/repair/RepairConsumablesMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-717" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumeVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumablePageVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateRecordVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumableExcelVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -1135,13 +1051,6 @@
         </state>
       </provider>
     </entry>
-    <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="92">
-          <caret line="17" column="39" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <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="477">
@@ -1159,23 +1068,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1434">
-          <caret line="14" column="34" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="584">
-          <caret line="36" column="32" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="363">
@@ -1190,9 +1082,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="491">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
+        <state relative-caret-position="594">
           <caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1200,27 +1102,107 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="491">
-          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+        <state relative-caret-position="446">
+          <caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="39" column="91" selection-start-line="39" selection-start-column="91" selection-end-line="39" selection-end-column="91" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="654" selection-start-line="654" selection-end-line="654" />
+        <state relative-caret-position="153">
+          <caret line="42" column="39" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <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="222">
+          <caret line="75" column="62" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="346">
+          <caret line="115" column="50" selection-start-line="115" selection-start-column="50" selection-end-line="115" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="45" column="19" selection-start-line="45" selection-start-column="19" selection-end-line="45" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateRecordVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
+        <state relative-caret-position="263">
+          <caret line="15" column="15" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="10" column="42" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="615">
+          <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="569">
+          <caret line="70" column="99" selection-start-line="70" selection-start-column="73" selection-end-line="70" selection-end-column="99" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="509">
+          <caret line="786" column="55" selection-start-line="786" selection-start-column="55" selection-end-line="786" selection-end-column="55" />
         </state>
       </provider>
     </entry>

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

@@ -1,8 +1,10 @@
 package com.repair.api;
 
 import com.repair.model.pojo.RepairRecord;
+import com.repair.model.request.collaborateApplyRequest;
 import com.repair.model.request.finishOrderRequest;
 import com.repair.model.request.repairRecordRequest;
+import com.repair.model.request.transferApplyRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -81,6 +83,14 @@ public interface RepairRecordControllerAPI {
     CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason);
 
     @PostMapping(value = "/finishOrder")
-    @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "GET")
+    @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "POST")
     CommonResult finishOrder(@Validated @RequestBody finishOrderRequest data, BindingResult bindingResult) throws Exception;
+
+    @PostMapping(value = "/transferApply")
+    @ApiOperation(value = "转单申请", notes = "转单申请", httpMethod = "POST")
+    CommonResult transferApply(@Validated @RequestBody transferApplyRequest data, BindingResult bindingResult) throws Exception;
+
+    @PostMapping(value = "/collaborateApply")
+    @ApiOperation(value = "协作申请", notes = "协作申请", httpMethod = "POST")
+    CommonResult collaborateApply(@Validated @RequestBody collaborateApplyRequest data, BindingResult bindingResult) throws Exception;
 }

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

@@ -8,10 +8,7 @@ import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eTechnicianStatu;
 import com.repair.model.enumModel.eUserZZ;
 import com.repair.model.pojo.*;
-import com.repair.model.request.finishOrderRequest;
-import com.repair.model.request.insertConsumablesRequest;
-import com.repair.model.request.repairRecordRequest;
-import com.repair.model.request.timeVo;
+import com.repair.model.request.*;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.*;
@@ -62,10 +59,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     @Autowired
     private RepairShiftSettingsService repairShiftSettingsService;
     @Autowired
+    private RepairTransferRecordService repairTransferRecordService;
+    @Autowired
     private RepairDispatchRecordService repairDispatchRecordService;
     @Autowired
     private RepairCollaborateRecordService repairCollaborateRecordService;
 
+
     @Autowired
     private WeiXiaoUtil weiXiaoUtil;
 
@@ -716,5 +716,101 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("提交成功！");
     }
 
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult transferApply(transferApplyRequest data, BindingResult bindingResult) throws Exception {
+        try {
+            if (bindingResult.hasErrors()) {
+                String st = paramUtils.getParamError(bindingResult);
+                return CommonResult.fail(st);
+            }
+
+            //已关单 已取消 已完成的单子不能提交转单申请
+            //获取订单 判断当前订单是否是待接单状态
+            RepairRecord recordData = repairRecordService.getRepairById(data.getRecordId());
+            if (recordData == null) {
+                return CommonResult.fail("订单不存在，申请失败");
+            }
+
+            if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
+                return CommonResult.fail("待接单的订单才能进行转单申请");
+            }
+
+            RepairTransferRecord rtr = new RepairTransferRecord();
+            rtr.setRecordId(data.getRecordId());
+            rtr.setVoice(data.getVoice());
+            rtr.setRemark(data.getRemark());
+            rtr.setUserId(data.getUserId());
+            rtr.setApprovalStatu(2);
+
+            int result = repairTransferRecordService.insertRepairTransferRecord(rtr);
+            if (result <= 0) {
+                throw new Exception("申请失败！");
+            }
+
+            recordData.setMaintenanceState(eRecordStatu.Transfer.getValue());
+            int updateRecord = repairRecordService.updateRepairRecord(recordData);
+            if (updateRecord <= 0) {
+                throw new Exception("申请失败！");
+            }
+
+        } catch (Exception e) {
+            throw new Exception("转单审核发起失败！");
+        }
+
+        return CommonResult.fail("转单审核发起成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult collaborateApply(collaborateApplyRequest data, BindingResult bindingResult) throws Exception {
+        try {
+            if (bindingResult.hasErrors()) {
+                String st = paramUtils.getParamError(bindingResult);
+                return CommonResult.fail(st);
+            }
+
+            //已关单 已取消 已完成的单子不能提交转单申请
+            //获取订单 判断当前订单是否是待接单状态
+            RepairRecord recordData = repairRecordService.getRepairById(data.getRecordId());
+            if (recordData == null) {
+                return CommonResult.fail("订单不存在，申请失败");
+            }
+
+            if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
+                return CommonResult.fail("待接单的订单才能进行协作申请");
+            }
+
+            //协作人中不能包含申请人
+            long count = data.getCollaborator().stream().filter(e -> e.equals(data.getUserId())).count();
+            if(count > 0){
+                return CommonResult.fail("协作人中不能包含当前申请人");
+            }
+
+            RepairCollaborateRecord rcr = new RepairCollaborateRecord();
+            rcr.setRecordId(data.getRecordId());
+            rcr.setVoice(data.getVoice());
+            rcr.setRemark(data.getRemark());
+            rcr.setUserId(data.getUserId());
+            rcr.setApprovalStatu(2);
+            rcr.setCollaborator(StringUtils.join(data.getCollaborator(),','));
+
+            int result = repairCollaborateRecordService.insertRepairCollaborateRecord(rcr);
+            if (result <= 0) {
+                throw new Exception("申请失败！");
+            }
+
+            recordData.setMaintenanceState(eRecordStatu.Collaborate.getValue());
+            int updateRecord = repairRecordService.updateRepairRecord(recordData);
+            if (updateRecord <= 0) {
+                throw new Exception("申请失败！");
+            }
+
+        } catch (Exception e) {
+            throw new Exception("协作审核发起失败！");
+        }
+
+        return CommonResult.fail("协作审核发起成功");
+    }
 }
 

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

@@ -0,0 +1,45 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/6 星期日 19:55
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class collaborateApplyRequest {
+    /**
+     * 报修记录ID
+     */
+    @NotNull(message = "报修记录不能为空")
+    private Integer recordId;
+
+    /**
+     * 协作审核申请人ID
+     */
+    @NotNull(message = "申请人不能为空")
+    private Integer userId;
+
+    /**
+     * 协作人ID集合
+     */
+    @NotEmpty(message = "协作人不能为空")
+    private List<Integer> collaborator;
+
+    /**
+     * 转单语音说明
+     */
+    @NotNull(message = "协作语音说明不能为空")
+    private String voice;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,37 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/6 星期日 19:55
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class transferApplyRequest {
+    /**
+     * 报修记录ID
+     */
+    @NotNull(message = "报修记录不能为空")
+    private Integer recordId;
+
+    /**
+     * 转单审核申请人ID
+     */
+    @NotNull(message = "申请人不能为空")
+    private Integer userId;
+
+    /**
+     * 转单语音说明
+     */
+    @NotNull(message = "转单语音说明不能为空")
+    private String voice;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -29,7 +29,6 @@ com\repair\common\utils\WeiXiaoUtil.class
 com\repair\model\vo\RepairCardNumberVo.class
 com\repair\model\pojo\RepairPayRecord.class
 com\repair\handler\MyMetaObjectHandler.class
-com\repair\auto\services\RepairCloseService.class
 com\repair\model\vo\SystemMenuTreeVo.class
 com\repair\controller\RepairSchoolController.class
 com\repair\services\RepairCloseService.class
@@ -65,7 +64,6 @@ com\repair\services\RepairWorkTypeService.class
 com\repair\mapper\RepairConsumablesMapper.class
 com\repair\model\enumModel\eIsTop.class
 com\repair\model\enumModel\eUserZZ.class
-com\repair\auto\controller\RepairCloseController.class
 com\repair\services\impl\RepairWorkTypeServiceImpl.class
 com\repair\api\RepairClassesSettingsControllerAPI.class
 com\repair\model\vo\RepairClassesVo.class
@@ -82,6 +80,7 @@ com\repair\controller\RepairEvaluateController.class
 com\repair\services\impl\RepairConsumeServiceImpl.class
 com\repair\model\vo\ClassesSettingVo.class
 com\repair\controller\RepairRefundRecordController.class
+com\repair\model\request\insertRepairAssociationRequest.class
 com\repair\model\vo\RepairRecordPageVo.class
 com\repair\model\request\timeVo.class
 com\repair\controller\RepairConsumablesController.class
@@ -112,6 +111,7 @@ com\repair\controller\RepairConsumeController.class
 com\repair\mapper\RepairLeaveMessageMapper.class
 com\repair\api\RepairCollaborateRecordControllerAPI.class
 com\repair\model\enumModel\eFileType.class
+com\repair\model\request\collaborateApplyRequest.class
 com\repair\model\pojo\RepairNoticeSetting.class
 com\repair\config\SmsConfig.class
 com\repair\services\RepairPayRecordService.class
@@ -131,7 +131,6 @@ com\repair\services\RepairShiftSettingsService.class
 com\repair\common\utils\WxUtil.class
 com\repair\model\vo\ClassesSettingPageVo.class
 com\repair\controller\RepairAreaController.class
-com\repair\auto\model\RepairClose.class
 com\repair\model\vo\RepairTechnicianVo.class
 com\repair\services\impl\RepairArticleTypeServiceImpl.class
 com\repair\api\RepairConsumeControllerAPI.class
@@ -143,6 +142,7 @@ com\repair\model\vo\RepairAreaTreeVo.class
 com\repair\controller\LoginController$1.class
 com\repair\controller\RepairAdminController.class
 com\repair\core\SwaggerConfiguration.class
+com\repair\model\request\transferApplyRequest.class
 com\repair\services\RepairLeaveMessageService.class
 com\repair\mapper\RepairSystemSettingMapper.class
 com\repair\model\vo\NoticeVo.class
@@ -177,6 +177,7 @@ com\repair\services\RepairReceivingService.class
 com\repair\api\RepairRecordControllerAPI.class
 com\repair\model\vo\EvaluateVo.class
 com\repair\mapper\RepairClassesSettingsMapper.class
+com\repair\model\request\insertConsumablesRequest.class
 com\repair\model\vo\ConsumablePageVo.class
 com\repair\common\utils\TimeExchange$1.class
 com\repair\model\request\updateRepairAdminRequest.class
@@ -203,9 +204,11 @@ com\repair\common\utils\DelayedUtils$1.class
 com\repair\mapper\RepairSystemMessagesMapper.class
 com\repair\model\vo\RepairArticleTypeTreeVo$RepairArticleTypeTreeVoBuilder.class
 com\repair\controller\RepairTrackRecordController.class
+com\repair\model\vo\RepairArticleChildVo.class
 com\repair\services\RepairSystemMessagesService.class
 com\repair\api\RepairConsumablesControllerAPI.class
 com\repair\mapper\RepairCloseMapper.class
+com\repair\model\vo\RepairArticleConsumeVo.class
 com\repair\config\WxOpenidConfig.class
 com\repair\common\utils\TimeExchange.class
 com\repair\controller\RepairTransferRecordController.class
@@ -216,7 +219,6 @@ com\repair\api\RepairAreaControllerAPI.class
 com\repair\model\request\updateRepairClassesRequest.class
 com\repair\common\utils\JWTUtil.class
 com\repair\services\RepairUserService.class
-com\repair\auto\mapper\RepairCloseMapper.class
 com\repair\model\pojo\RepairRefundRecord.class
 com\repair\model\vo\SystemMenuTreeVo$SystemMenuTreeVoBuilder.class
 com\repair\controller\RepairNoticeSettingController.class
@@ -238,6 +240,7 @@ com\repair\services\impl\RepairPayRecordServiceImpl.class
 com\repair\model\request\updateRepairShiftRequest.class
 com\repair\model\vo\UserDataVo.class
 com\repair\services\RepairEvaluateService.class
+com\repair\controller\MaintenanceConsumeablesRequest.class
 com\repair\model\pojo\RepairShiftSettings.class
 com\repair\model\vo\RepairRecordCountVo.class
 com\repair\services\RepairTransferRecordService.class
@@ -253,7 +256,6 @@ com\repair\annotation\UserLoginCheck.class
 com\repair\common\utils\DelayedUtils.class
 com\repair\controller\RepairUserController.class
 com\repair\model\request\updateRepairConsumeRequest.class
-com\repair\auto\service\impl\RepairCloseServiceImpl.class
 com\repair\controller\RepairShiftSettingsController.class
 com\repair\api\RepairTrackRecordControllerAPI.class
 com\repair\common\utils\SHA1.class
@@ -267,6 +269,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\finishOrderRequest.class
 com\repair\services\impl\RepairUserServiceImpl.class
 com\repair\common\result\ResponseStatusEnum.class
 com\repair\services\impl\RepairTrackRecordServiceImpl.class

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

@@ -59,9 +59,11 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairWorkTypeController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairConsumeRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertConsumablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\WxAccessTokenServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairNoticeSettingService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\SmsConfig.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleConsumeVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairLogisticsVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairUserController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WeiXiaoUtil.java
@@ -105,6 +107,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairClassesSettingsService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairUser.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\EncryptionUtil.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferApplyRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairShiftSettingsControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCollaborateRecordControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairArticleTypeServiceImpl.java
@@ -126,7 +129,6 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairClassesSettingsMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairEvaluateMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairRecordRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\mapper\RepairCloseMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTrackRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairReceivingControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
@@ -135,9 +137,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaTreeVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UploadFileVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\service\impl\RepairCloseServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\WxAccessToken.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\model\RepairClose.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemMessagesService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuTreeVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemMessagesServiceImpl.java
@@ -164,6 +164,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelExportUtil.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRecordServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCollaborateRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\collaborateApplyRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCloseMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\routeDataVo.java
@@ -175,8 +176,8 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairSchoolVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SeqUtils.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\paramUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\controller\RepairCloseController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\HttpsClient.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleChildVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\UserLoginCheck.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ValidateCode.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handle\NonStaticResourceHttpRequestHandler.java
@@ -192,6 +193,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSchoolServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairArticleTypeControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClose.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairAssociationRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsException.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCollaborateRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTrackRecordControllerAPI.java
@@ -216,6 +218,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\SwaggerConfiguration.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumableExcelVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairClassesSettingsController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\finishOrderRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsTop.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAdminMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\loginRequest.java
@@ -236,7 +239,6 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordCountVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairLeaveMessageControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairWorkTypeService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\services\RepairCloseService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAreaRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordPageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairClassesSettingsServiceImpl.java
@@ -250,6 +252,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemSettingMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemSettingController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAdminServiceImpl.java