修改bug

.idea/workspace.xml

@@ -2,28 +2,29 @@
 <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/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/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/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/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/request/MaintenanceConsumeablesRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ProsperityRepairPayRecordsVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/QueryExportVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/QueryExportVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/StatisticsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/StatisticsVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/UnreadMessageCountVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/UnreadMessageCountVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" 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/RepairPayRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.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$/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/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/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/" />
@@ -56,11 +57,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="24863">
-              <caret line="1570" column="7" selection-start-line="1570" selection-start-column="7" selection-end-line="1570" selection-end-column="7" />
+            <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" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -69,82 +70,46 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="292">
-              <caret line="84" column="98" selection-start-line="84" selection-start-column="76" selection-end-line="84" selection-end-column="98" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="1998">
-              <caret line="644" column="55" selection-start-line="644" selection-start-column="55" selection-end-line="644" selection-end-column="55" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.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="-23">
-              <caret line="561" column="25" selection-start-line="561" selection-start-column="25" selection-end-line="561" selection-end-column="25" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/UUIDUtils.java">
+        <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="-1117">
-              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="157">
-              <caret line="87" column="5" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-4347">
-              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+        <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="80">
-              <caret line="201" column="62" selection-start-line="201" selection-start-column="62" selection-end-line="201" selection-end-column="62" />
+            <state relative-caret-position="135">
+              <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
             </state>
           </provider>
         </entry>
@@ -161,36 +126,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>delayed</find>
-      <find>repairPayment</find>
-      <find>StringUtils.join</find>
-      <find>queryTeamWorkTimeout</find>
-      <find>finishOrder</find>
-      <find>queryTeamWorkPage</find>
-      <find>queryTeamWorkPending</find>
-      <find>queryTimeout</find>
-      <find>queryManageCount</find>
-      <find>queryNotTimeout</find>
-      <find>RepairRecordPageVo</find>
-      <find>as dispatch_count</find>
-      <find>repairAnalysis</find>
-      <find>'-','维修超时'</find>
-      <find>repairTotalData</find>
-      <find>queryTimeOut</find>
-      <find>deleteRepairAdminById</find>
-      <find>deleteRepairUserSettingById</find>
-      <find>deleteRepairUserById</find>
-      <find>queryManagePage</find>
-      <find>repairSummarizing</find>
-      <find>接单</find>
-      <find>getSTATUS</find>
-      <find>queryPageUserClasses</find>
-      <find>querySystemMessagePage</find>
       <find>importRepairClassesSettingExcel</find>
-      <find>已派单</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>mobileReply</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -231,20 +196,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/UnreadMessageCountVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
-        <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/model/request/insertRepairUserRequest.java" />
@@ -256,7 +207,6 @@
         <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/RepairPayRecordController.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" />
@@ -274,14 +224,29 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/StatisticsVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
+        <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" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" />
+        <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/api/RepairPayRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
       </list>
     </option>
   </component>
@@ -313,7 +278,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -611,7 +576,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.StrUtils">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.repair.AutoCode" />
       <module name="repair_backend" />
@@ -740,12 +705,12 @@
       <workItem from="1693183046072" duration="10553000" />
       <workItem from="1693211278627" duration="89000" />
       <workItem from="1693211400881" duration="1142000" />
-      <workItem from="1693212744516" duration="9504000" />
+      <workItem from="1693212744516" duration="23158000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="946801000" />
+    <option name="totallyTimeSpent" value="960455000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -757,7 +722,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -769,11 +734,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.28118163" />
+      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.18230277" />
       <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.7330416" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.3129103" />
+      <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="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" />
@@ -789,7 +754,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" visible="true" weight="0.38402626" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.3129103" />
       <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" />
@@ -857,12 +822,6 @@
           <option name="timeStamp" value="90" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java</url>
-          <line>176</line>
-          <properties />
-          <option name="timeStamp" value="137" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java</url>
           <line>117</line>
           <properties />
@@ -875,38 +834,8 @@
           <option name="timeStamp" value="219" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java</url>
-          <line>91</line>
-          <properties />
-          <option name="timeStamp" value="229" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java</url>
-          <line>91</line>
-          <properties />
-          <option name="timeStamp" value="243" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>119</line>
-          <properties />
-          <option name="timeStamp" value="244" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java</url>
-          <line>441</line>
-          <properties />
-          <option name="timeStamp" value="260" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java</url>
-          <line>388</line>
-          <properties />
-          <option name="timeStamp" value="265" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java</url>
-          <line>275</line>
+          <line>343</line>
           <properties />
           <option name="timeStamp" value="271" />
         </line-breakpoint>
@@ -923,32 +852,20 @@
           <option name="timeStamp" value="303" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>157</line>
-          <properties />
-          <option name="timeStamp" value="310" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>287</line>
-          <properties />
-          <option name="timeStamp" value="322" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>595</line>
+          <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>1228</line>
+          <line>1227</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>313</line>
+          <line>312</line>
           <properties />
           <option name="timeStamp" value="332" />
         </line-breakpoint>
@@ -958,12 +875,6 @@
           <properties />
           <option name="timeStamp" value="335" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.java</url>
-          <line>100</line>
-          <properties />
-          <option name="timeStamp" value="346" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -972,369 +883,373 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
+        <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/controller/RepairLeaveMessageController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="548">
-          <caret line="43" column="68" selection-start-line="43" selection-start-column="68" selection-end-line="43" selection-end-column="68" />
+        <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/RepairNoticeSettingController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <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/RepairReceivingController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <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/java/com/repair/controller/RepairRefundRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairAreaMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/RepairSchoolController.java">
+    <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="115">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="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/controller/RepairShiftSettingsController.java">
+    <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="295">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+        <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/RepairSystemSettingController.java">
+    <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="295">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="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/controller/RepairTrackRecordController.java">
+    <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="295">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="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/RepairTransferRecordController.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="295">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="-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/controller/RepairUserController.java">
+    <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="3436">
-          <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 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/controller/RepairWorkTypeController.java">
+    <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="295">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <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/WxAccessTokenController.java">
+    <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="322">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="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/services/WxAccessTokenService.java">
+    <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="322">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="18" selection-end-column="40" />
+        <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/services/RepairWorkTypeService.java">
+    <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="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <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/services/RepairUserService.java">
+    <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="575">
-          <caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="8" />
+        <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/java/com/repair/services/RepairTransferRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <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/services/RepairTrackRecordService.java">
+    <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="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="157">
+          <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/services/RepairSystemSettingService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        <state relative-caret-position="269">
+          <caret line="44" column="123" selection-start-line="44" selection-start-column="119" selection-end-line="44" selection-end-column="123" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="341">
+          <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/services/RepairShiftSettingsService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="368">
+          <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSchoolService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+        <state relative-caret-position="246">
+          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRefundRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="253">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="713">
+          <caret line="45" column="111" selection-start-line="45" selection-start-column="107" selection-end-line="45" selection-end-column="111" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairReceivingService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="-747">
+          <caret line="453" selection-start-line="453" selection-end-line="453" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairNoticeSettingService.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="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <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/services/RepairPayRecordService.java">
+    <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="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="506">
+          <caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairLeaveMessageService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eSchool.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairEvaluateService.java">
+    <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="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <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/services/RepairDispatchRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="149">
+          <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/services/RepairConsumeService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="19" column="17" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
+        <state relative-caret-position="341">
+          <caret line="121" column="12" selection-start-line="121" selection-start-column="12" selection-end-line="121" selection-end-column="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="19" column="17" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
+        <state relative-caret-position="46">
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eApprovalStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="69">
+          <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCloseService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+        <state relative-caret-position="46">
+          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairClassesSettingsService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsTop.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="414">
+          <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
+          <folding>
+            <element signature="e#337#338#0" expanded="true" />
+            <element signature="e#365#366#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAreaService.java">
+    <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="276">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        <state relative-caret-position="1882">
+          <caret line="107" column="20" selection-start-line="107" selection-start-column="20" selection-end-line="107" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
+    <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="207">
-          <caret line="14" column="16" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="16" />
+        <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/pojo/RepairTrackRecord.java">
+    <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="591">
-          <caret line="60" selection-start-line="46" selection-start-column="4" selection-end-line="60" />
+        <state relative-caret-position="115">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserScheduleVo.java">
+    <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="-128">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <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/controller/RepairSystemMessagesController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="84" column="98" selection-start-line="84" selection-start-column="76" selection-end-line="84" selection-end-column="98" />
+        <state relative-caret-position="391">
+          <caret line="19" column="26" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
+        <state relative-caret-position="295">
+          <caret line="40" column="19" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/MobileRevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="529">
+          <caret line="25" column="26" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="26" />
         </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/RepairConsumablesController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="24863">
