提交bug修改代码

.idea/workspace.xml

@@ -2,10 +2,16 @@
 <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/model/vo/RepairAnalysisVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairDispatchRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairDispatchRecordMapper.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/" />
@@ -38,11 +44,11 @@
   </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="3397">
-              <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
+            <state relative-caret-position="53">
+              <caret line="1005" column="86" selection-start-line="1005" selection-start-column="86" selection-end-line="1005" selection-end-column="86" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -51,37 +57,24 @@
         </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="81">
-              <caret line="1289" column="74" selection-start-line="1289" selection-start-column="74" selection-end-line="1289" selection-end-column="74" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java">
+        <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="368">
-              <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
+            <state relative-caret-position="55">
+              <caret line="168" column="44" selection-start-line="168" selection-start-column="24" selection-end-line="168" selection-end-column="44" />
               <folding>
-                <element signature="e#453#454#0" expanded="true" />
-                <element signature="e#496#497#0" expanded="true" />
-                <element signature="e#722#723#0" expanded="true" />
-                <element signature="e#766#767#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="15" column="37" selection-start-line="15" selection-start-column="37" selection-end-line="15" selection-end-column="37" />
+            <state relative-caret-position="269">
+              <caret line="28" column="53" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="53" />
               <folding>
-                <element signature="e#258#259#0" expanded="true" />
-                <element signature="e#302#303#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -99,9 +92,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>closeOrder</find>
-      <find>closePCOrder</find>
-      <find>json</find>
       <find>协作待审核</find>
       <find>处理中</find>
       <find>insertMaintenanceConsumables</find>
@@ -114,7 +104,6 @@
       <find>delayed</find>
       <find>repairPayment</find>
       <find>StringUtils.join</find>
-      <find>queryManagePage</find>
       <find>queryTeamWorkTimeout</find>
       <find>finishOrder</find>
       <find>queryTeamWorkPage</find>
@@ -129,6 +118,10 @@
       <find>'-','维修超时'</find>
       <find>repairTotalData</find>
       <find>queryTimeOut</find>
+      <find>deleteRepairAdminById</find>
+      <find>deleteRepairUserSettingById</find>
+      <find>deleteRepairUserById</find>
+      <find>queryManagePage</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -169,10 +162,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" />
@@ -197,7 +186,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairUserRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
@@ -209,17 +197,22 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
   </component>
@@ -251,8 +244,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -495,14 +489,15 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.template" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
-    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.repair.model.vo" />
       <recent name="com.repair.model.enumModel" />
@@ -510,11 +505,10 @@
       <recent name="com.repair.api" />
       <recent name="com.repair.common.utils" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\mapper\repair" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources" />
-      <recent name="D:\Bingo\Desktop\工作内容\报修系统\Back-endDevelopmentFramework\src\main\resources\mapper\video" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils" />
+      <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -654,12 +648,13 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="76924000" />
+      <workItem from="1692753806714" duration="77298000" />
+      <workItem from="1693183046072" duration="5178000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="925139000" />
+    <option name="totallyTimeSpent" value="930691000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -683,11 +678,11 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.14605543" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.17697228" />
       <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.69502765" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8074398" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.7149171" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.78118163" />
       <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" />
@@ -703,7 +698,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.8205689" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.7757112" />
       <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" />
@@ -862,7 +857,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1227</line>
+          <line>1226</line>
           <properties />
           <option name="timeStamp" value="331" />
         </line-breakpoint>
@@ -886,41 +881,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="94" column="38" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="38" />
-        </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="-257">
-          <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/request/ReceiveSendOrdersRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="449">
-          <caret line="41" column="43" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="43" />
-        </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="430">
-          <caret line="51" column="92" selection-start-line="51" selection-start-column="92" selection-end-line="51" selection-end-column="92" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="148">
@@ -970,20 +930,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="35" column="27" lean-forward="true" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="18" column="34" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1019,13 +965,6 @@
         </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="269">
-          <caret line="372" column="19" selection-start-line="372" selection-start-column="16" selection-end-line="372" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="805">
@@ -1033,13 +972,6 @@
         </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="644">
-          <caret line="54" column="149" selection-start-line="54" selection-start-column="149" selection-end-line="54" selection-end-column="149" />
-        </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="595">
@@ -1054,13 +986,6 @@
         </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="172">
-          <caret line="187" column="56" selection-start-line="187" selection-start-column="56" selection-end-line="187" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/net/URLDecoder.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
@@ -1103,16 +1028,6 @@
         </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="177">
-          <caret line="18" column="33" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
@@ -1120,16 +1035,6 @@
         </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="476">
-          <caret line="52" column="40" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="338">
@@ -1137,20 +1042,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="48" column="50" selection-start-line="48" selection-start-column="50" selection-end-line="48" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14">
-          <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="32">
@@ -1202,13 +1093,6 @@
         </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="253">
