修改bug

.idea/workspace.xml

@@ -2,29 +2,15 @@
 <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/api/RepairClassesSettingsControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairClassesSettingsControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.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/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.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/model/vo/TrackDetailsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairNoticeSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairNoticeSettingMapper.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/" />
@@ -57,11 +43,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="430">
-              <caret line="3485" column="59" lean-forward="true" selection-start-line="3485" selection-start-column="59" selection-end-line="3485" selection-end-column="59" />
+            <state relative-caret-position="269">
+              <caret line="3642" column="35" selection-start-line="3642" selection-start-column="24" selection-end-line="3642" selection-end-column="35" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -70,46 +56,46 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.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="276">
-              <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+            <state relative-caret-position="269">
+              <caret line="174" column="28" selection-start-line="174" selection-start-column="17" selection-end-line="174" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.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="-2060">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+            <state relative-caret-position="269">
+              <caret line="140" column="78" selection-start-line="140" selection-start-column="59" selection-end-line="140" selection-end-column="78" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java">
+        <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="115">
-              <caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
+            <state relative-caret-position="269">
+              <caret line="165" column="49" selection-start-line="165" selection-start-column="49" selection-end-line="165" selection-end-column="49" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.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="-940">
-              <caret line="103" column="43" selection-start-line="103" selection-start-column="24" selection-end-line="103" selection-end-column="43" />
+            <state relative-caret-position="269">
+              <caret line="24" column="45" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+      <file pinned="false" current-in-tab="true">
+        <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="135">
-              <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
+            <state relative-caret-position="40">
+              <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
             </state>
           </provider>
         </entry>