-          <caret line="1570" column="7" selection-start-line="1570" selection-start-column="7" selection-end-line="1570" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="479">
+          <caret line="302" column="54" selection-start-line="302" selection-start-column="54" selection-end-line="302" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1998">
-          <caret line="644" column="55" selection-start-line="644" selection-start-column="55" selection-end-line="644" selection-end-column="55" />
+        <state relative-caret-position="220">
+          <caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+    <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="80">
-          <caret line="201" column="62" selection-start-line="201" selection-start-column="62" selection-end-line="201" selection-end-column="62" />
+        <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/common/utils/TimeExchange.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4347">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/UUIDUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1117">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java">
+    <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="207">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.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="157">
-          <caret line="87" column="5" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-23">
-          <caret line="561" column="25" selection-start-line="561" selection-start-column="25" selection-end-line="561" selection-end-column="25" />
+        <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" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -34,7 +34,7 @@ public interface RepairClassesSettingsControllerAPI {
 
     @GetMapping(value = "/downloadRepairClassesExcel")
     @ApiOperation(value = "导出排班数据", notes = "导出排班数据", httpMethod = "GET")
-    void downloadRepairClassesExcel(String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException;
+    void downloadRepairClassesExcel(String startTime, String endTime, HttpServletResponse response);
 
     @GetMapping(value = "/deleteRepairClassesSettingsById")
     @ApiOperation(value = "根据ID删除指定排班", notes = "根据ID删除指定排班", httpMethod = "GET")

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

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairCollaborateRecordController"}, value = "协作记录")
 public interface RepairCollaborateRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairCollaborateRecord")
+    @PostMapping(value = "/insertRepairCollaborateRecord")
     @ApiOperation(value = "添加协作记录", notes = "添加协作记录数据", httpMethod = "POST")
-    CommonResult InsertrepairCollaborateRecord(@Validated @RequestBody RepairCollaborateRecord rc, BindingResult bindingResult);
+    CommonResult InsertRepairCollaborateRecord(@Validated @RequestBody RepairCollaborateRecord rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairCollaborateRecordById")
+    @PostMapping(value = "/updateRepairCollaborateRecordById")
     @ApiOperation(value = "编辑协作记录数据", notes = "编辑协作记录数据", httpMethod = "POST")
-    CommonResult updaterepairCollaborateRecordById(@Validated @RequestBody RepairCollaborateRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairCollaborateRecordById(@Validated @RequestBody RepairCollaborateRecord rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairCollaborateRecord")
+    @GetMapping(value = "/queryPageRepairCollaborateRecord")
     @ApiOperation(value = "协作记录分页数据", notes = "协作记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairCollaborateRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairCollaborateRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairCollaborateRecordById")
+    @GetMapping(value = "/deleteRepairCollaborateRecordById")
     @ApiOperation(value = "根据ID删除指定协作记录", notes = "根据ID删除指定协作记录", httpMethod = "GET")
-    CommonResult deleterepairCollaborateRecordById(@RequestParam int id);
+    CommonResult deleteRepairCollaborateRecordById(@RequestParam int id);
 }

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

@@ -16,21 +16,21 @@ import java.lang.reflect.InvocationTargetException;
 @Api(tags = {"repairConsumablesController"}, value = "耗材记录")
 public interface RepairConsumablesControllerAPI {
 
-    @PostMapping(value = "/insertrepairConsumables")
+    @PostMapping(value = "/insertRepairConsumables")
     @ApiOperation(value = "添加耗材记录", notes = "添加耗材记录数据", httpMethod = "POST")
-    CommonResult InsertrepairConsumables(@Validated @RequestBody RepairConsumables rc, BindingResult bindingResult);
+    CommonResult InsertRepairConsumables(@Validated @RequestBody RepairConsumables rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairConsumablesById")
+    @PostMapping(value = "/updateRepairConsumablesById")
     @ApiOperation(value = "编辑耗材记录数据", notes = "编辑耗材记录数据", httpMethod = "POST")
-    CommonResult updaterepairConsumablesById(@Validated @RequestBody RepairConsumables rc, BindingResult bindingResult);
+    CommonResult updateRepairConsumablesById(@Validated @RequestBody RepairConsumables rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairConsumables")
+    @GetMapping(value = "/queryPageRepairConsumables")
     @ApiOperation(value = "耗材记录分页数据", notes = "耗材记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairConsumabless(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairConsumabless(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairConsumablesById")
+    @GetMapping(value = "/deleteRepairConsumablesById")
     @ApiOperation(value = "根据ID删除指定耗材记录", notes = "根据ID删除指定耗材记录", httpMethod = "GET")
-    CommonResult deleterepairConsumablesById(@RequestParam int id);
+    CommonResult deleteRepairConsumablesById(@RequestParam int id);
 
     @GetMapping(value = "/queryRepairConsumablePageList")
     @ApiOperation(value = "耗材记录数据", notes = "耗材记录数据", httpMethod = "GET")

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

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairDispatchRecordController"}, value = "派单记录")
 public interface RepairDispatchRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairDispatchRecord")
+    @PostMapping(value = "/insertRepairDispatchRecord")
     @ApiOperation(value = "添加派单记录", notes = "添加派单记录数据", httpMethod = "POST")
-    CommonResult InsertrepairDispatchRecord(@Validated @RequestBody RepairDispatchRecord rc, BindingResult bindingResult);
+    CommonResult InsertRepairDispatchRecord(@Validated @RequestBody RepairDispatchRecord rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairDispatchRecordById")
+    @PostMapping(value = "/updateRepairDispatchRecordById")
     @ApiOperation(value = "编辑派单记录数据", notes = "编辑派单记录数据", httpMethod = "POST")
-    CommonResult updaterepairDispatchRecordById(@Validated @RequestBody RepairDispatchRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairDispatchRecordById(@Validated @RequestBody RepairDispatchRecord rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairDispatchRecord")
+    @GetMapping(value = "/queryPageRepairDispatchRecord")
     @ApiOperation(value = "派单记录分页数据", notes = "派单记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairDispatchRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairDispatchRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairDispatchRecordById")
+    @GetMapping(value = "/deleteRepairDispatchRecordById")
     @ApiOperation(value = "根据ID删除指定派单记录", notes = "根据ID删除指定派单记录", httpMethod = "GET")
-    CommonResult deleterepairDispatchRecordById(@RequestParam int id);
+    CommonResult deleteRepairDispatchRecordById(@RequestParam int id);
 }

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

@@ -13,21 +13,21 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairLeaveMessageController"}, value = "消息留言")
 public interface RepairLeaveMessageControllerAPI {
 
-    @PostMapping(value = "/insertrepairLeaveMessage")
+    @PostMapping(value = "/insertRepairLeaveMessage")
     @ApiOperation(value = "添加消息留言", notes = "添加消息留言数据", httpMethod = "POST")
-    CommonResult InsertrepairLeaveMessage(@Validated @RequestBody RepairLeaveMessage rc, BindingResult bindingResult);
+    CommonResult insertRepairLeaveMessage(@Validated @RequestBody RepairLeaveMessage rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairLeaveMessageById")
+    @PostMapping(value = "/updateRepairLeaveMessageById")
     @ApiOperation(value = "编辑消息留言数据", notes = "编辑消息留言数据", httpMethod = "POST")
-    CommonResult updaterepairLeaveMessageById(@Validated @RequestBody RepairLeaveMessage rc, BindingResult bindingResult);
+    CommonResult updateRepairLeaveMessageById(@Validated @RequestBody RepairLeaveMessage rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairLeaveMessage")
+    @GetMapping(value = "/queryPageRepairLeaveMessage")
     @ApiOperation(value = "消息留言分页数据", notes = "消息留言分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairLeaveMessages(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairLeaveMessages(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairLeaveMessageById")
+    @GetMapping(value = "/deleteRepairLeaveMessageById")
     @ApiOperation(value = "根据ID删除指定消息留言", notes = "根据ID删除指定消息留言", httpMethod = "GET")
-    CommonResult deleterepairLeaveMessageById(@RequestParam int id);
+    CommonResult deleteRepairLeaveMessageById(@RequestParam int id);
 
     @PostMapping(value = "/transferToLogistics")
     @ApiOperation(value = "转后勤", notes = "转后勤", httpMethod = "POST")

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

@@ -15,21 +15,21 @@ import javax.servlet.http.HttpServletResponse;
 @Api(tags = {"repairPayRecordController"}, value = "支付记录")
 public interface RepairPayRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairPayRecord")
+    @PostMapping(value = "/insertRepairPayRecord")
     @ApiOperation(value = "添加支付记录", notes = "添加支付记录数据", httpMethod = "POST")
-    CommonResult InsertrepairPayRecord(@Validated @RequestBody RepairPayRecord rc, BindingResult bindingResult);
+    CommonResult insertRepairPayRecord(@Validated @RequestBody RepairPayRecord rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairPayRecordById")
+    @PostMapping(value = "/updateRepairPayRecordById")
     @ApiOperation(value = "编辑支付记录数据", notes = "编辑支付记录数据", httpMethod = "POST")
-    CommonResult updaterepairPayRecordById(@Validated @RequestBody RepairPayRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairPayRecordById(@Validated @RequestBody RepairPayRecord rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairPayRecord")
+    @GetMapping(value = "/queryPageRepairPayRecord")
     @ApiOperation(value = "支付记录分页数据", notes = "支付记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairPayRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairPayRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
     @GetMapping(value = "/deleterepairPayRecordById")
     @ApiOperation(value = "根据ID删除指定支付记录", notes = "根据ID删除指定支付记录", httpMethod = "GET")
-    CommonResult deleterepairPayRecordById(@RequestParam int id);
+    CommonResult deleteRepairPayRecordById(@RequestParam int id);
 
     @PostMapping(value = "/repairPayment")
     @ApiOperation(value = "支付接口", notes = "支付接口", httpMethod = "POST")

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

@@ -65,7 +65,7 @@ public class LoginController implements LoginControllerAPI {
     @Override
     @PassToken
     public CommonResult queryReduce() {
-        return CommonResult.ok("ip地址为" + wxOpenidConfig.getIpconfig() + "的系统版本为：1V");
+        return CommonResult.ok("ip地址为" + wxOpenidConfig.getIpconfig() + "的系统版本为：4V");
     }
 
     /**

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

@@ -81,10 +81,10 @@ public class RepairAreaController implements RepairAreaControllerAPI {
     }
 
     /**
-     * 区域
-     * @param currentPage
-     * @param pageCount
-     * @param name
+     * 查询区域分页
+     * @param currentPage 当前页
+     * @param pageCount 一页数据条数
+     * @param name 区域名称
      * @return
      */
     @Override
@@ -93,12 +93,21 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 查询校区
+     * @return
+     */
     @Override
     public CommonResult queryRepairSchools() {
         List<RepairSchoolVo> result = repairAreaService.queryRepairSchools();
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据ID删除区域
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairAreaById(int id) {
         RepairArea data = repairAreaService.getRepairById(id);
@@ -111,6 +120,11 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 查询对应校区区域树形图数据
+     * @param schoolId
+     * @return
+     */
     @Override
     public CommonResult queryRepairAreaTree(int schoolId) {
         List<RepairArea> result = repairAreaService.getRepairAreas();
@@ -118,8 +132,11 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return CommonResult.ok(datas);
     }
 
-    /*
-    根据父类ID获取树形菜单数据
+    /**
+     * 根据父类ID获取树形菜单数据
+     * @param parentID 父级ID
+     * @param lists 数据集合
+     * @return
      */
     private List<RepairAreaTreeVo> QueryAreaTreeRecords(Integer parentID, List<RepairArea> lists) {
         List<RepairAreaTreeVo> newTrees = new ArrayList<>();
@@ -145,6 +162,11 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return newTrees;
     }
 
+    /**
+     * 关联楼栋数据获取（总共只获取两级）
+     * @param schoolId 校区ID
+     * @return
+     */
     @Override
     public CommonResult queryRepairAreaSecond(int schoolId) {
         List<RepairArea> result = repairAreaService.getRepairAreas();

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

@@ -39,6 +39,12 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
     @Autowired
     private RepairArticleTypeService repairArticleTypeService;
 
+    /**
+     * 新增报修物品
+     * @param rat 报修物品数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairArticleType(RepairArticleType rat, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -56,6 +62,12 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新报修物品数据
+     * @param uratr 更新的报修物品数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateRepairArticleTypeById(updateRepairArticleTypeRequest uratr, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -77,12 +89,24 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 报修物品分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 报修物品名称
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairArticleTypes(int currentPage, int pageCount, String name) {
         PageUtils<RepairArticleType> result = repairArticleTypeService.queryPageRepairArticleTypes(currentPage, pageCount, name);
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除报修物品
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairArticleTypeById(int id) {
         RepairArticleType data = repairArticleTypeService.getRepairById(id);
@@ -95,6 +119,11 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 根据校区ID查询报修物品树形图结构数据
+     * @param schoolId 校区ID
+     * @return
+     */
     @Override
     public CommonResult queryRepairArticleTypeTree(int schoolId) {
         List<RepairArticleType> result = repairArticleTypeService.getRepairArticleTypesBySchoolId(schoolId);
@@ -103,12 +132,23 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return CommonResult.ok(datas);
     }
 
+    /**
+     * 根据校区查询报修物品数据
+     * @param schoolId
+     * @return
+     */
     @Override
     public CommonResult queryRepairArticleType(int schoolId) {
         List<RepairWorkTypeVo> result = repairArticleTypeService.getRepairArticleTypes(schoolId);
         return CommonResult.ok(result);
     }
 
+    /**
+     * 获取关联耗材数据
+     * @param schoolId 校区ID
+     * @param keyWord 搜索内容
+     * @return
+     */
     @Override
     public CommonResult queryConsumeMaterial(int schoolId, String keyWord) {
         List<RepairArticleChildVo> result = repairArticleTypeService.getRepairParentArticleTypes(schoolId);
@@ -138,8 +178,11 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return CommonResult.ok(result);
     }
 
-    /*
-    根据父类ID获取树形菜单数据
+    /**
+     * 根据父级ID获取树形菜单数据
+     * @param parentID 父级ID
+     * @param lists 数据集合
+     * @return
      */
     private List<RepairArticleTypeTreeVo> QueryArticleTypeTreeRecords(Integer parentID, List<RepairArticleType> lists) {
         List<RepairArticleTypeTreeVo> newTrees = new ArrayList<>();

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

@@ -38,6 +38,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -61,7 +62,14 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
     @Autowired
     private RepairClassesSettingsService repairClassesSettingsService;
 
-
+    /**
+     * 新增排班数据
+     * @param ircr 排版数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws ParseException
+     */
+    @Override
     public CommonResult InsertRepairClassesSettings(insertRepairClassesRequest ircr, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
@@ -94,6 +102,13 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据ID更新排班数据
+     * @param urcr 排班数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws ParseException
+     */
     @Override
     public CommonResult updateRepairClassesSettingsById(updateRepairClassesRequest urcr, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
@@ -105,6 +120,18 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
             return CommonResult.fail("开始日期不能为空");
         }
 
+        RepairClassesSettings rcs = repairClassesSettingsService.getRepairById(urcr.getId());
+        if (rcs == null) {
+            return CommonResult.fail("当前数据不存在，修改失败！");
+        }
+
+        LocalDate dateNow = LocalDate.now();
+
+        //小于等于当天时间的数据不能修改
+        if(rcs.getStartDate().isBefore(dateNow) || rcs.getStartDate().isEqual(dateNow)){
+            return CommonResult.fail("当天及当天以前的排班数据无法进行修改操作！");
+        }
+
         //防止选择的班次重叠
         List<RepairShiftSettings> datas = repairShiftSettingsService.getRepairsByShiftIds(urcr.getShiftIds());
         for (int i = 0; i < datas.size(); i++) {
@@ -116,7 +143,6 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
             }
         }
 
-        RepairClassesSettings rcs = new RepairClassesSettings();
         rcs.setId(urcr.getId());
         rcs.setUserId(urcr.getUserId());
         rcs.setShiftId(StringUtils.join(urcr.getShiftIds(), ','));
@@ -127,6 +153,14 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 查询排班分页数据
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairClassesSettingss(int currentPage, int pageCount, String startTime, String endTime) {
         PageUtils<RepairUser> result = repairUserService.queryPageRepairUser(currentPage, pageCount);
@@ -180,8 +214,14 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return CommonResult.ok(data);
     }
 
+    /**
+     * 排班数据导出
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param response 响应流
+     */
     @Override
-    public void downloadRepairClassesExcel(String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
+    public void downloadRepairClassesExcel(String startTime, String endTime, HttpServletResponse response){
         List<RepairUser> result = repairUserService.queryRepairUsers();
 
         List<Integer> userIds = result.stream().map(RepairUser::getId).collect(Collectors.toList());
@@ -222,10 +262,14 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
             list.add(map);
         }
 
-        ExcelExportUtil.createExcel(list, "testExcel.xlsx", "测试文档", response);
+        ExcelExportUtil.createExcel(list, "testExcel.xlsx", "排班文档", response);
     }
 
-
+    /**
+     * 根据数据ID删除排班数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairClassesSettingsById(int id) {
         RepairClassesSettings data = repairClassesSettingsService.getRepairById(id);
@@ -233,16 +277,33 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
             return CommonResult.fail("当前数据不存在，删除失败！");
         }
 
+        LocalDate dateNow = LocalDate.now();
+        //小于等于当天时间的数据不能删除
+        if(data.getStartDate().isBefore(dateNow) || data.getStartDate().isEqual(dateNow)){
+            return CommonResult.fail("当天及当天以前的排班数据无法进行删除操作！");
+        }
+
         int result = repairClassesSettingsService.deleteRepairClassesSettingsById(id);
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 排班模板导出
+     * @param response 响应流
+     */
     @Override
     public void downloadRepairClassesSettingExcel(HttpServletResponse response) {
         ExcelUtils.fileDownload("/自定义排班模板.xlsx", response);
     }
 
+    /**
+     * 维修师傅首页当天排班分页数据
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param schoolId 校区ID
+     * @return
+     */
     @Override
     public CommonResult queryPageUserClasses(int currentPage, int pageCount, int schoolId) {
         PageUtils<AddressBookVo> result = repairUserService.queryUserPageBySchoolId(currentPage, pageCount, schoolId);
@@ -271,6 +332,13 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return CommonResult.ok(resultPage);
     }
 
+    /**
+     * 后勤首页修改或新增当天排班数据
+     * @param usv 排班数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws ParseException
+     */
     @Override
     public CommonResult updateUserClasses(UserScheduleVo usv, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
@@ -339,6 +407,13 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
 
     }
 
+    /**
+     * 排班数据导入
+     * @param file 导入文件
+     * @return
+     * @throws IOException
+     * @throws ParseException
+     */
     @Override
     public CommonResult importRepairClassesSettingExcel(MultipartFile file) throws IOException, ParseException {
         System.out.println("导入排班");
@@ -374,7 +449,13 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");
     }
 
-
+    /**
+     * xls文件读取方法
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @throws ParseException
+     */
     private CommonResult<List<RepairClassesSettings>> readXls(InputStream inputStream) throws IOException, ParseException {
         int month = 0;
         int year = 0;
@@ -489,6 +570,13 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
         return CommonResult.ok(result);
     }
 
+    /**
+     * Xlsx文件读取方法
+     * @param inputStream
+     * @return
+     * @throws IOException
+     * @throws ParseException
+     */
     private CommonResult<List<RepairClassesSettings>> readXlsx(InputStream inputStream) throws IOException, ParseException {
         int month = 0;
         int year = 0;

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

@@ -27,6 +27,12 @@ public class RepairCloseController implements RepairCloseControllerAPI {
     @Autowired
     private RepairCloseService repairCloseService;
 
+    /**
+     * 新增关单原因
+     * @param rc 关单原因数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairClose(RepairClose rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -39,6 +45,12 @@ public class RepairCloseController implements RepairCloseControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新关单原因
+     * @param rc 关单原因
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateRepairCloseById(RepairClose rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -51,6 +63,13 @@ public class RepairCloseController implements RepairCloseControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 关单原因分页查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 关单名称
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairCloses(int currentPage, int pageCount, String name) {
         PageUtils<RepairClose> result = repairCloseService.queryPageRepairCloses(currentPage, pageCount, name);
@@ -58,6 +77,11 @@ public class RepairCloseController implements RepairCloseControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除关单原因
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairCloseById(int id) {
         RepairClose data = repairCloseService.getRepairById(id);
@@ -70,6 +94,10 @@ public class RepairCloseController implements RepairCloseControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 查询关单原因集合数据
+     * @return
+     */
     @Override
     public CommonResult queryRepairCloses() {
         List<RepairClose> result = repairCloseService.getRepairs();

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

@@ -25,8 +25,14 @@ public class RepairCollaborateRecordController implements RepairCollaborateRecor
     @Autowired
     private RepairCollaborateRecordService repairCollaborateRecordService;
 
+    /**
+     * 新增协作申请数据
+     * @param rc 协作申请数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairCollaborateRecord(RepairCollaborateRecord rc, BindingResult bindingResult) {
+    public CommonResult InsertRepairCollaborateRecord(RepairCollaborateRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairCollaborateRecordController implements RepairCollaborateRecor
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新协作申请数据
+     * @param rc 协作申请数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairCollaborateRecordById(RepairCollaborateRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairCollaborateRecordById(RepairCollaborateRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairCollaborateRecordController implements RepairCollaborateRecor
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 协作申请分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 协作名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairCollaborateRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairCollaborateRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairCollaborateRecord> result = repairCollaborateRecordService.queryPageRepairCollaborateRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除协作申请数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairCollaborateRecordById(int id) {
+    public CommonResult deleteRepairCollaborateRecordById(int id) {
         RepairCollaborateRecord data = repairCollaborateRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");

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

@@ -55,8 +55,14 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
     @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
+    /**
+     * 新增耗材记录
+     * @param rc 耗材记录
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairConsumables(RepairConsumables rc, BindingResult bindingResult) {
+    public CommonResult InsertRepairConsumables(RepairConsumables rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -67,8 +73,14 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新耗材记录
+     * @param rc 耗材记录
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairConsumablesById(RepairConsumables rc, BindingResult bindingResult) {
+    public CommonResult updateRepairConsumablesById(RepairConsumables rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -79,15 +91,27 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 耗材记录分页数据查询
+     * @param currentPage 当前页
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairConsumabless(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairConsumabless(int currentPage, int pageCount, String name) {
         PageUtils<RepairConsumables> result = repairConsumablesService.queryPageRepairConsumabless(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除耗材记录
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairConsumablesById(int id) {
+    public CommonResult deleteRepairConsumablesById(int id) {
         RepairConsumables data = repairConsumablesService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");
@@ -98,6 +122,15 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 耗材记录分页数据查询
+     * @param currentPage 当前页
+     * @param pageCount 一页数据条数
+     * @param keyWord 关键字查询
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @return
+     */
     @Override
     public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
 
@@ -113,6 +146,17 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return CommonResult.ok(result);
     }
 
+    /**
+     * 耗材记录导出
+     * @param keyWord 关键字查询
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @param response 文件响应流
+     * @throws NoSuchMethodException
+     * @throws InstantiationException
+     * @throws IllegalAccessException
+     * @throws InvocationTargetException
+     */
     @Override
     public void downloadRepairConsumableExcel(String keyWord, String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
         Map<String, String> map = new HashMap<>();
@@ -151,6 +195,14 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         ExcelUtils.excelDownload(workbook, "耗材记录.xlsx", response);
     }
 
+    /**
+     * 报价-确认提交
+     * @param data 报价耗材数据
+     * @param userhead userhead请求头数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult InsertMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
@@ -263,6 +315,11 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return CommonResult.ok("报价成功");
     }
 
+    /**
+     * 改价-获取耗材记录数据
+     * @param recordId 维修单记录ID
+     * @return
+     */
     @Override
     public CommonResult queryChangePriceConsumables(Integer recordId) {
         RepairRecord rr = repairRecordService.getRepairById(recordId);
@@ -285,7 +342,14 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         return CommonResult.ok(result);
     }
 
-
+    /**
+     * 改价-确认提交
+     * @param data 改价耗材数据
+     * @param userhead userhead请求头
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult changeMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {

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

@@ -59,6 +59,12 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
     @Autowired
     private RepairArticleTypeService repairArticleTypeService;
 
+    /**
+     * 关联耗材中添加耗材
+     * @param irc 耗材数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairAssociation(insertRepairAssociationRequest irc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -82,6 +88,12 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 新增耗材数据
+     * @param ircr 耗材数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairConsume(insertRepairConsumeRequest ircr, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -106,6 +118,12 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID修改耗材数据
+     * @param urcr 耗材数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateRepairConsumeById(updateRepairConsumeRequest urcr, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -131,6 +149,15 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 耗材管理分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 耗材名称
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime) {
 
@@ -157,6 +184,11 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
 
     }
 
+    /**
+     * 根据数据ID删除耗材数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairConsumeById(int id) {
         RepairConsume data = repairConsumeService.getRepairById(id);
@@ -169,6 +201,17 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 耗材数据导出
+     * @param name 耗材名称
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @param response 文件响应流
+     * @throws NoSuchMethodException
+     * @throws InstantiationException
+     * @throws IllegalAccessException
+     * @throws InvocationTargetException
+     */
     @Override
     public void downloadRepairConsumeExcel(String name, String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
         Map<String, String> map = new HashMap<>();
@@ -205,11 +248,21 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         ExcelUtils.excelDownload(workbook, "耗材管理.xlsx", response);
     }
 
+    /**
+     * 耗材模板数据导出
+     * @param response 文件响应流
+     */
     @Override
     public void downloadRepairConsumeModelExcel(HttpServletResponse response) {
         ExcelUtils.fileDownload("/耗材管理模板.xlsx", response);
     }
 
+    /**
+     * 耗材数据导入
+     * @param file 导入文件
+     * @return
+     * @throws IOException
+     */
     @Override
     public CommonResult importRepairConsumeExcel(MultipartFile file) throws IOException {
         if (file.isEmpty() || file.getSize() == 0) {
@@ -244,6 +297,12 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");
     }
 
+    /**
+     * 导入Xls文件方法
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
     private CommonResult<List<RepairConsume>> readXls(InputStream inputStream) throws IOException {
         HSSFWorkbook sheets = new HSSFWorkbook(inputStream);
         List<RepairConsume> result = new ArrayList<>();
@@ -345,6 +404,12 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 导入Xlsx文件方法
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
     private CommonResult<List<RepairConsume>> readXlsx(InputStream inputStream) throws IOException {
         XSSFWorkbook sheets = new XSSFWorkbook(inputStream);
         List<RepairConsume> result = new ArrayList<>();

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

@@ -25,8 +25,14 @@ public class RepairDispatchRecordController implements RepairDispatchRecordContr
     @Autowired
     private RepairDispatchRecordService repairDispatchRecordService;
 
+    /**
+     * 新增派单记录
+     * @param rc 派单记录
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairDispatchRecord(RepairDispatchRecord rc, BindingResult bindingResult) {
+    public CommonResult InsertRepairDispatchRecord(RepairDispatchRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairDispatchRecordController implements RepairDispatchRecordContr
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新派单记录
+     * @param rc 派单记录
+     * @param bindingResult 是否空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairDispatchRecordById(RepairDispatchRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairDispatchRecordById(RepairDispatchRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairDispatchRecordController implements RepairDispatchRecordContr
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 派单分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairDispatchRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairDispatchRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairDispatchRecord> result = repairDispatchRecordService.queryPageRepairDispatchRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除派单数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairDispatchRecordById(int id) {
+    public CommonResult deleteRepairDispatchRecordById(int id) {
         RepairDispatchRecord data = repairDispatchRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");

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

@@ -49,6 +49,13 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
     @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
+    /**
+     * 新增评价数据
+     * @param repairEvaluate 评价数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult InsertRepairEvaluate(@RequestBody RepairEvaluate repairEvaluate, BindingResult bindingResult) throws Exception {
@@ -128,6 +135,15 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
         return CommonResult.ok("评价成功");
     }
 
+    /**
+     * 评价分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param keyWord 关键字
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord, String startTime, String endTime) {
         PageUtils<RepairEvaluate> result = repairEvaluateService.queryPageList(currentPage, pageCount, keyWord, startTime, endTime);
@@ -135,6 +151,11 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除评价数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairEvaluateById(int id) {
         RepairEvaluate data = repairEvaluateService.getRepairById(id);
@@ -147,6 +168,13 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
         return result > 0 ? CommonResult.ok() : CommonResult.fail();
     }
 
+    /**
+     * 评价报表导出
+     * @param response 文件响应流
+     * @param keyWord 关键字
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     */
     @Override
     public void toRepairEvaluateExcel(HttpServletResponse response, String keyWord, String startTime, String endTime) {
         List<EvaluateVo> result = repairEvaluateService.queryEvaluateList(keyWord, startTime, endTime);

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

@@ -43,8 +43,14 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
     @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
+    /**
+     * 新增留言信息
+     * @param rc 留言信息
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairLeaveMessage(RepairLeaveMessage rc, BindingResult bindingResult) {
+    public CommonResult insertRepairLeaveMessage(RepairLeaveMessage rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -55,8 +61,14 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据数据ID更新留言信息
+     * @param rc 留言信息
+     * @param bindingResult
+     * @return
+     */
     @Override
-    public CommonResult updaterepairLeaveMessageById(RepairLeaveMessage rc, BindingResult bindingResult) {
+    public CommonResult updateRepairLeaveMessageById(RepairLeaveMessage rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -67,15 +79,16 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+
     @Override
-    public CommonResult queryPagerepairLeaveMessages(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairLeaveMessages(int currentPage, int pageCount, String name) {
         PageUtils<RepairLeaveMessage> result = repairLeaveMessageService.queryPageRepairLeaveMessages(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
     @Override
-    public CommonResult deleterepairLeaveMessageById(int id) {
+    public CommonResult deleteRepairLeaveMessageById(int id) {
         RepairLeaveMessage data = repairLeaveMessageService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");

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

@@ -99,14 +99,12 @@ public class RepairNoticeSettingController implements RepairNoticeSettingControl
             String Message = isTop == eIsTop.Top.getValue() ? "当前处于置顶状态，请勿重复操作！" : "当前处于未置顶状态，请勿重复操作！";
             return CommonResult.fail(Message);
         }
-
         String success = isTop == eIsTop.Top.getValue() ? "置顶成功！" : "取消置顶成功";
         String fail = isTop == eIsTop.Top.getValue() ? "置顶失败！" : "取消置顶失败";
         RepairNoticeSetting ra = new RepairNoticeSetting();
         ra.setId(id);
         ra.setIsTop(isTop);
         int result = repairNoticeSettingService.updateRepairNoticeSetting(ra);
-        System.out.println(result);
         return result > 0 ? CommonResult.ok(success) : CommonResult.fail(fail);
     }
 
@@ -127,6 +125,10 @@ public class RepairNoticeSettingController implements RepairNoticeSettingControl
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 获取首页公告展示数据
+     * @return
+     */
     @Override
     public CommonResult queryRepairNoticeSettingByTop() {
         List<RepairNoticeSetting> result = repairNoticeSettingService.getRepairNotices();

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

@@ -65,8 +65,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
     @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
+    /**
+     * 新增支付记录
+     * @param rc 支付记录数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairPayRecord(RepairPayRecord rc, BindingResult bindingResult) {
+    public CommonResult insertRepairPayRecord(RepairPayRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -77,8 +83,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 根据维修单id更新支付记录
+     * @param rc 支付记录
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairPayRecordById(RepairPayRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairPayRecordById(RepairPayRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -89,15 +101,22 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 支付记录分页数据查询
+     * @param currentPage
+     * @param pageCount
+     * @param name
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairPayRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairPayRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairPayRecord> result = repairPayRecordService.queryPageRepairPayRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
     @Override
-    public CommonResult deleterepairPayRecordById(int id) {
+    public CommonResult deleteRepairPayRecordById(int id) {
         RepairPayRecord data = repairPayRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在，删除失败！");
@@ -284,7 +303,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             pageCount = 10;
         }
 
-//      判断是否为名字
+        //判断是否为名字
         LambdaQueryWrapper<RepairUser> userWrapper = new LambdaQueryWrapper<>();
         userWrapper.like(ObjectUtils.isNotEmpty(keyWord), RepairUser::getUserName, keyWord);
 
@@ -331,14 +350,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
         ArrayList<ProsperityRepairPayRecordsVo> vos = new ArrayList<>();
 
-//    订单号
+        //订单号
         ArrayList<Integer> recordIdList = new ArrayList<>();
 
-//        报修人id
+        //报修人id
         List<Integer> userIds = new ArrayList<>();
 
         List<RepairPayRecord> records = page.getRecords();
-//        获取所有订单号
+        //获取所有订单号
         if (ObjectUtils.isEmpty(records)) {
             records.forEach(repairPayRecord -> {
                 recordIdList.add(repairPayRecord.getRecordId());
@@ -346,14 +365,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             });
         }
 
-//        通过订单号查询退款记录
+        //通过订单号查询退款记录
         LambdaQueryWrapper<RepairRefundRecord> rrrsWrapepr = new LambdaQueryWrapper<>();
         rrrsWrapepr.in(RepairRefundRecord::getRecordId, recordIdList)
                 .eq(RepairRefundRecord::getIsSuccess, eIsSuccess.Succeed.getValue());
 
         List<RepairRefundRecord> refundRecords = repairRefundRecordService.list(rrrsWrapepr);
 
-//        通过人员id查询用户
+        //通过人员id查询用户
         LambdaQueryWrapper<RepairUser> userListWrapper = new LambdaQueryWrapper<>();
         userListWrapper.in(RepairUser::getId, userIds)
                 .select(RepairUser::getId, RepairUser::getUserName);
@@ -368,12 +387,12 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         records.forEach(rpr -> {
             ProsperityRepairPayRecordsVo prrpv = new ProsperityRepairPayRecordsVo();
             BeanUtils.copyProperties(rpr, prrpv);
-//            交易时间
+            //交易时间
             prrpv.setPayTime(rpr.getCreateTime());
 
             Integer recordId = rpr.getRecordId();
 
-//            工单号
+            //工单号
             for (RepairRecord repairRecord : list1) {
                 Integer id = repairRecord.getId();
                 if (id.equals(recordId)) {
@@ -383,10 +402,10 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
             List<RepairRefundRecord> repairRefundRecords = new ArrayList<>();
 
-//            报修人id
+            //报修人id
             Integer userId = rpr.getUserId();
 
-//            名字
+            //名字
             if (ObjectUtils.isNotEmpty(users) && users.size() > 0) {
                 for (RepairUser user : users) {
                     if (userId.equals(user.getId())) {
@@ -396,9 +415,9 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             }
 
 
-//            退款总金额
+            //退款总金额
             BigDecimal refundPrice = BigDecimal.valueOf(0);
-//            退款记录
+            //退款记录
             if (ObjectUtils.isNotEmpty(refundRecords) && refundRecords.size() > 0) {
                 for (RepairRefundRecord refundRecord : refundRecords) {
                     if (recordId.equals(refundRecord.getRecordId())) {
@@ -407,13 +426,13 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
                     }
                 }
             }
-//            退款总金额
+            //退款总金额
             prrpv.setRefundTotalPrice(refundPrice);
 
-//      状态
+            //状态
             if (repairRefundRecords.size() > 0) {
                 BigDecimal payPrice = rpr.getPayPrice();
-//          实收金额
+                //实收金额
                 BigDecimal officialPrice = payPrice.subtract(refundPrice);
                 prrpv.setOfficialPrice(officialPrice);
                 if (payPrice.compareTo(refundPrice) == 0) {
@@ -438,7 +457,9 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     /**
      * 实退
-     *
+     * @param rar 实退数据
+     * @param userhead userhead请求头
+     * @param bindingResult 是否为空判断
      * @return
      */
     @Override
@@ -447,24 +468,23 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
-//        超级管理员才有实退权限
+        //超级管理员才有实退权限
         String userID = AesUtils.decrypt(userhead);
         RepairAdmin operateData = repairAdminService.getRepairById(userID);
         if (operateData == null && eIsSuper.Super.getValue() == operateData.getIsSuper()) {
             return CommonResult.fail("操作人权限不足，无法使用实退功能！");
         }
 
-
-//      支付订单ID
+        //支付订单ID
         Integer repairPayRecordId = rar.getRepairPayRecordId();
-//      退款金额
+        //退款金额
         BigDecimal refundPrice = rar.getRefundPrice();
 
         RepairPayRecord repairPayRecord = repairPayRecordService.getById(repairPayRecordId);
 
-//        实退金额不能大于剩余金额
+        //实退金额不能大于剩余金额
         Integer recordId = repairPayRecord.getRecordId();
-//        实收金额
+        //实收金额
         BigDecimal payPrice = repairPayRecord.getPayPrice();
         LambdaQueryWrapper<RepairRefundRecord> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(RepairRefundRecord::getRecordId,recordId);
@@ -475,7 +495,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             refundTotal=refundTotal.add(refundPrice1);
         }
 
-//        实收金额减总退款金额在减实退金额，不能小于0
+        //实收金额减总退款金额在减实退金额，不能小于0
         int i = payPrice.subtract(refundTotal).subtract(refundPrice).compareTo(new BigDecimal(0));
         if (i<0) {
             return CommonResult.fail("实退金额有误");
@@ -511,7 +531,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         wrapper.eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue());
 
         List<RepairPayRecord> payRecordList = repairPayRecordService.list(wrapper);
-//        总金额
+        //总金额
         BigDecimal totalPrice=new BigDecimal(0);
         for (RepairPayRecord repairPayRecord : payRecordList) {
             BigDecimal payPrice = repairPayRecord.getPayPrice();
@@ -549,7 +569,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         if (ObjectUtils.isEmpty(payRecord)) {
             return CommonResult.fail("参数异常");
         }
-//        实付金额
+        //实付金额
         BigDecimal payPrice = payRecord.getPayPrice();
 
         Integer recordId = payRecord.getRecordId();
@@ -558,7 +578,7 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         wrapper.eq(RepairRefundRecord::getRecordId,recordId);
 
         List<RepairRefundRecord> refundRecordList = repairRefundRecordService.list(wrapper);
-//      退款总金额
+        //退款总金额
         BigDecimal refundTotalPrice=new BigDecimal(0);
         for (RepairRefundRecord repairRefundRecord : refundRecordList) {
             BigDecimal refundPrice = repairRefundRecord.getRefundPrice();
@@ -611,14 +631,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             for (QueryExportVo queryExportVo : queryExportVoList) {
                 QueryExportVo vo = new QueryExportVo();
                 BeanUtils.copyProperties(queryExportVo, vo);
-//            退款金额
+                //退款金额
                 BigDecimal refundTotalPrice = queryExportVo.getRefundTotalPrice();
                 if (ObjectUtils.isEmpty(refundTotalPrice)) {
                     refundTotalPrice = new BigDecimal(0);
                     vo.setRefundTotalPrice(refundTotalPrice);
                 }
                 BigDecimal payPrice = queryExportVo.getPayPrice();
-//            退款金额=0
+                //退款金额=0
                 if (refundTotalPrice.compareTo(new BigDecimal(0)) == 0) {
                     vo.setStatus("已支付");
                 } else if (payPrice.compareTo(refundTotalPrice) == 0) {

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

@@ -96,7 +96,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     private RepairCollaborateRecordService repairCollaborateRecordService;
 
 
-
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult pay(WxPayRequest wpr, BindingResult bindingResult) throws Exception {
@@ -311,7 +310,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult InsertRepairRecord(repairRecordRequest rrr, BindingResult bindingResult) throws Exception {
-        System.out.println("提交订单"+JSON.toJSON(rrr));
+        System.out.println("提交订单" + JSON.toJSON(rrr));
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -420,7 +419,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     }
 
                 } catch (Exception e) {
-                    System.out.println("提交订单异常"+e.getMessage());
+                    System.out.println("提交订单异常" + e.getMessage());
                     throw new Exception("报修单提交失败！");
                 }
             }
@@ -489,7 +488,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
 
         } catch (Exception e) {
-            System.out.println("提交订单异常2"+e.getMessage());
+            System.out.println("提交订单异常2" + e.getMessage());
             throw new Exception("报修单提交失败！");
         }
 
@@ -765,7 +764,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rsms.add(rsm);
         }
 
-        try{
+        try {
             boolean insertS = repairSystemMessagesService.inserBatchSystemMessage(rsms);
             if (!insertS) {
                 throw new Exception("催单失败！");
@@ -773,10 +772,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             String content = MessageFormat.format("【报修系统】维修师傅，你好，工单{0}用户催单，请及时处理，谢谢！", record.getRecordNo());
             CommonResult result = weiXiaoUtil.sendNotice(cardnumber, "报修工单催单", "催单", content, null);
-            if(!result.getCode().equals("200")){
+            if (!result.getCode().equals("200")) {
                 throw new Exception("催单失败！");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new Exception("催单失败！");
         }
 
@@ -1241,11 +1240,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             //获取操作人的派单数据
             List<RepairDispatchRecord> rdrs = repairDispatchRecordService.queryDispatchByRecordId(recordId);
             RepairDispatchRecord dispatch = null;
-            if(rdrs != null && rdrs.size() > 0){
+            if (rdrs != null && rdrs.size() > 0) {
                 Optional<RepairDispatchRecord> data = rdrs.stream().filter(e -> e.getUsersId().equals(userId)).findFirst();
-                if(data != null && data.isPresent()){
+                if (data != null && data.isPresent()) {
                     dispatch = data.get();
-                }else{
+                } else {
                     return CommonResult.fail("该工单存在待处理人，接单失败");
                 }
             }
@@ -1261,7 +1260,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 return CommonResult.fail("当天未排班，无法接单！");
             }
 
-            if(result.getArticleId() == null){
+            if (result.getArticleId() == null) {
                 return CommonResult.fail("无法维修该种类物品！");
             }
             long count = Arrays.asList(result.getArticleId().split(",")).stream().filter(e -> e.equals(recordData.getArticleId().toString())).count();
@@ -1341,7 +1340,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
 
             int disId = 0;
-            if(dispatch == null){
+            if (dispatch == null) {
                 //更新派单记录
                 dispatch = new RepairDispatchRecord();
                 dispatch.setAssignedTime(new Date());
@@ -1354,8 +1353,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 if (insertDispatch <= 0) {
                     throw new Exception("接单失败！");
                 }
-                disId =insertDispatch;
-            }else{
+                disId = insertDispatch;
+            } else {
                 //更新派单记录
                 dispatch.setReceivingTime(nowDate);
                 int updateDispatch = repairDispatchRecordService.updateRepairDispatchRecord(dispatch);
@@ -1434,7 +1433,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         //查询该订单是否存在被派单数据
         List<RepairDispatchRecord> repairDis = repairDispatchRecordService.queryDispatchByRecordId(rsor.getRecordId());
-        if(repairDis != null && repairDis.size() > 0){
+        if (repairDis != null && repairDis.size() > 0) {
             return CommonResult.fail("该订单存在待接单师傅，请勿再次派单");
         }
 
@@ -2273,8 +2272,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             //        追踪记录表
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+            repairTrackRecord.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             repairTrackRecord.setRecordId(data.getId());
-            repairTrackRecord.setContent("回复");
+            repairTrackRecord.setContent("回复：" + rr.getContent());
             repairTrackRecord.setUserId(senderId);
             repairTrackRecord.setUserZzstr("管理员");
 
@@ -2822,105 +2822,105 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         ArrayList<MaintenanceWorkerVo> vos = new ArrayList<>();
 
         users.forEach(repairUser -> {
-                    MaintenanceWorkerVo maintenanceWorkerVo = new MaintenanceWorkerVo();
+            MaintenanceWorkerVo maintenanceWorkerVo = new MaintenanceWorkerVo();
 //            名字
-                    maintenanceWorkerVo.setName(repairUser.getUserName());
+            maintenanceWorkerVo.setName(repairUser.getUserName());
 
 //            学校
-                    Integer schoolId = repairUser.getSchoolId();
-                    for (RepairSchool repairSchool : schoolList) {
-                        Integer id = repairSchool.getId();
-                        if (id.equals(schoolId)) {
-                            maintenanceWorkerVo.setSchoolName(repairSchool.getName());
-                        }
-                    }
+            Integer schoolId = repairUser.getSchoolId();
+            for (RepairSchool repairSchool : schoolList) {
+                Integer id = repairSchool.getId();
+                if (id.equals(schoolId)) {
+                    maintenanceWorkerVo.setSchoolName(repairSchool.getName());
+                }
+            }
 
-                    Integer id = repairUser.getId();
+            Integer id = repairUser.getId();
 //            工单集合
-                    List<Integer> recordsList = receivingCountMap.get(id);
-                    int size = recordsList.size();
-                    BigDecimal b = new BigDecimal(size);
+            List<Integer> recordsList = receivingCountMap.get(id);
+            int size = recordsList.size();
+            BigDecimal b = new BigDecimal(size);
 
 //            工单总数
-                    maintenanceWorkerVo.setWorkOrderTotal(size);
+            maintenanceWorkerVo.setWorkOrderTotal(size);
 
 //            超时率
-                    if (maintainTimeOutMap.containsKey(id)) {
-                        Integer integer = maintainTimeOutMap.get(id);
-                        BigDecimal a = new BigDecimal(integer);
-                        BigDecimal c = b;
+            if (maintainTimeOutMap.containsKey(id)) {
+                Integer integer = maintainTimeOutMap.get(id);
+                BigDecimal a = new BigDecimal(integer);
+                BigDecimal c = b;
 
 //                        接单总次数
-                        List<Integer> integers = sendCountMap.get(id);
-                        BigDecimal bigDecimal1 = new BigDecimal(integers.size());
-                        c = c.add(bigDecimal1);
+                List<Integer> integers = sendCountMap.get(id);
+                BigDecimal bigDecimal1 = new BigDecimal(integers.size());
+                c = c.add(bigDecimal1);
 //                接单
-                        if (sendTimeOutMap.containsKey(id)) {
-                            Integer integer1 = sendTimeOutMap.get(id);
-                            BigDecimal bigDecimal = new BigDecimal(integer1);
-                            a = a.add(bigDecimal);
+                if (sendTimeOutMap.containsKey(id)) {
+                    Integer integer1 = sendTimeOutMap.get(id);
+                    BigDecimal bigDecimal = new BigDecimal(integer1);
+                    a = a.add(bigDecimal);
 
-                        }
+                }
 
-                        BigDecimal bigDecimal = a.divide(c, 2, BigDecimal.ROUND_HALF_UP);
-                        BigDecimal multiply = bigDecimal.multiply(new BigDecimal(100));
-                        maintenanceWorkerVo.setTimeOut(multiply + "%");
-                    }
+                BigDecimal bigDecimal = a.divide(c, 2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal multiply = bigDecimal.multiply(new BigDecimal(100));
+                maintenanceWorkerVo.setTimeOut(multiply + "%");
+            }
 
 //            平均维修时间
-                    Long aLong = maintainMap.get(id);
-                    BigDecimal bigDecimal = new BigDecimal(aLong);
-                    BigDecimal maintain = bigDecimal.divide(b, 2, BigDecimal.ROUND_HALF_UP);
-                    maintenanceWorkerVo.setMaintain(maintain);
-
-                    //        平均响应时长
-                    if (sendMap.containsKey(id)) {
-                        Long aLong1 = sendMap.get(id);
-                        BigDecimal bigDecimal1 = new BigDecimal(aLong1);
-                        List<Integer> integers = sendCountMap.get(id);
-                        if (integers.size()<=0) {
-                            maintenanceWorkerVo.setAnswer(null);
-                        }else {
-                            BigDecimal bigDecimal2 = new BigDecimal(integers.size());
-                            BigDecimal send = bigDecimal1.divide(bigDecimal2, 2, BigDecimal.ROUND_HALF_UP);
-                            maintenanceWorkerVo.setAnswer(send);
-                        }
-                    }
+            Long aLong = maintainMap.get(id);
+            BigDecimal bigDecimal = new BigDecimal(aLong);
+            BigDecimal maintain = bigDecimal.divide(b, 2, BigDecimal.ROUND_HALF_UP);
+            maintenanceWorkerVo.setMaintain(maintain);
+
+            //        平均响应时长
+            if (sendMap.containsKey(id)) {
+                Long aLong1 = sendMap.get(id);
+                BigDecimal bigDecimal1 = new BigDecimal(aLong1);
+                List<Integer> integers = sendCountMap.get(id);
+                if (integers.size() <= 0) {
+                    maintenanceWorkerVo.setAnswer(null);
+                } else {
+                    BigDecimal bigDecimal2 = new BigDecimal(integers.size());
+                    BigDecimal send = bigDecimal1.divide(bigDecimal2, 2, BigDecimal.ROUND_HALF_UP);
+                    maintenanceWorkerVo.setAnswer(send);
+                }
+            }
 
 
 //            总费用
-                    LambdaQueryWrapper<RepairRecord> recordWrapper = new LambdaQueryWrapper<>();
-                    recordWrapper.in(RepairRecord::getId, recordsList);
-
-                    List<RepairRecord> list = repairRecordService.list(recordWrapper);
-                    BigDecimal totalPrice = new BigDecimal(0);
-                    for (RepairRecord repairRecord : list) {
-                        BigDecimal price = repairRecord.getPrice();
-                        if (ObjectUtils.isNotEmpty(price)) {
-                            totalPrice = totalPrice.add(price);
-                        }
-                    }
-                    maintenanceWorkerVo.setTotalPrice(totalPrice);
+            LambdaQueryWrapper<RepairRecord> recordWrapper = new LambdaQueryWrapper<>();
+            recordWrapper.in(RepairRecord::getId, recordsList);
+
+            List<RepairRecord> list = repairRecordService.list(recordWrapper);
+            BigDecimal totalPrice = new BigDecimal(0);
+            for (RepairRecord repairRecord : list) {
+                BigDecimal price = repairRecord.getPrice();
+                if (ObjectUtils.isNotEmpty(price)) {
+                    totalPrice = totalPrice.add(price);
+                }
+            }
+            maintenanceWorkerVo.setTotalPrice(totalPrice);
 
 //            好评率
-                    LambdaQueryWrapper<RepairEvaluate> evaluateWrapper = new LambdaQueryWrapper<>();
-                    evaluateWrapper.in(RepairEvaluate::getRecordId, recordsList);
+            LambdaQueryWrapper<RepairEvaluate> evaluateWrapper = new LambdaQueryWrapper<>();
+            evaluateWrapper.in(RepairEvaluate::getRecordId, recordsList);
 //      根据工单id来查询对应的评价
-                    List<RepairEvaluate> repairEvaluates = repairEvaluateService.list(evaluateWrapper);
-                    if (ObjectUtils.isEmpty(repairEvaluates) && repairEvaluates.size() <= 0) {
-                        maintenanceWorkerVo.setDegreePraise(0 + "%");
-                    } else{
-                        BigDecimal evaluatesDecimal = new BigDecimal(repairEvaluates.size());
-                    BigDecimal satisfaction = new BigDecimal(0);
-                    for (RepairEvaluate repairEvaluate : repairEvaluates) {
-                        Integer star = repairEvaluate.getStar();
-                        if (star > 3) {
-                            satisfaction = satisfaction.add(new BigDecimal(1));
-                        }
+            List<RepairEvaluate> repairEvaluates = repairEvaluateService.list(evaluateWrapper);
+            if (ObjectUtils.isEmpty(repairEvaluates) && repairEvaluates.size() <= 0) {
+                maintenanceWorkerVo.setDegreePraise(0 + "%");
+            } else {
+                BigDecimal evaluatesDecimal = new BigDecimal(repairEvaluates.size());
+                BigDecimal satisfaction = new BigDecimal(0);
+                for (RepairEvaluate repairEvaluate : repairEvaluates) {
+                    Integer star = repairEvaluate.getStar();
+                    if (star > 3) {
+                        satisfaction = satisfaction.add(new BigDecimal(1));
                     }
-                    BigDecimal degreePraise = satisfaction.divide(evaluatesDecimal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
-                    maintenanceWorkerVo.setDegreePraise(degreePraise + "%");
                 }
+                BigDecimal degreePraise = satisfaction.divide(evaluatesDecimal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+                maintenanceWorkerVo.setDegreePraise(degreePraise + "%");
+            }
 
             vos.add(maintenanceWorkerVo);
 
@@ -3432,7 +3432,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @throws Exception
      */
     @Override
-    public CommonResult repairSummarizing(){
+    public CommonResult repairSummarizing() {
 
         List<RepairSummarizingVo> vos = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
@@ -3459,12 +3459,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
     /**
      * 总数据分析
+     *
      * @return
      * @throws Exception
      */
     @Override
-    public CommonResult repairTotalData(){
-        RepairTotalDataVo vo=repairRecordService.repairTotalData();
+    public CommonResult repairTotalData() {
+        RepairTotalDataVo vo = repairRecordService.repairTotalData();
         return CommonResult.ok(vo);
     }
 
@@ -3510,8 +3511,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             //        追踪记录表
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+            repairTrackRecord.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             repairTrackRecord.setRecordId(data.getId());
-            repairTrackRecord.setContent("回复");
+            repairTrackRecord.setContent("回复:"+ mrr.getContent());
             repairTrackRecord.setUserId(mrr.getUserId());
             repairTrackRecord.setUserZzstr("管理员");
             boolean save = repairTrackRecordService.save(repairTrackRecord);
@@ -3770,7 +3772,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setContent("已完成");
             rtr.setUserId(senderId);
             rtr.setUserZzstr("技术员");
-            rtr.setImage(StringUtils.join(data.getImages(),','));
+            rtr.setImage(StringUtils.join(data.getImages(), ','));
             rtr.setVoice(data.getVoice());
             rtr.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);

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

@@ -27,7 +27,16 @@ public class TrackDetailsVo {
     private String state;
 
     public String getState() {
-        return maintenanceState == eRecordStatu.ToLogistics.getValue() ? "待确认" : state;
+
+        if (maintenanceState == eRecordStatu.ToConfirmed.getValue() && state.contains("回复")) {
+            state = "回复";
+        }else if(maintenanceState == eRecordStatu.ToConfirmed.getValue() && !state.contains("回复")){
+            state = "待确认";
+        }else if (maintenanceState == eRecordStatu.ToLogistics.getValue()) {
+            state = "待确认";
+        }
+
+        return state;
     }
 
     public void setState(String state) {
@@ -40,7 +49,10 @@ public class TrackDetailsVo {
     private String content;
 
     public String getContent() {
-        return maintenanceState == eRecordStatu.ToLogistics.getValue() ? state : content;
+        if (maintenanceState == eRecordStatu.ToConfirmed.getValue() || maintenanceState == eRecordStatu.ToLogistics.getValue()) {
+            content = state;
+        }
+        return content;
     }
 
     public void setContent(String content) {

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

@@ -14,7 +14,7 @@
         select rsm.id,rsm.record_id,rr.record_no,rsm.is_read,rsm.content,rsm.create_time as update_time from repair_system_messages rsm
         left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
         where rsm.deleted = 0 and rsm.recipient_id = #{userId}
-        order by rsm.is_read desc,rsm.create_time desc
+        order by rsm.is_read asc,rsm.create_time desc
     </select>
 
 </mapper>

target/classes/mapper/repair/RepairSystemMessagesMapper.xml

@@ -14,7 +14,7 @@
         select rsm.id,rsm.record_id,rr.record_no,rsm.is_read,rsm.content,rsm.create_time as update_time from repair_system_messages rsm
         left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
         where rsm.deleted = 0 and rsm.recipient_id = #{userId}
-        order by rsm.is_read desc,rsm.create_time desc
+        order by rsm.is_read asc,rsm.create_time desc
     </select>
 
 </mapper>