-          <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="509">
@@ -1227,55 +1111,164 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="29647">
+          <caret line="1289" column="73" selection-start-line="1289" selection-start-column="73" selection-end-line="1289" selection-end-column="73" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="15" column="37" selection-start-line="15" selection-start-column="37" selection-end-line="15" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
+        <state relative-caret-position="608">
+          <caret line="45" column="131" selection-start-line="45" selection-start-column="131" selection-end-line="45" selection-end-column="131" />
+          <folding>
+            <element signature="e#453#454#0" expanded="true" />
+            <element signature="e#517#518#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="89">
+          <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="13" column="27" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="27" />
+        </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="4301">
+          <caret line="187" column="56" selection-start-line="187" selection-start-column="56" selection-end-line="187" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="24" column="81" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="81" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="70" lean-forward="true" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="46" selection-start-line="46" selection-end-line="46" />
+          <folding>
+            <element signature="e#725#726#0" expanded="true" />
+          </folding>
+        </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="545">
+          <caret line="372" column="19" selection-start-line="372" selection-start-column="16" selection-end-line="372" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1913">
+          <caret line="28" column="13" lean-forward="true" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="677">
+          <caret line="47" column="19" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1456#1457#0" expanded="true" />
-            <element signature="e#1512#1513#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.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="276">
-          <caret line="15" column="37" selection-start-line="15" selection-start-column="37" selection-end-line="15" selection-end-column="37" />
+        <state relative-caret-position="287">
+          <caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
+        </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="269">
+          <caret line="28" column="53" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="53" />
           <folding>
-            <element signature="e#258#259#0" expanded="true" />
-            <element signature="e#302#303#0" expanded="true" />
+            <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/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3397">
-          <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
+        <state relative-caret-position="55">
+          <caret line="168" column="44" selection-start-line="168" selection-start-column="24" selection-end-line="168" selection-end-column="44" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="1289" column="74" selection-start-line="1289" selection-start-column="74" selection-end-line="1289" selection-end-column="74" />
+        <state relative-caret-position="609">
+          <caret line="147" column="16" selection-start-line="147" selection-start-column="16" selection-end-line="147" selection-end-column="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
+        <state relative-caret-position="253">
+          <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
+        </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="53">
+          <caret line="1005" column="86" selection-start-line="1005" selection-start-column="86" selection-end-line="1005" selection-end-column="86" />
           <folding>