@@ -126,36 +112,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>importRepairClassesSettingExcel</find>
-      <find>users</find>
-      <find>days</find>
-      <find>(d</find>
-      <find>Before</find>
-      <find>返回</find>
-      <find>Local</find>
-      <find>LocalDate</find>
-      <find>已派单</find>
-      <find>deleteRepairClassesSettingsById</find>
-      <find>queryRepairSchools</find>
-      <find>InsertRepairClassesSettings</find>
-      <find>downloadRepairClassesExcel</find>
-      <find>queryPageRepairCollaborateRecords</find>
-      <find>deleterepairCollaborateRecordById</find>
-      <find>name</find>
-      <find>queryRepairConsumablePageList</find>
-      <find>queryPageRepairConsume</find>
-      <find>queryMasterHomeCount</find>
-      <find>new RepairTrackRecord()</find>
-      <find>eRecordStatu</find>
-      <find>cancelOrTopNoticeById</find>
-      <find>queryProsperityRepairPayRecords</find>
-      <find>details</find>
-      <find>revert</find>
-      <find>rtr.setContent(&quot;待确认</find>
-      <find>transferToLogistics</find>
-      <find>留言</find>
       <find>getTechniciansByUserId</find>
+      <find>eRecordStatu.ToLogistics.getValue()</find>
+      <find>transferToLogistics</find>
+      <find>协作</find>
+      <find>queryPageRepairClassesSettings</find>
+      <find>statistics</find>
+      <find>restrict</find>
+      <find>InsertRepairRecord</find>
+      <find>queryManageCount</find>
+      <find>alterPriceGoodsName</find>
+      <find>reportExport</find>
+      <find>repairCampus</find>
+      <find>repairAreaExport</find>
+      <find>maintenanceGoods</find>
+      <find>maintenanceGoodsExport</find>
+      <find>queryLogisticHomeCount</find>
+      <find>queryMasterHomeCount</find>
+      <find>queryPositiveReviewPage</find>
+      <find>queryTeamWorkCount</find>
+      <find>queryPageRepairNoticeSetting</find>
+      <find>queryPageRepairNoticeSettings</find>
+      <find>queryNoticePageList</find>
+      <find>autoDispatchUser</find>
       <find>mobileReply</find>
+      <find>Services.queryPageRepairUsers</find>
+      <find>Service.queryPageRepairUser</find>
+      <find>service.queryPageRepairUser</find>
+      <find>userIds</find>
+      <find>queryPageRepairUsers</find>
+      <find>queryPageRepairUser</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -196,21 +182,15 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairUserRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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/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" />
@@ -229,7 +209,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairClassesSettingsControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java" />
@@ -243,10 +222,17 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.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/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.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/services/impl/RepairUserServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -278,7 +264,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -530,7 +516,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../民宿/mhotel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../协助开发空调项目/airManageDevelopV" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Artifacts" />
@@ -705,12 +691,12 @@
       <workItem from="1693183046072" duration="10553000" />
       <workItem from="1693211278627" duration="89000" />
       <workItem from="1693211400881" duration="1142000" />
-      <workItem from="1693212744516" duration="23158000" />
+      <workItem from="1693212744516" duration="39402000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="960455000" />
+    <option name="totallyTimeSpent" value="976699000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -722,7 +708,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -734,11 +720,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 active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.18230277" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.37417942" />
       <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.74585634" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.49171272" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.759116" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.48687088" />
       <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" />
@@ -754,7 +740,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.3129103" />
+      <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" />
@@ -853,23 +839,11 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>594</line>
-          <properties />
-          <option name="timeStamp" value="324" />
-        </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>1339</line>
           <properties />
           <option name="timeStamp" value="331" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>312</line>
-          <properties />
-          <option name="timeStamp" value="332" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
           <line>642</line>
           <properties />
@@ -883,125 +857,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-        </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="138">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
-        </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="-759">
-          <caret line="67" column="81" selection-start-line="67" selection-start-column="81" selection-end-line="67" selection-end-column="81" />
-        </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="-740">
-          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairAreaMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="34" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="166" column="27" selection-start-line="166" selection-start-column="27" selection-end-line="166" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAreaControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="183" column="24" selection-start-line="183" selection-start-column="24" selection-end-line="183" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <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/controller/RepairClassesSettingsController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2097">
-          <caret line="573" column="17" selection-start-line="573" selection-start-column="17" selection-end-line="573" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-188">
-          <caret line="30" column="24" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairClassesSettingsControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="42" column="60" lean-forward="true" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="97" column="17" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairClose.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCloseControllerAPI.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/common/utils/StrUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="456">
-          <caret line="100" selection-start-line="100" selection-end-line="100" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="53" selection-start-line="8" selection-start-column="53" selection-end-line="8" selection-end-column="53" />
-        </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="157">
@@ -1064,13 +919,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="713" column="4" selection-start-line="713" selection-start-column="4" selection-end-line="717" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="506">
@@ -1085,13 +933,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
@@ -1152,13 +993,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
-          <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RefundableAmountRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -1166,13 +1000,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
@@ -1208,17 +1035,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-940">
-          <caret line="103" column="43" selection-start-line="103" selection-start-column="24" selection-end-line="103" selection-end-column="43" />
+        <state relative-caret-position="1373">
+          <caret line="166" column="20" lean-forward="true" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
         </state>
       </provider>
     </entry>
@@ -1236,23 +1056,180 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="176" column="78" lean-forward="true" selection-start-line="176" selection-start-column="78" selection-end-line="176" selection-end-column="78" />
+        </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="276">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="379">
+          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="611" column="26" selection-start-line="611" selection-start-column="26" selection-end-line="611" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-50">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <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/api/RepairUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-276">
+          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="338">
+          <caret line="516" column="91" selection-start-line="513" selection-start-column="9" selection-end-line="516" selection-end-column="91" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="78" column="97" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="97" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="57" column="82" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="82" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
         </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="430">
-          <caret line="3485" column="59" lean-forward="true" selection-start-line="3485" selection-start-column="59" selection-end-line="3485" selection-end-column="59" />
+        <state relative-caret-position="269">
+          <caret line="3642" column="35" selection-start-line="3642" selection-start-column="24" selection-end-line="3642" selection-end-column="35" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </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="269">
+          <caret line="174" column="28" selection-start-line="174" selection-start-column="17" selection-end-line="174" selection-end-column="28" />
+        </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="288">
+          <caret line="146" column="58" lean-forward="true" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
+        </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="269">
+          <caret line="24" column="45" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="165" column="49" selection-start-line="165" selection-start-column="49" selection-end-line="165" selection-end-column="49" />
+        </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="269">
+          <caret line="140" column="78" selection-start-line="140" selection-start-column="59" selection-end-line="140" selection-end-column="78" />
+        </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="40">
+          <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -45,11 +45,11 @@ public interface RepairPayRecordControllerAPI {
 
     @GetMapping(value = "/statistics")
     @ApiOperation(value = "统计", notes = "统计", httpMethod = "GET")
-    CommonResult statistics() throws Exception;
+    CommonResult statistics();
 
     @GetMapping(value = "/restrict")
     @ApiOperation(value = "限制实退金额", notes = "限制实退金额", httpMethod = "GET")
-    CommonResult restrict(@RequestParam int payRecordId) throws Exception;
+    CommonResult restrict(@RequestParam int payRecordId);
 
     @GetMapping(value = "/queryExport")
     @ApiOperation(value = "支付成功记录导出", notes = "支付成功记录导出", httpMethod = "GET")

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

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairReceivingController"}, value = "接单记录")
 public interface RepairReceivingControllerAPI {
 
-    @PostMapping(value = "/insertrepairReceiving")
+    @PostMapping(value = "/insertRepairReceiving")
     @ApiOperation(value = "添加接单记录", notes = "添加接单记录数据", httpMethod = "POST")
-    CommonResult InsertrepairReceiving(@Validated @RequestBody RepairReceiving rc, BindingResult bindingResult);
+    CommonResult insertRepairReceiving(@Validated @RequestBody RepairReceiving rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairReceivingById")
+    @PostMapping(value = "/updateRepairReceivingById")
     @ApiOperation(value = "编辑接单记录数据", notes = "编辑接单记录数据", httpMethod = "POST")
-    CommonResult updaterepairReceivingById(@Validated @RequestBody RepairReceiving rc, BindingResult bindingResult);
+    CommonResult updateRepairReceivingById(@Validated @RequestBody RepairReceiving rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairReceiving")
+    @GetMapping(value = "/queryPageRepairReceiving")
     @ApiOperation(value = "接单记录分页数据", notes = "接单记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairReceivings(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairReceivings(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairReceivingById")
+    @GetMapping(value = "/deleteRepairReceivingById")
     @ApiOperation(value = "根据ID删除指定接单记录", notes = "根据ID删除指定接单记录", httpMethod = "GET")
-    CommonResult deleterepairReceivingById(@RequestParam int id);
+    CommonResult deleteRepairReceivingById(@RequestParam int id);
 }

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

@@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletResponse;
 @Api(tags = {"RepairRecordController"}, value = "报修记录")
 public interface RepairRecordControllerAPI {
 
-
     @PostMapping(value = "/pay")
     @ApiOperation(value = "微信支付", notes = "微信支付", httpMethod = "POST")
     CommonResult pay(@Validated @RequestBody WxPayRequest wpr, BindingResult bindingResult) throws Exception;
@@ -157,7 +156,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/alterPriceGoodsName")
     @ApiOperation(value = "改价耗材名称下拉框", notes = "改价耗材名称下拉框", httpMethod = "GET")
-    CommonResult alterPriceGoodsName(@RequestParam int schoolId, @RequestParam int articleId) throws Exception;
+    CommonResult alterPriceGoodsName(@RequestParam int schoolId, @RequestParam int articleId);
 
     @PostMapping(value = "/alterPrice")
     @ApiOperation(value = "改价", notes = "改价", httpMethod = "POST")
@@ -177,7 +176,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/reportExport")
     @ApiOperation(value = "报表导出", notes = "报表导出", httpMethod = "GET")
-    void reportExport(HttpServletResponse response, String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
+    void reportExport(HttpServletResponse response, String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead);
 
     @GetMapping(value = "/queryMasterHomeCount")
     @ApiOperation(value = "维修师傅首页头部数量", notes = "维修师傅首页头部数量", httpMethod = "GET")
@@ -189,7 +188,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairCampus")
     @ApiOperation(value = "报修校区统计", notes = "报修校区统计", httpMethod = "GET")
-    CommonResult repairCampus(@RequestParam int state) throws Exception;
+    CommonResult repairCampus(@RequestParam int state);
 
     @GetMapping(value = "/repairArea")
     @ApiOperation(value = "报修区域统计", notes = "报修区域统计", httpMethod = "GET")
@@ -197,23 +196,23 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairAreaExport")
     @ApiOperation(value = "报修区域统计导出", notes = "报修区域统计导出", httpMethod = "GET")
-    void repairAreaExport(HttpServletResponse response, @RequestParam int state) throws Exception;
+    void repairAreaExport(HttpServletResponse response, @RequestParam int state);
 
     @GetMapping(value = "/maintenanceGoods")
     @ApiOperation(value = "维修物品统计", notes = "维修物品统计", httpMethod = "GET")
-    CommonResult maintenanceGoods(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
+    CommonResult maintenanceGoods(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount);
 
     @GetMapping(value = "/maintenanceGoodsExport")
     @ApiOperation(value = "维修物品统计导出", notes = "维修物品统计导出", httpMethod = "GET")
-    void maintenanceGoodsExport(HttpServletResponse response, @RequestParam int state) throws Exception;
+    void maintenanceGoodsExport(HttpServletResponse response, @RequestParam int state);
 
     @GetMapping(value = "/maintenanceWorker")
     @ApiOperation(value = "维修师傅效率统计", notes = "维修师傅效率统计", httpMethod = "GET")
-    CommonResult maintenanceWorker(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
+    CommonResult maintenanceWorker(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount);
 
     @GetMapping(value = "/maintenanceWorkerExport")
     @ApiOperation(value = "维修师傅效率统计导出", notes = "维修师傅效率统计导出", httpMethod = "GET")
-    void maintenanceWorkerExport(HttpServletResponse response, @RequestParam int state) throws Exception;
+    void maintenanceWorkerExport(HttpServletResponse response, @RequestParam int state);
 
     @GetMapping(value = "/repairAnalysis")
     @ApiOperation(value = "报修分析统计", notes = "报修分析统计", httpMethod = "GET")

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

@@ -103,9 +103,9 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     /**
      * 支付记录分页数据查询
-     * @param currentPage
-     * @param pageCount
-     * @param name
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
      * @return
      */
     @Override
@@ -115,6 +115,11 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除支付记录
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairPayRecordById(int id) {
         RepairPayRecord data = repairPayRecordService.getRepairById(id);
@@ -127,6 +132,12 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 假的报修工单支付
+     * @param rpr 报修工单支付
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult repairPayment(repairPayRequest rpr, BindingResult bindingResult) {
         System.out.println("开始支付"+ JSON.toJSON(rpr));
@@ -279,11 +290,11 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
     /**
      * 支付成功分页
      *
-     * @param currentPage
-     * @param pageCount
-     * @param keyWord
-     * @param startTime
-     * @param endTime
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param keyWord 关键字
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
     @Override
@@ -523,10 +534,9 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
     /**
      * 统计
      * @return
-     * @throws Exception
      */
     @Override
-    public CommonResult statistics() throws Exception {
+    public CommonResult statistics(){
         LambdaQueryWrapper<RepairPayRecord> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue());
 
@@ -557,12 +567,12 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     /**
      * 限制实退金额
-     * @param payRecordId
+     * @param payRecordId 维修记录ID
      * @return
      * @throws Exception
      */
     @Override
-    public CommonResult restrict(int payRecordId) throws Exception {
+    public CommonResult restrict(int payRecordId){
 
         RepairPayRecord payRecord = repairPayRecordService.getById(payRecordId);
 
@@ -594,7 +604,13 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return CommonResult.fail();
     }
 
-
+    /**
+     * 支付导出
+     * @param response 文件响应流
+     * @param keyWord 关键字
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     */
     @Override
     public void queryExport(HttpServletResponse response, String keyWord, String startTime, String endTime) {
 

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

@@ -25,8 +25,14 @@ public class RepairReceivingController implements RepairReceivingControllerAPI {
     @Autowired
     private RepairReceivingService repairReceivingService;
 
+    /**
+     * 新增接单数据
+     * @param rc 判单数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairReceiving(RepairReceiving rc, BindingResult bindingResult) {
+    public CommonResult insertRepairReceiving(RepairReceiving rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairReceivingController implements RepairReceivingControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新接单数据
+     * @param rc 接单数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairReceivingById(RepairReceiving rc, BindingResult bindingResult) {
+    public CommonResult updateRepairReceivingById(RepairReceiving rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairReceivingController implements RepairReceivingControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 接单分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairReceivings(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairReceivings(int currentPage, int pageCount, String name) {
         PageUtils<RepairReceiving> result = repairReceivingService.queryPageRepairReceivings(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除接单数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairReceivingById(int id) {
+    public CommonResult deleteRepairReceivingById(int id) {
         RepairReceiving data = repairReceivingService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");

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

@@ -42,14 +42,12 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
 
     @Override
     public PageUtils<RepairUser> queryPageRepairUser(int currentPage, int pageCount) {
-        //ru.user_zzid = 1 or ru.user_zzid = 2 or ru.user_zzid = 3
+        //ru.user_zzid = 1 or ru.user_zzid = 2
         Page<RepairUser> page = new Page<>(currentPage, pageCount);
         QueryWrapper<RepairUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq("user_zzid", 1)
                 .or()
-                .eq("user_zzid", 2)
-                .or()
-                .eq("user_zzid", 3));
+                .eq("user_zzid", 2));
         IPage<RepairUser> result = repairUserMapper.selectPage(page, queryWrapper);
         return new PageUtils(result);
     }

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

@@ -11,7 +11,7 @@
     </resultMap>
 
     <select id="queryNoticePageList" resultType="com.repair.model.vo.NoticePageVo" resultMap="repairNoticePageMap">
-        SELECT rns.id,rns.content,ra.username,rns.update_time,rns.is_top FROM repair_notice_setting rns
+        SELECT rns.id,rns.content,ra.username,rns.create_time update_time,rns.is_top FROM repair_notice_setting rns
         left join repair_admin ra on ra.id = rns.update_user and ra.deleted = 0
         <where>
             and rns.deleted =0
@@ -19,6 +19,6 @@
                 and rns.update_time BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
-        order by rns.update_time desc
+        order by rns.create_time desc
     </select>
 </mapper>

target/classes/mapper/repair/RepairNoticeSettingMapper.xml

@@ -11,7 +11,7 @@
     </resultMap>
 
     <select id="queryNoticePageList" resultType="com.repair.model.vo.NoticePageVo" resultMap="repairNoticePageMap">
-        SELECT rns.id,rns.content,ra.username,rns.update_time,rns.is_top FROM repair_notice_setting rns
+        SELECT rns.id,rns.content,ra.username,rns.create_time update_time,rns.is_top FROM repair_notice_setting rns
         left join repair_admin ra on ra.id = rns.update_user and ra.deleted = 0
         <where>
             and rns.deleted =0
@@ -19,6 +19,6 @@
                 and rns.update_time BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
-        order by rns.update_time desc
+        order by rns.create_time desc
     </select>
 </mapper>