转单人员限制

.idea/workspace.xml

@@ -2,7 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/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/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/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/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/services/RepairTransferRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/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/" />
@@ -35,11 +49,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="647">
-              <caret line="2003" column="17" lean-forward="true" selection-start-line="2003" selection-start-column="17" selection-end-line="2003" selection-end-column="17" />
+            <state relative-caret-position="51">
+              <caret line="1738" column="75" selection-start-line="1738" selection-start-column="75" selection-end-line="1738" selection-end-column="75" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -48,77 +62,82 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eWeekStatu.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="8" column="22" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="22" />
+            <state relative-caret-position="483">
+              <caret line="23" column="26" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="26" />
             </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/services/RepairUserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14398">
-              <caret line="650" column="5" selection-start-line="641" selection-start-column="4" selection-end-line="650" selection-end-column="5" />
+            <state relative-caret-position="618">
+              <caret line="58" column="106" selection-start-line="58" selection-start-column="90" selection-end-line="58" selection-end-column="106" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="56350">
-              <caret line="2510" column="22" selection-start-line="2510" selection-start-column="22" selection-end-line="2510" selection-end-column="22" />
-              <folding>
-                <element signature="e#106317#106318#0" expanded="true" />
-                <element signature="e#106377#106378#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="1666">
+              <caret line="200" column="58" selection-start-line="200" selection-start-column="58" selection-end-line="200" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="598">
-              <caret line="65" column="4" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="14" />
+            <state relative-caret-position="687">
+              <caret line="41" column="37" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
+            <state relative-caret-position="541">
+              <caret line="205" column="141" selection-start-line="205" selection-start-column="141" selection-end-line="205" selection-end-column="141" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/EndPay.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="42" />
+            <state relative-caret-position="493">
+              <caret line="30" column="44" selection-start-line="30" selection-start-column="25" selection-end-line="30" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
-              <caret line="20" selection-start-line="20" selection-end-line="20" />
+            <state relative-caret-position="552">
+              <caret line="24" column="46" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="440">
+              <caret line="74" column="23" selection-start-line="74" selection-start-column="23" selection-end-line="74" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+        <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="1541">
-              <caret line="67" column="2" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
+            <state relative-caret-position="134">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -135,13 +154,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryExamineOrderList</find>
-      <find>queryPendingOrderList</find>
-      <find>getTechniciansByUserId</find>
-      <find>closeOrder</find>
-      <find>weiXiaoUtil.sendNotice</find>
-      <find>openid&quot;</find>
-      <find>queryCollaboratorUser</find>
       <find>privateKey</find>
       <find>queryPageCollaborator</find>
       <find>技术员</find>
@@ -164,7 +176,14 @@
       <find>strToDate</find>
       <find>.isP</find>
       <find>ToDate</find>
+      <find>cooperationDetail</find>
+      <find>queryCollaborateDetail</find>
       <find>cooperationOrders</find>