-            <element signature="e#453#454#0" expanded="true" />
-            <element signature="e#496#497#0" expanded="true" />
-            <element signature="e#722#723#0" expanded="true" />
-            <element signature="e#766#767#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -1004,7 +1004,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 List<RepairConsumables> consumables = repairConsumablesService.getRepairsByRecordIds(recordIds);
                 for (RepairRecordPageVo r : result.getList()) {
                     if (r.getMaintenanceState() == eRecordStatu.ToLogistics.getValue()
-                            || r.getMaintenanceState() == eRecordStatu.Maintenance.getValue()
                             || r.getMaintenanceState() == eRecordStatu.Transfer.getValue()
                             || r.getMaintenanceState() == eRecordStatu.Collaborate.getValue()) {
                         long consumable = consumables.stream().filter(e -> e.getRecordId() == r.getId()).count();

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

@@ -12,6 +12,7 @@ import com.repair.model.request.updateUserDataRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.*;
+import com.repair.services.RepairDispatchRecordService;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairUserService;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +42,8 @@ public class RepairUserController implements RepairUserControllerAPI {
     private RepairUserService repairUserService;
     @Autowired
     private RepairRecordService repairRecordService;
+    @Autowired
+    private RepairDispatchRecordService repairDispatchRecordService;
 
     /**
      * 添加员工数据接口
@@ -170,6 +173,16 @@ public class RepairUserController implements RepairUserControllerAPI {
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
+        //判断是否存在待接单或维修中数据:
+        //接单表中是否存在当前用户ID的数据条数
+        //维修表中是否存在当前用户ID的数据条数
+        DisReceCountVo disCount = repairDispatchRecordService.queryDisReceCount(Integer.valueOf(id));
+        if(disCount != null){
+            if(disCount.getDisCount() > 0 || disCount.getRecCount() > 0){
+                return CommonResult.fail("员工存在待处理工单数据，请先处理该员工的工单数据");
+            }
+        }
+
         int result = repairUserService.deleteRepairUserById(id);
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");

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

@@ -2,6 +2,7 @@ package com.repair.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.pojo.RepairDispatchRecord;
+import com.repair.model.vo.DisReceCountVo;
 import com.repair.model.vo.RepairCardNumberVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -19,4 +20,6 @@ import java.util.List;
 @Repository
 public interface RepairDispatchRecordMapper extends BaseMapper<RepairDispatchRecord> {
     List<RepairCardNumberVo> queryRepairCardNumber(@Param("recordId") Integer recordId);
+
+    DisReceCountVo queryDisReceCount(@Param("userId") Integer userId);
 }

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

@@ -0,0 +1,24 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class DisReceCountVo {
+    /**
+     * 待接单数量
+     */
+    private int disCount;
+
+    /**
+     * 维修中数量
+     */
+    private int recCount;
+}

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

@@ -3,6 +3,7 @@ package com.repair.services;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.DisReceCountVo;
 import com.repair.model.vo.RepairCardNumberVo;
 
 import java.util.List;
@@ -43,4 +44,6 @@ public interface RepairDispatchRecordService extends IService<RepairDispatchReco
     List<RepairDispatchRecord> queryDispatchByRecordId(Integer recordId);
 
     int updateDispatch(Integer recordId, RepairDispatchRecord rdr);
+
+    DisReceCountVo queryDisReceCount(Integer userId);
 }

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

@@ -9,6 +9,7 @@ import com.repair.mapper.RepairDispatchRecordMapper;
 import com.repair.model.enumModel.eDispatchResult;
 import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.DisReceCountVo;
 import com.repair.model.vo.RepairCardNumberVo;
 import com.repair.services.RepairDispatchRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -77,8 +78,8 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
     @Override
     public List<RepairDispatchRecord> queryRepairDispatch(List<Integer> recordIds) {
         QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("record_id",recordIds);
-        queryWrapper.eq("is_lose_efficacy",0);
+        queryWrapper.in("record_id", recordIds);
+        queryWrapper.eq("is_lose_efficacy", 0);
         List<RepairDispatchRecord> result = repairDispatchRecordMapper.selectList(queryWrapper);
         return result;
     }
@@ -86,8 +87,8 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
     @Override
     public int queryDispatchCount(Integer recordId) {
         QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_id",recordId);
-        queryWrapper.eq("is_lose_efficacy",0);
+        queryWrapper.eq("record_id", recordId);
+        queryWrapper.eq("is_lose_efficacy", 0);
         Integer result = repairDispatchRecordMapper.selectCount(queryWrapper);
         return result;
     }
@@ -95,9 +96,9 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
     @Override
     public RepairDispatchRecord queryOwnRepairDispatch(Integer recordId, Integer userId) {
         QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("record_id",recordId);
-        queryWrapper.eq("users_id",userId);
-        queryWrapper.eq("is_lose_efficacy",0);
+        queryWrapper.in("record_id", recordId);
+        queryWrapper.eq("users_id", userId);
+        queryWrapper.eq("is_lose_efficacy", 0);
         RepairDispatchRecord result = repairDispatchRecordMapper.selectOne(queryWrapper);
         return result;
     }
@@ -127,8 +128,14 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
     @Override
     public int updateDispatch(Integer recordId, RepairDispatchRecord rdr) {
         QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("record_id",recordId);
-        int result = repairDispatchRecordMapper.update(rdr,queryWrapper);
+        queryWrapper.in("record_id", recordId);
+        int result = repairDispatchRecordMapper.update(rdr, queryWrapper);
+        return result;
+    }
+
+    @Override
+    public DisReceCountVo queryDisReceCount(Integer userId) {
+        DisReceCountVo result = repairDispatchRecordMapper.queryDisReceCount(userId);
         return result;
     }
 

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

@@ -17,5 +17,16 @@
         </where>
     </select>
 
+    <!--查看当员工是否存在待接单或者维修中的数据-->
+    <resultMap type="com.repair.model.vo.DisReceCountVo" id="disReceCountMap">
+        <result property="disCount" column="dis_count"/>
+        <result property="recCount" column="rec_count"/>
+    </resultMap>
+    <select id="queryDisReceCount" resultType="com.repair.model.vo.DisReceCountVo" resultMap="disReceCountMap">
+        select (select Count(*) from repair_dispatch_record
+        where deleted = 0 and is_lose_efficacy = 0 and users_id = #{userId}) as dis_count,
+        (select Count(*) as count from repair_receiving
+        where deleted = 0 and is_lose_efficacy = 0 and user_id = #{userId}) as rec_count
+    </select>
 
 </mapper>

target/classes/mapper/repair/RepairDispatchRecordMapper.xml

@@ -17,5 +17,16 @@
         </where>
     </select>
 
+    <!--查看当员工是否存在待接单或者维修中的数据-->
+    <resultMap type="com.repair.model.vo.DisReceCountVo" id="disReceCountMap">
+        <result property="disCount" column="dis_count"/>
+        <result property="recCount" column="rec_count"/>
+    </resultMap>
+    <select id="queryDisReceCount" resultType="com.repair.model.vo.DisReceCountVo" resultMap="disReceCountMap">
+        select (select Count(*) from repair_dispatch_record
+        where deleted = 0 and is_lose_efficacy = 0 and users_id = #{userId}) as dis_count,
+        (select Count(*) as count from repair_receiving
+        where deleted = 0 and is_lose_efficacy = 0 and user_id = #{userId}) as rec_count
+    </select>
 
 </mapper>

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

@@ -59,6 +59,7 @@ com\repair\core\CORSConfiguration.class
 com\repair\services\impl\RepairClassesSettingsServiceImpl.class
 com\repair\services\impl\RepairCollaborateRecordServiceImpl.class
 com\repair\controller\RepairClassesSettingsController.class
+com\repair\model\vo\DisReceCountVo.class
 com\repair\common\utils\DateUtils.class
 com\repair\controller\RepairArticleTypeController.class
 com\repair\services\impl\WxAccessTokenServiceImpl.class

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

@@ -51,6 +51,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemMessagesMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTrackRecordService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\DisReceCountVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassSettingDateVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairCardNumberVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\UnitTimeHelpModel.java