+      <find>repairUserService.dropDown</find>
+      <find>is</find>
+      <find>queryTransferDetail</find>
+      <find>transfer(</find>
+      <find>dropDown</find>
     </findStrings>
     <replaceStrings>
       <replace>repairConsumables</replace>
@@ -205,13 +224,9 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" />
@@ -232,7 +247,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/../../虹软人脸检测/facedemo/src/main/java/com/face/Controller/MemberHeadImageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusRecordVo.java" />
@@ -244,18 +258,23 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -287,7 +306,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -529,8 +548,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -587,7 +606,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.TimeExchange">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.repair.AutoCode" />
       <module name="repair_backend" />
@@ -723,12 +742,13 @@
       <workItem from="1694483448254" duration="3243000" />
       <workItem from="1694575708078" duration="6153000" />
       <workItem from="1694997999891" duration="32319000" />
-      <workItem from="1695265447793" duration="1042000" />
+      <workItem from="1695265447793" duration="3168000" />
+      <workItem from="1695273589677" duration="3073000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1083539000" />
+    <option name="totallyTimeSpent" value="1088738000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -752,19 +772,19 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.14925373" />
+      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.2249467" />
       <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.51641136" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.52154696" />
       <window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
-      <window_info anchor="bottom" id="Debug" order="4" weight="0.3501094" />
+      <window_info anchor="bottom" id="Debug" order="4" visible="true" weight="0.15098469" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="7" weight="0.32932165" />
       <window_info anchor="bottom" id="Spring" order="8" weight="0.32603937" />
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.32928178" />
       <window_info anchor="bottom" id="Docker" order="10" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.2866521" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.28618786" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -772,7 +792,7 @@
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.8085339" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.8869936" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -894,34 +914,28 @@
           <option name="timeStamp" value="357" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>666</line>
-          <properties />
-          <option name="timeStamp" value="358" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>434</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>109</line>
           <properties />
-          <option name="timeStamp" value="361" />
+          <option name="timeStamp" value="369" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>454</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1953</line>
           <properties />
-          <option name="timeStamp" value="363" />
+          <option name="timeStamp" value="372" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>109</line>
+          <line>1892</line>
           <properties />
-          <option name="timeStamp" value="369" />
+          <option name="timeStamp" value="373" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>661</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1727</line>
           <properties />
-          <option name="timeStamp" value="371" />
+          <option name="timeStamp" value="374" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -931,125 +945,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="352" column="9" lean-forward="true" selection-start-line="349" selection-start-column="8" selection-end-line="352" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemMessages.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="633">
-          <caret line="37" column="51" selection-start-line="37" selection-start-column="51" selection-end-line="37" selection-end-column="51" />
-        </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/metadata/IPage.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="166" column="84" selection-start-line="166" selection-start-column="84" selection-end-line="166" selection-end-column="84" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="35" selection-start-line="35" selection-end-line="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="213" selection-start-line="213" selection-end-line="213" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="286" column="13" selection-start-line="286" selection-start-column="13" selection-end-line="286" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="207" column="25" selection-start-line="207" selection-start-column="25" selection-end-line="207" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/RSAUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="125" column="41" selection-start-line="125" selection-start-column="41" selection-end-line="125" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="64" column="2" selection-start-line="64" selection-start-column="2" selection-end-line="65" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="68" column="2" selection-start-line="68" selection-start-column="2" selection-end-line="68" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="42" column="33" lean-forward="true" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1334">
-          <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/services/RepairRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="223">
@@ -1057,13 +952,6 @@
         </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="414">
-          <caret line="145" column="73" selection-start-line="145" selection-start-column="73" selection-end-line="145" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -1218,13 +1106,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14398">
-          <caret line="650" column="5" selection-start-line="641" selection-start-column="4" selection-end-line="650" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="56350">
@@ -1236,17 +1117,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="65" column="4" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="14" />
+        <state relative-caret-position="92">
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="828">
+          <caret line="36" column="28" lean-forward="true" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="23">
+          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
-          <caret line="22" column="51" selection-start-line="22" selection-start-column="51" selection-end-line="22" selection-end-column="51" />
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
         </state>
       </provider>
     </entry>
@@ -1257,17 +1152,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <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="460">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
+        <state relative-caret-position="2024">
+          <caret line="103" column="45" selection-start-line="103" selection-start-column="45" selection-end-line="103" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1541">
-          <caret line="67" column="2" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
+        <state relative-caret-position="23">
+          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="10028">
+          <caret line="454" selection-start-line="454" selection-end-line="454" />
+        </state>
+      </provider>
+    </entry>
+    <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="598">
+          <caret line="65" column="4" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="14" />
         </state>
       </provider>
     </entry>
@@ -1278,23 +1187,128 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.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="92">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+        <state relative-caret-position="384">
+          <caret line="126" column="25" selection-start-line="126" selection-start-column="17" selection-end-line="126" selection-end-column="25" />
+        </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="226">
+          <caret line="35" column="36" lean-forward="true" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
+        </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="-4144">
+          <caret line="145" column="73" selection-start-line="145" selection-start-column="73" selection-end-line="145" selection-end-column="73" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSchoolServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-151">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="410">
+          <caret line="77" column="22" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="77" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="525">
+          <caret line="36" column="28" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTransferRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </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="134">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        </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="552">
+          <caret line="24" column="46" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="618">
+          <caret line="58" column="106" selection-start-line="58" selection-start-column="90" selection-end-line="58" selection-end-column="106" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="687">
+          <caret line="41" column="37" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="541">
+          <caret line="205" column="141" selection-start-line="205" selection-start-column="141" selection-end-line="205" selection-end-column="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1666">
+          <caret line="200" column="58" selection-start-line="200" selection-start-column="58" selection-end-line="200" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="23" column="26" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="26" />
         </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="647">
-          <caret line="2003" column="17" lean-forward="true" selection-start-line="2003" selection-start-column="17" selection-end-line="2003" selection-end-column="17" />
+        <state relative-caret-position="51">
+          <caret line="1738" column="75" selection-start-line="1738" selection-start-column="75" selection-end-line="1738" selection-end-column="75" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="493">
+          <caret line="30" column="44" selection-start-line="30" selection-start-column="25" selection-end-line="30" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="74" column="23" selection-start-line="74" selection-start-column="23" selection-end-line="74" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -124,7 +124,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/dropDown")
     @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
-    CommonResult dropDown(@RequestParam Integer recordId) throws Exception;
+    CommonResult dropDown(@RequestParam Integer recordId);
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")

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

@@ -1723,7 +1723,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @throws Exception
      */
     @Override
-    public CommonResult dropDown(Integer recordId) throws Exception {
+    public CommonResult dropDown(Integer recordId) {
 
         RepairRecord rr = repairRecordService.getRepairById(recordId);
 
@@ -1735,7 +1735,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         Integer articleId = rr.getArticleId();
         Integer schoolId = rr.getSchoolId();
 
-        List<AutoDispatchUserVo> autoDispatchUserVos = repairUserService.dropDown(buildId, articleId, schoolId);
+        //获取转单申请数据 拿到申请人数据，下来数据中不包含申请人
+        RepairTransferRecord tdata = repairTransferRecordService.getRepairByRecordId(recordId);
+        if(tdata == null){
+            return CommonResult.fail("转单申请无效，获取维修师傅数据失败");
+        }
+
+        List<AutoDispatchUserVo> autoDispatchUserVos = repairUserService.dropDown(buildId, articleId, schoolId, tdata.getUserId());
 
         ////将可以接单的师傅显示到协作下拉框中（员工状态 大量接单：1）
         // LambdaQueryWrapper<RepairUser> wrapper = new LambdaQueryWrapper<>();
@@ -1773,6 +1779,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("转单审核数据为空，审核失败");
         }
 
+        if(transferRecord.getUserId().equals(tr.getUserId())){
+            return CommonResult.fail("无法将申请人作为被转单人员");
+        }
+
         RepairRecord rr = repairRecordService.getRepairById(transferRecord.getRecordId());
         if (rr == null) {
             return CommonResult.fail("维修单数据不存在，审核失败");
@@ -1952,6 +1962,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("协作审核数据为空，审核失败");
         }
 
+        if(cor.getCollaborator().contains(collaborateRecord.getUserId())){
+            return CommonResult.fail("请勿将申请人选为协作人");
+        }
+
         RepairRecord rr = repairRecordService.getRepairById(collaborateRecord.getRecordId());
         if (rr == null) {
             return CommonResult.fail("维修单数据不存在，审核失败");
@@ -1984,8 +1998,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             //转单表中的审批操作人和审批状态
             collaborateRecord.setApproverId(senderId);
             collaborateRecord.setApprovalStatu(cor.getApproverStatu());
-            int insertCollaborate = repairCollaborateRecordService.insertRepairCollaborateRecord(collaborateRecord);
-            if (insertCollaborate <= 0) {
+            int updateCollaborate = repairCollaborateRecordService.updateRepairCollaborateRecord(collaborateRecord);
+            if (updateCollaborate <= 0) {
                 throw new Exception("协作审核失败！");
             }
             //同意 批量添加派单数据
@@ -4208,7 +4222,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             throw new Exception("转单审核发起失败！");
         }
 
-        return CommonResult.fail("转单审核发起成功");
+        return CommonResult.ok("转单审核发起成功");
     }
 
     /**

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

@@ -39,5 +39,5 @@ public interface RepairUserMapper extends BaseMapper<RepairUser> {
 
     IPage<PositiveReviewVo> queryPositiveReviewPage(IPage<PositiveReviewVo> page, @Param("schoolId") Integer schoolId);
 
-    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId);
+    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId, Integer userId);
 }

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

@@ -28,5 +28,7 @@ public interface RepairTransferRecordService extends IService<RepairTransferReco
 
     List<RepairTransferRecord> getRepairs();
 
+    RepairTransferRecord getRepairByRecordId(Integer recordId);
+
     TransferDetailVo queryTransferDetail(Integer recordId);
 }

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

@@ -56,7 +56,7 @@ public interface RepairUserService extends IService<RepairUser> {
 
     PageUtils<PositiveReviewVo> queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId);
 
-    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId);
+    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId, Integer userId);
 
     RepairUser queryUserByOpenid(String openId);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.repair.mapper.RepairTransferRecordMapper;
+import com.repair.model.pojo.RepairShiftSettings;
 import com.repair.model.pojo.RepairTransferRecord;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.TransferDetailVo;
@@ -67,6 +68,16 @@ public class RepairTransferRecordServiceImpl extends ServiceImpl<RepairTransferR
     }
 
     @Override
+    public RepairTransferRecord getRepairByRecordId(Integer recordId) {
+
+        QueryWrapper<RepairTransferRecord> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("record_id", recordId);
+        queryWrapper.eq("approval_statu", 2);
+        RepairTransferRecord result = repairTransferRecordMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
     public TransferDetailVo queryTransferDetail(Integer recordId) {
         TransferDetailVo result = repairTransferRecordMapper.queryTransferDetail(recordId);
         return result;

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

@@ -196,9 +196,9 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
     }
 
  @Override
-    public List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId) {
+    public List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId, Integer userId) {
 
-        List<AutoDispatchUserVo> vos=repairUserMapper.dropDown(buildId,articleId,schoolId);
+        List<AutoDispatchUserVo> vos=repairUserMapper.dropDown(buildId,articleId,schoolId,userId);
         return vos;
     }
 

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

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

@@ -203,7 +203,7 @@
         inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
         left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
         left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}
         group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
         order by t.rdr_count
     </select>

target/classes/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

target/classes/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

target/classes/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /repair
 

target/classes/mapper/repair/RepairUserMapper.xml

@@ -203,7 +203,7 @@
         inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
         left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
         left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}
         group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
         order by t.rdr_count
     </select>