夏文涛 před 2 roky
rodič
revize
fe0049e709

+ 246 - 224
.idea/workspace.xml

@@ -2,16 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/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/api/RepairReceivingControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.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/services/impl/RepairUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairNoticeSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairNoticeSettingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -44,22 +49,28 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="3642" column="35" selection-start-line="3642" selection-start-column="24" selection-end-line="3642" selection-end-column="35" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state 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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="174" column="28" selection-start-line="174" selection-start-column="17" selection-end-line="174" selection-end-column="28" />
+            <state relative-caret-position="460">
+              <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="364">
+              <caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -67,35 +78,53 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="140" column="78" selection-start-line="140" selection-start-column="59" selection-end-line="140" selection-end-column="78" />
+            <state relative-caret-position="493">
+              <caret line="296" column="27" selection-start-line="296" selection-start-column="27" selection-end-line="296" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="424">
+              <caret line="146" column="13" selection-start-line="146" selection-start-column="13" selection-end-line="146" 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/controller/RepairClassesSettingsController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="165" column="49" selection-start-line="165" selection-start-column="49" selection-end-line="165" selection-end-column="49" />
+            <state relative-caret-position="23">
+              <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="24" column="45" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="45" />
+            <state relative-caret-position="601">
+              <caret line="40" column="35" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="218">
+              <caret line="26" column="29" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="40">
-              <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
+            <state 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>
@@ -112,16 +141,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getTechniciansByUserId</find>
-      <find>eRecordStatu.ToLogistics.getValue()</find>
-      <find>transferToLogistics</find>
-      <find>协作</find>
-      <find>queryPageRepairClassesSettings</find>
-      <find>statistics</find>
-      <find>restrict</find>
-      <find>InsertRepairRecord</find>
-      <find>queryManageCount</find>
-      <find>alterPriceGoodsName</find>
       <find>reportExport</find>
       <find>repairCampus</find>
       <find>repairAreaExport</find>
@@ -135,13 +154,23 @@
       <find>queryPageRepairNoticeSettings</find>
       <find>queryNoticePageList</find>
       <find>autoDispatchUser</find>
-      <find>mobileReply</find>
       <find>Services.queryPageRepairUsers</find>
       <find>Service.queryPageRepairUser</find>
       <find>service.queryPageRepairUser</find>
       <find>userIds</find>
       <find>queryPageRepairUsers</find>
       <find>queryPageRepairUser</find>
+      <find>repairAnalysis</find>
+      <find>repairTrend</find>
+      <find>queryTeamWorkTimeout</find>
+      <find>queryTeamWorkExamine</find>
+      <find>queryTeamWorkPending</find>
+      <find>queryTeamWorkFinished</find>
+      <find>queryTeamWorkLogistics</find>
+      <find>queryTeamWorkClosed</find>
+      <find>mobileReply</find>
+      <find>queryManageMessagePage</find>
+      <find>getRepairIdentitys</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -182,18 +211,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.java" />
@@ -201,7 +218,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/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" />
@@ -228,11 +244,24 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" />
       </list>
     </option>
   </component>
@@ -691,12 +720,12 @@
       <workItem from="1693183046072" duration="10553000" />
       <workItem from="1693211278627" duration="89000" />
       <workItem from="1693211400881" duration="1142000" />
-      <workItem from="1693212744516" duration="39402000" />
+      <workItem from="1693212744516" duration="44395000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="976699000" />
+    <option name="totallyTimeSpent" value="981692000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -708,7 +737,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" />
@@ -720,7 +749,7 @@
       <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.37417942" />
+      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.20202559" />
       <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.759116" />
@@ -857,376 +886,369 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.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="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/request/RevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
+    <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="269">
-          <caret line="44" column="123" selection-start-line="44" selection-start-column="119" selection-end-line="44" selection-end-column="123" />
+        <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/controller/RepairCollaborateRecordController.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="341">
-          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
+        <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/api/RepairCollaborateRecordControllerAPI.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="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 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="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.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="1373">
+          <caret line="166" column="20" lean-forward="true" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <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="246">
-          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
+        <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/model/request/MaintenanceConsumeablesRequest.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="253">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="276">
+          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.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="713">
-          <caret line="45" column="111" selection-start-line="45" selection-start-column="107" selection-end-line="45" selection-end-column="111" />
+        <state relative-caret-position="379">
+          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.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="-747">
-          <caret line="453" selection-start-line="453" selection-end-line="453" />
+        <state relative-caret-position="495">
+          <caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.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="506">
-          <caret line="28" column="24" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="24" />
+        <state relative-caret-position="470">
+          <caret line="611" column="26" selection-start-line="611" selection-start-column="26" selection-end-line="611" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eSchool.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="460">
+          <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
+        <state relative-caret-position="-50">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="121" column="12" selection-start-line="121" selection-start-column="12" selection-end-line="121" selection-end-column="70" />
+        <state relative-caret-position="355">
+          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+        <state relative-caret-position="184">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eApprovalStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
+        <state relative-caret-position="292">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+        <state relative-caret-position="184">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsTop.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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 relative-caret-position="184">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuper.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="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="144">
+          <caret line="78" column="97" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="97" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1882">
-          <caret line="107" column="20" selection-start-line="107" selection-start-column="20" selection-end-line="107" selection-end-column="20" />
+        <state relative-caret-position="374">
+          <caret line="57" column="82" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="82" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RefundableAmountRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="483">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/RevertRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="26" />
+        <state relative-caret-position="288">
+          <caret line="146" column="58" lean-forward="true" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="40" column="19" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
+        <state relative-caret-position="269">
+          <caret line="24" column="45" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/MobileRevertRequest.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="529">
-          <caret line="25" column="26" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="26" />
+        <state relative-caret-position="269">
+          <caret line="165" column="49" selection-start-line="165" selection-start-column="49" selection-end-line="165" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
-          <caret line="302" column="54" selection-start-line="302" selection-start-column="54" selection-end-line="302" selection-end-column="54" />
+        <state relative-caret-position="40">
+          <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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 relative-caret-position="403">
+          <caret line="222" column="53" selection-start-line="222" selection-start-column="53" selection-end-line="222" selection-end-column="53" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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/model/request/MobileRevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1373">
-          <caret line="166" column="20" lean-forward="true" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
+        <state relative-caret-position="115">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
+        <state relative-caret-position="1">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2060">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="231">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </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/model/vo/RepairTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="176" column="78" lean-forward="true" selection-start-line="176" selection-start-column="78" selection-end-line="176" selection-end-column="78" />
+        <state relative-caret-position="-230">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="17" />
+        <state relative-caret-position="295">
+          <caret line="57" column="26" lean-forward="true" selection-start-line="57" selection-start-column="26" selection-end-line="57" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.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="379">
-          <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
+        <state relative-caret-position="269">
+          <caret line="617" column="35" selection-start-line="617" selection-start-column="16" selection-end-line="617" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.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="495">
-          <caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
+        <state relative-caret-position="196">
+          <caret line="4179" selection-start-line="4179" selection-end-line="4179" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="611" column="26" selection-start-line="611" selection-start-column="26" selection-end-line="611" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairReceivingControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="460">
           <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRefundRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-50">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="19">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
         </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/RepairRefundRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="355">
           <caret line="79" column="21" selection-start-line="79" selection-start-column="21" selection-end-line="79" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSchool.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        <state 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/model/request/AlterPriceRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="355">
+          <caret line="84" column="21" selection-start-line="84" selection-start-column="21" selection-end-line="84" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-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="470">
+          <caret line="211" column="21" selection-start-line="211" selection-start-column="21" selection-end-line="211" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="417">
+          <caret line="39" column="34" selection-start-line="39" selection-start-column="27" selection-end-line="39" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="516" column="91" selection-start-line="513" selection-start-column="9" selection-end-line="516" selection-end-column="91" />
+        <state relative-caret-position="102">
+          <caret line="177" column="26" selection-start-line="177" selection-start-column="26" selection-end-line="177" selection-end-column="26" />
         </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/RepairSystemSettingController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="78" column="97" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="97" />
+        <state relative-caret-position="-404">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="57" column="82" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="82" />
+        <state 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/resources/mapper/repair/RepairNoticeSettingMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
+        <state 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/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="3642" column="35" selection-start-line="3642" selection-start-column="24" selection-end-line="3642" selection-end-column="35" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="460">
+          <caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="174" column="28" selection-start-line="174" selection-start-column="17" selection-end-line="174" selection-end-column="28" />
+        <state relative-caret-position="218">
+          <caret line="26" column="29" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="146" column="58" lean-forward="true" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
+        <state relative-caret-position="364">
+          <caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
         </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/api/RepairUserControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="24" column="45" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="45" />
+        <state relative-caret-position="23">
+          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="165" column="49" selection-start-line="165" selection-start-column="49" selection-end-line="165" selection-end-column="49" />
+        <state relative-caret-position="601">
+          <caret line="40" column="35" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="35" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="140" column="78" selection-start-line="140" selection-start-column="59" selection-end-line="140" selection-end-column="78" />
+        <state relative-caret-position="493">
+          <caret line="296" column="27" selection-start-line="296" selection-start-column="27" selection-end-line="296" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
+        <state relative-caret-position="424">
+          <caret line="146" column="13" selection-start-line="146" selection-start-column="13" selection-end-line="146" selection-end-column="13" />
         </state>
       </provider>
     </entry>

+ 2 - 2
src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -216,11 +216,11 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairAnalysis")
     @ApiOperation(value = "报修分析统计", notes = "报修分析统计", httpMethod = "GET")
-    CommonResult repairAnalysis(@RequestParam int state) throws Exception;
+    CommonResult repairAnalysis(@RequestParam int state);
 
     @GetMapping(value = "/repairTrend")
     @ApiOperation(value = "报修趋势统计", notes = "报修趋势统计", httpMethod = "GET")
-    CommonResult repairTrend(@RequestParam int state) throws Exception;
+    CommonResult repairTrend(@RequestParam int state);
 
     @GetMapping(value = "/repairSummarizing")
     @ApiOperation(value = "总数据汇总统计", notes = "总数据汇总统计", httpMethod = "GET")

+ 8 - 8
src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairRefundRecordController"}, value = "退款记录")
 public interface RepairRefundRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairRefundRecord")
+    @PostMapping(value = "/insertRepairRefundRecord")
     @ApiOperation(value = "添加退款记录", notes = "添加退款记录数据", httpMethod = "POST")
-    CommonResult InsertrepairRefundRecord(@Validated @RequestBody RepairRefundRecord rc, BindingResult bindingResult);
+    CommonResult insertRepairRefundRecord(@Validated @RequestBody RepairRefundRecord rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairRefundRecordById")
+    @PostMapping(value = "/updateRepairRefundRecordById")
     @ApiOperation(value = "编辑退款记录数据", notes = "编辑退款记录数据", httpMethod = "POST")
-    CommonResult updaterepairRefundRecordById(@Validated @RequestBody RepairRefundRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairRefundRecordById(@Validated @RequestBody RepairRefundRecord rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairRefundRecord")
+    @GetMapping(value = "/queryPageRepairRefundRecord")
     @ApiOperation(value = "退款记录分页数据", notes = "退款记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairRefundRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairRefundRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairRefundRecordById")
+    @GetMapping(value = "/deleteRepairRefundRecordById")
     @ApiOperation(value = "根据ID删除指定退款记录", notes = "根据ID删除指定退款记录", httpMethod = "GET")
-    CommonResult deleterepairRefundRecordById(@RequestParam int id);
+    CommonResult deleteRepairRefundRecordById(@RequestParam int id);
 }

+ 8 - 8
src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java

@@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairSystemMessagesController"}, value = "系统信息")
 public interface RepairSystemMessagesControllerAPI {
 
-    @PostMapping(value = "/insertrepairSystemMessages")
+    @PostMapping(value = "/insertRepairSystemMessages")
     @ApiOperation(value = "添加系统信息", notes = "添加系统信息数据", httpMethod = "POST")
-    CommonResult InsertrepairSystemMessages(@Validated @RequestBody RepairSystemMessages rc, BindingResult bindingResult);
+    CommonResult insertRepairSystemMessages(@Validated @RequestBody RepairSystemMessages rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairSystemMessagesById")
+    @PostMapping(value = "/updateRepairSystemMessagesById")
     @ApiOperation(value = "编辑系统信息数据", notes = "编辑系统信息数据", httpMethod = "POST")
-    CommonResult updaterepairSystemMessagesById(@Validated @RequestBody RepairSystemMessages rc, BindingResult bindingResult);
+    CommonResult updateRepairSystemMessagesById(@Validated @RequestBody RepairSystemMessages rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairSystemMessages")
+    @GetMapping(value = "/queryPageRepairSystemMessages")
     @ApiOperation(value = "系统信息分页数据", notes = "系统信息分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairSystemMessagess(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairSystemMessagess(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairSystemMessagesById")
+    @GetMapping(value = "/deleteRepairSystemMessagesById")
     @ApiOperation(value = "根据ID删除指定系统信息", notes = "根据ID删除指定系统信息", httpMethod = "GET")
-    CommonResult deleterepairSystemMessagesById(@RequestParam int id);
+    CommonResult deleteRepairSystemMessagesById(@RequestParam int id);
 
     @GetMapping(value = "/querySystemMessagePage")
     @ApiOperation(value = "消息中心", notes = "消息中心", httpMethod = "GET")

+ 5 - 5
src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairTrackRecordController"}, value = "跟踪记录")
 public interface RepairTrackRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairTrackRecord")
+    @PostMapping(value = "/insertRepairTrackRecord")
     @ApiOperation(value = "添加跟踪记录", notes = "添加跟踪记录数据", httpMethod = "POST")
-    CommonResult InsertrepairTrackRecord(@Validated @RequestBody RepairTrackRecord rc, BindingResult bindingResult);
+    CommonResult insertRepairTrackRecord(@Validated @RequestBody RepairTrackRecord rc, BindingResult bindingResult);
 
     @PostMapping(value = "/updaterepairTrackRecordById")
     @ApiOperation(value = "编辑跟踪记录数据", notes = "编辑跟踪记录数据", httpMethod = "POST")
-    CommonResult updaterepairTrackRecordById(@Validated @RequestBody RepairTrackRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairTrackRecordById(@Validated @RequestBody RepairTrackRecord rc, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPagerepairTrackRecord")
     @ApiOperation(value = "跟踪记录分页数据", notes = "跟踪记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairTrackRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairTrackRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
     @GetMapping(value = "/deleterepairTrackRecordById")
     @ApiOperation(value = "根据ID删除指定跟踪记录", notes = "根据ID删除指定跟踪记录", httpMethod = "GET")
-    CommonResult deleterepairTrackRecordById(@RequestParam int id);
+    CommonResult deleteRepairTrackRecordById(@RequestParam int id);
 }

+ 8 - 8
src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java

@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = {"repairTransferRecordController"}, value = "转单记录")
 public interface RepairTransferRecordControllerAPI {
 
-    @PostMapping(value = "/insertrepairTransferRecord")
+    @PostMapping(value = "/insertRepairTransferRecord")
     @ApiOperation(value = "添加转单记录", notes = "添加转单记录数据", httpMethod = "POST")
-    CommonResult InsertrepairTransferRecord(@Validated @RequestBody RepairTransferRecord rc, BindingResult bindingResult);
+    CommonResult insertRepairTransferRecord(@Validated @RequestBody RepairTransferRecord rc, BindingResult bindingResult);
 
-    @PostMapping(value = "/updaterepairTransferRecordById")
+    @PostMapping(value = "/updateRepairTransferRecordById")
     @ApiOperation(value = "编辑转单记录数据", notes = "编辑转单记录数据", httpMethod = "POST")
-    CommonResult updaterepairTransferRecordById(@Validated @RequestBody RepairTransferRecord rc, BindingResult bindingResult);
+    CommonResult updateRepairTransferRecordById(@Validated @RequestBody RepairTransferRecord rc, BindingResult bindingResult);
 
-    @GetMapping(value = "/queryPagerepairTransferRecord")
+    @GetMapping(value = "/queryPageRepairTransferRecord")
     @ApiOperation(value = "转单记录分页数据", notes = "转单记录分页数据", httpMethod = "GET")
-    CommonResult queryPagerepairTransferRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageRepairTransferRecords(@RequestParam int currentPage, @RequestParam int pageCount, String name);
 
-    @GetMapping(value = "/deleterepairTransferRecordById")
+    @GetMapping(value = "/deleteRepairTransferRecordById")
     @ApiOperation(value = "根据ID删除指定转单记录", notes = "根据ID删除指定转单记录", httpMethod = "GET")
-    CommonResult deleterepairTransferRecordById(@RequestParam int id);
+    CommonResult deleteRepairTransferRecordById(@RequestParam int id);
 }

+ 122 - 76
src/main/java/com/repair/controller/RepairRecordController.java

@@ -2973,7 +2973,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         }
 
-
         LambdaQueryWrapper<RepairUser> userWrapper = new LambdaQueryWrapper<>();
         userWrapper.in(RepairUser::getId, userList);
 
@@ -3093,13 +3092,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     /**
-     * 维修师傅导出
-     *
-     * @param response
-     * @param state
-     * @throws Exception
-     */
-    /**
      * 维修师傅效率导出
      * @param response 响应流
      * @param state 状态
@@ -3143,13 +3135,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             ArrayList<Integer> recordList = new ArrayList<>();
 
-//        接单总次数
+            // 接单总次数
             HashMap<Integer, List<Integer>> receivingCountMap = new HashMap<>();
 
-//        维修超时次数
+            // 维修超时次数
             Map<Integer, Integer> maintainTimeOutMap = new HashMap<>();
 
-//        维修总时长
+            // 维修总时长
             Map<Integer, Long> maintainMap = new HashMap<>();
 
 
@@ -3167,7 +3159,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 recordList.add(recordId);
 
                 if (receivingCountMap.containsKey(userId)) {
-//                  总次数
+                    // 总次数
                     List<Integer> list = receivingCountMap.get(userId);
                     list.add(recordId);
                     receivingCountMap.put(userId, list);
@@ -3178,20 +3170,20 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
 
 
-//            接单时间
+                // 接单时间
                 long receivingTime = repairReceiving.getReceivingTime().getTime();
-//            考核时间(分)
+                // 考核时间(分)
                 Integer maintenanceAssessTime = repairReceiving.getMaintenanceAssessTime() * 1000 * 60;
 
                 long time = receivingTime + maintenanceAssessTime;
 
-//            完成时间
+                // 完成时间
                 long finishTimeTime = finishTime.getTime();
 
-//              实际完成时间大于接单时间加考核时间为超时
+                // 实际完成时间大于接单时间加考核时间为超时
                 if (finishTimeTime > time) {
                     if (maintainTimeOutMap.containsKey(userId)) {
-//                  次数
+                        // 次数
                         Integer count = maintainTimeOutMap.get(userId);
                         count = count + 1;
                         maintainTimeOutMap.put(userId, count);
@@ -3200,12 +3192,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     }
                 }
 
-//            维修时长=完成时间-接单时间(分)
+                // 维修时长=完成时间-接单时间(分)
                 long maintainTime = finishTimeTime - receivingTime;
                 maintainTime = maintainTime / 1000 / 60;
 
                 if (maintainMap.containsKey(userId)) {
-//                  维修时长
+                    // 维修时长
                     Long maintainTotalTime = maintainMap.get(userId);
                     maintainTotalTime = maintainTotalTime + maintainTime;
                     maintainMap.put(userId, maintainTotalTime);
@@ -3215,17 +3207,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             }
 
-
-            //        接单总次数
+            // 接单总次数
             HashMap<Integer, List<Integer>> sendCountMap = new HashMap<>();
-
-//        接单超时次数
+            // 接单超时次数
             Map<Integer, Integer> sendTimeOutMap = new HashMap<>();
-
-//        接单总时长
+            // 接单总时长
             Map<Integer, Long> sendMap = new HashMap<>();
 
-
             LambdaQueryWrapper<RepairDispatchRecord> rdrsWrapper = new LambdaQueryWrapper<>();
             rdrsWrapper.in(RepairDispatchRecord::getRecordId, recordList)
                     .isNotNull(RepairDispatchRecord::getReceivingTime);
@@ -3233,16 +3221,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             List<RepairDispatchRecord> repairDispatchRecords = repairDispatchRecordService.list(rdrsWrapper);
             for (RepairDispatchRecord repairDispatchRecord : repairDispatchRecords) {
-//                派单时间
+                // 派单时间
                 long sendTime = repairDispatchRecord.getAssignedTime().getTime();
-//                接单考核时间
+                // 接单考核时间
                 Integer acceptanceAssessTime = repairDispatchRecord.getAcceptanceAssessTime() * 1000 * 60;
 
                 long time = sendTime + acceptanceAssessTime;
 
-//                接单时间
+                // 接单时间
                 long receivingTime = repairDispatchRecord.getReceivingTime().getTime();
-//            接单人
+                // 接单人
                 Integer usersId = repairDispatchRecord.getUsersId();
                 Integer recordId = repairDispatchRecord.getRecordId();
 
@@ -3255,11 +3243,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     sendCountMap.put(usersId, integers);
                 }
 
-
-//              实际完成时间大于接单时间加考核时间为超时
+                // 实际完成时间大于接单时间加考核时间为超时
                 if (receivingTime > time) {
                     if (sendTimeOutMap.containsKey(usersId)) {
-//                  次数
+                        // 次数
                         Integer count = sendTimeOutMap.get(usersId);
                         count = count + 1;
                         sendTimeOutMap.put(usersId, count);
@@ -3268,12 +3255,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     }
                 }
 
-//            接单时长=接单时间-派单时间(分)
+                // 接单时长=接单时间-派单时间(分)
                 Long orderReceivingTime = receivingTime - sendTime;
                 orderReceivingTime = orderReceivingTime / 1000 / 60;
 
                 if (sendMap.containsKey(usersId)) {
-//                  接单总时长
+                    // 接单总时长
                     Long sendTotalTime = sendMap.get(usersId);
                     sendTotalTime = sendTotalTime + orderReceivingTime;
                     sendMap.put(usersId, sendTotalTime);
@@ -3297,10 +3284,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             users.forEach(repairUser -> {
                 MaintenanceWorkerVo maintenanceWorkerVo = new MaintenanceWorkerVo();
-//            名字
+                // 名字
                 maintenanceWorkerVo.setName(repairUser.getUserName());
 
-//            学校
+                // 学校
                 Integer schoolId = repairUser.getSchoolId();
                 for (RepairSchool repairSchool : schoolList) {
                     Integer id = repairSchool.getId();
@@ -3310,20 +3297,20 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
 
                 Integer id = repairUser.getId();
-//            工单集合
+                // 工单集合
                 List<Integer> recordsList = receivingCountMap.get(id);
                 int size = recordsList.size();
                 BigDecimal b = new BigDecimal(size);
 
-//            工单总数
+                // 工单总数
                 maintenanceWorkerVo.setWorkOrderTotal(size);
 
-//            超时率
+                // 超时率
                 if (maintainTimeOutMap.containsKey(id)) {
                     Integer integer = maintainTimeOutMap.get(id);
                     BigDecimal a = new BigDecimal(integer);
                     BigDecimal c = b;
-//                接单
+                    // 接单
                     if (sendTimeOutMap.containsKey(id)) {
                         Integer integer1 = sendTimeOutMap.get(id);
                         BigDecimal bigDecimal = new BigDecimal(integer1);
@@ -3337,13 +3324,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     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);
@@ -3353,8 +3340,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     maintenanceWorkerVo.setAnswer(send);
                 }
 
-
-//            总费用
+                // 总费用
                 LambdaQueryWrapper<RepairRecord> recordWrapper = new LambdaQueryWrapper<>();
                 recordWrapper.in(RepairRecord::getId, recordsList);
 
@@ -3368,10 +3354,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
                 maintenanceWorkerVo.setTotalPrice(totalPrice);
 
-//            好评率
+                // 好评率
                 LambdaQueryWrapper<RepairEvaluate> evaluateWrapper = new LambdaQueryWrapper<>();
                 evaluateWrapper.in(RepairEvaluate::getRecordId, recordsList);
-//      根据工单id来查询对应的评价
+                // 根据工单id来查询对应的评价
                 List<RepairEvaluate> repairEvaluates = repairEvaluateService.list(evaluateWrapper);
                 BigDecimal evaluatesDecimal = new BigDecimal(repairEvaluates.size());
                 BigDecimal satisfaction = new BigDecimal(0);
@@ -3384,7 +3370,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 BigDecimal degreePraise = satisfaction.divide(evaluatesDecimal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
                 maintenanceWorkerVo.setDegreePraise(degreePraise + "%");
 
-
                 vos.add(maintenanceWorkerVo);
             });
 
@@ -3424,14 +3409,18 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     /**
-     * 报修分析
+     * 报修分析统计
      *
-     * @param state
+     * @param state 状态
+     *              全部:0
+     *              本年:1
+     *              本月:2
+     *              本周:3
+     *              今天:4
      * @return
-     * @throws Exception
      */
     @Override
-    public CommonResult repairAnalysis(int state) throws Exception {
+    public CommonResult repairAnalysis(int state){
         String startTime = DateUtils.startTime(state);
         String endTime = DateUtils.endTime();
 
@@ -3445,38 +3434,42 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     /**
-     * 报修趋势
+     * 报修趋势分析
      *
-     * @param state
+     * @param state 状态
+     *              全部:0
+     *              本年:1
+     *              本月:2
+     *              本周:3
+     *              今天:4
      * @return
-     * @throws Exception
      */
     @Override
-    public CommonResult repairTrend(int state) throws Exception {
+    public CommonResult repairTrend(int state){
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-//        当前时间
+        //当前时间
         LocalDateTime now = LocalDateTime.now();
 
 
-//        本次时间
+        // 本次时间
         String startTime = DateUtils.trendStartTime(state);
         LocalDateTime sTime = LocalDateTime.parse(startTime, dateTimeFormatter);
 
         int monthValue = sTime.getMonthValue();
 
-//        对比时间
+        // 对比时间
         String doubleStartTime = DateUtils.trendComparisonStartTime(state);
         LocalDateTime dsTime = LocalDateTime.parse(doubleStartTime, dateTimeFormatter);
 
         ArrayList<RepairTrendVo> vos = new ArrayList<>();
-//      本年和去年
+        // 本年和去年
         if (state == 1) {
 
             for (int i = 1; i <= 12; i++) {
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
-//              获取当前月份
+                // 获取当前月份
                 int monthValue1 = now.getMonthValue();
 
                 if (i <= monthValue1) {
@@ -3515,7 +3508,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 int value = dateTime.getMonthValue();
                 int value2 = dDateTime.getMonthValue();
 
-//                  当前时间月份相同就可以添加
+                // 当前时间月份相同就可以添加
                 if (value == monthValue && i <= dayOfMonth) {
                     LambdaQueryWrapper<RepairRecord> wrapper = new LambdaQueryWrapper<>();
                     wrapper.between(RepairRecord::getReportTime, dateTime, endTime);
@@ -3523,7 +3516,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     repairTrendVo.setTrendCount(count);
                     repairTrendVo.setTrendName(value + "月" + dateTime.getDayOfMonth() + "号");
                 }
-//              对比的月份不相同就可以添加
+                // 对比的月份不相同就可以添加
                 if (value2 != monthValue) {
                     LambdaQueryWrapper<RepairRecord> dWrapper = new LambdaQueryWrapper<>();
                     dWrapper.between(RepairRecord::getReportTime, dDateTime, doubleEndTime);
@@ -3537,7 +3530,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         } else if (state == 3) {
             for (int i = 1; i <= 7; i++) {
-//              获取当前星期
+                // 获取当前星期
                 int value = now.getDayOfWeek().getValue();
 
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
@@ -3566,7 +3559,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             for (int i = 1; i <= 24; i++) {
                 RepairTrendVo repairTrendVo = new RepairTrendVo();
 
-//                获取当前小时
+                // 获取当前小时
                 int hour = now.getHour();
 
                 if (i <= hour) {
@@ -3591,15 +3584,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
         }
 
-
         return CommonResult.ok(vos);
     }
 
     /**
-     * 总数据汇总
+     * 总数据汇总分析
      *
      * @return
-     * @throws Exception
      */
     @Override
     public CommonResult repairSummarizing() {
@@ -3631,7 +3622,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * 总数据分析
      *
      * @return
-     * @throws Exception
      */
     @Override
     public CommonResult repairTotalData() {
@@ -3639,6 +3629,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok(vo);
     }
 
+    /**
+     * 待确认-留言
+     * @param mrr 留言数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -3709,6 +3706,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("回复成功");
     }
 
+    /**
+     * 关单操作
+     * @param recordId 维修记录ID
+     * @param userId 用户ID
+     * @param reason 关单原因
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult closeOrders(int recordId, String userId, String reason) throws Exception {
@@ -3762,6 +3767,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("关单成功");
     }
 
+    /**
+     * 管理端关单操作
+     * @param recordId 维修记录ID
+     * @param userhead 请求头
+     * @param reason 关单原因
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult closePCOrder(int recordId, String userhead, String reason) throws Exception {
@@ -3831,6 +3844,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("关单成功");
     }
 
+    /**
+     * 维修完成
+     * @param data 报修数据
+     * @param userhead 请求头
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult finishOrder(finishOrderRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
@@ -3956,6 +3977,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("提交成功!");
     }
 
+    /**
+     * 转单审核申请
+     * @param data 转单审核申请数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult transferApply(transferApplyRequest data, BindingResult bindingResult) throws Exception {
@@ -4041,6 +4069,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.fail("转单审核发起成功");
     }
 
+    /**
+     * 协作审核申请
+     * @param data 协作审核申请数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws Exception
+     */
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult collaborateApply(collaborateApplyRequest data, BindingResult bindingResult) throws Exception {
@@ -4131,6 +4166,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("协作审核发起成功");
     }
 
+    /**
+     * 获取工单管理头部报修数量
+     * @param schoolId 校区ID
+     * @return
+     */
     @Override
     public CommonResult queryTeamWorkCount(int schoolId) {
         String dateNow = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -4139,13 +4179,19 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     /**
-     * 待审核  1
-     * 待接单  2
-     * 维修中  3
-     * 已完成  4
-     * 待处理  5
-     * 已超时  6
-     * 已关单  7
+     * 获取工单管理头部报修数据
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param state 状态
+     *              待接单 1
+     *              维修中 2
+     *              已超时 3
+     *              待审核 4
+     *              已完成 5
+     *              待处理 6
+     *              已关单 7
+     * @param schoolId 校区ID
+     * @return
      */
     @Override
     public CommonResult queryTeamWorkPage(int currentPage, int pageCount, int state, int schoolId) {

+ 28 - 4
src/main/java/com/repair/controller/RepairRefundRecordController.java

@@ -25,8 +25,14 @@ public class RepairRefundRecordController implements RepairRefundRecordControlle
     @Autowired
     private RepairRefundRecordService repairRefundRecordService;
 
+    /**
+     * 新增退款记录
+     * @param rc 退款记录数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairRefundRecord(RepairRefundRecord rc, BindingResult bindingResult) {
+    public CommonResult insertRepairRefundRecord(RepairRefundRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairRefundRecordController implements RepairRefundRecordControlle
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新退款记录
+     * @param rc 退款记录
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairRefundRecordById(RepairRefundRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairRefundRecordById(RepairRefundRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairRefundRecordController implements RepairRefundRecordControlle
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 退款记录分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairRefundRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairRefundRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairRefundRecord> result = repairRefundRecordService.queryPageRepairRefundRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除退款记录
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairRefundRecordById(int id) {
+    public CommonResult deleteRepairRefundRecordById(int id) {
         RepairRefundRecord data = repairRefundRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在,删除失败!");

+ 24 - 0
src/main/java/com/repair/controller/RepairSchoolController.java

@@ -25,6 +25,12 @@ public class RepairSchoolController implements RepairSchoolControllerAPI {
     @Autowired
     private RepairSchoolService repairSchoolService;
 
+    /**
+     * 新增校区数据
+     * @param repairSchool 校区数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairSchool(RepairSchool repairSchool, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -44,6 +50,12 @@ public class RepairSchoolController implements RepairSchoolControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新校区数据
+     * @param ra 校区数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateRepairSchoolById(RepairSchool ra, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -55,12 +67,24 @@ public class RepairSchoolController implements RepairSchoolControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 校区分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairSchools(int currentPage, int pageCount, String name) {
         PageUtils<RepairSchool> result = repairSchoolService.queryPageRepairSchools(currentPage, pageCount, name);
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除校区数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairSchoolById(int id) {
         RepairSchool data = repairSchoolService.getRepairById(id);

+ 26 - 0
src/main/java/com/repair/controller/RepairShiftSettingsController.java

@@ -35,6 +35,13 @@ public class RepairShiftSettingsController implements RepairShiftSettingsControl
     @Autowired
     private RepairShiftSettingsService repairShiftSettingsService;
 
+    /**
+     * 新增班次
+     * @param irssr 班次数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws ParseException
+     */
     @Override
     public CommonResult InsertRepairShiftSettings(insertRepairShiftSettingRequest irssr, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
@@ -121,6 +128,13 @@ public class RepairShiftSettingsController implements RepairShiftSettingsControl
         }
     }
 
+    /**
+     * 更新班次数据
+     * @param ursr 班次数据
+     * @param bindingResult 是否为空判断
+     * @return
+     * @throws ParseException
+     */
     @Override
     public CommonResult updateRepairShiftSettingsById(updateRepairShiftRequest ursr, BindingResult bindingResult) throws ParseException {
         if (bindingResult.hasErrors()) {
@@ -179,6 +193,13 @@ public class RepairShiftSettingsController implements RepairShiftSettingsControl
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 班次分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairShiftSettingss(int currentPage, int pageCount, String name) {
         PageUtils<RepairShiftSettings> result = repairShiftSettingsService.queryPageRepairShiftSettingss(currentPage, pageCount, name);
@@ -186,6 +207,11 @@ public class RepairShiftSettingsController implements RepairShiftSettingsControl
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除班次数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairShiftSettingsById(int id) {
         RepairShiftSettings data = repairShiftSettingsService.getRepairById(id);

+ 57 - 4
src/main/java/com/repair/controller/RepairSystemMessagesController.java

@@ -37,8 +37,14 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
     @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
+    /**
+     * 新增消息中心数据
+     * @param rc 消息中心数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairSystemMessages(RepairSystemMessages rc, BindingResult bindingResult) {
+    public CommonResult insertRepairSystemMessages(RepairSystemMessages rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,8 +55,14 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新消息中心数据
+     * @param rc 消息中心数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairSystemMessagesById(RepairSystemMessages rc, BindingResult bindingResult) {
+    public CommonResult updateRepairSystemMessagesById(RepairSystemMessages rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -61,15 +73,27 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 消息中心分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairSystemMessagess(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairSystemMessagess(int currentPage, int pageCount, String name) {
         PageUtils<RepairSystemMessages> result = repairSystemMessagesService.queryPageRepairSystemMessagess(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除消息中心数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairSystemMessagesById(int id) {
+    public CommonResult deleteRepairSystemMessagesById(int id) {
         RepairSystemMessages data = repairSystemMessagesService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在,删除失败!");
@@ -80,12 +104,24 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 消息中心分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param userId 用户ID
+     * @return
+     */
     @Override
     public CommonResult querySystemMessagePage(int currentPage, int pageCount, int userId) {
         PageUtils<SystemMessagePageVo> result = repairSystemMessagesService.querySystemMessagePage(currentPage, pageCount, userId);
         return CommonResult.ok(result);
     }
 
+    /**
+     * 未读数据查询
+     * @param userId 用户ID
+     * @return
+     */
     @Override
     public CommonResult queryMessageUnreadCount(int userId) {
         int result = repairSystemMessagesService.queryMessageUnreadCount(userId);
@@ -94,6 +130,11 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return CommonResult.ok(data);
     }
 
+    /**
+     * 已读操作
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult readSystemMessage(int id) {
         RepairSystemMessages rsm = new RepairSystemMessages();
@@ -103,6 +144,13 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return CommonResult.ok();
     }
 
+    /**
+     * 管理端消息中心分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param userhead 请求头
+     * @return
+     */
     @Override
     public CommonResult queryManageMessagePage(int currentPage, int pageCount, String userhead) {
         String userID = AesUtils.decrypt(userhead);
@@ -125,6 +173,11 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
         return CommonResult.ok(result);
     }
 
+    /**
+     * 一键已读操作
+     * @param userhead 请求头
+     * @return
+     */
     @Override
     public CommonResult readAllManageMessage(String userhead) {
         String userID = AesUtils.decrypt(userhead);

+ 28 - 4
src/main/java/com/repair/controller/RepairTrackRecordController.java

@@ -25,8 +25,14 @@ public class RepairTrackRecordController implements RepairTrackRecordControllerA
     @Autowired
     private RepairTrackRecordService repairTrackRecordService;
 
+    /**
+     * 新增跟踪记录数据
+     * @param rc 跟踪记录数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairTrackRecord(RepairTrackRecord rc, BindingResult bindingResult) {
+    public CommonResult insertRepairTrackRecord(RepairTrackRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairTrackRecordController implements RepairTrackRecordControllerA
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新跟踪记录数据
+     * @param rc 跟踪记录数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairTrackRecordById(RepairTrackRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairTrackRecordById(RepairTrackRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairTrackRecordController implements RepairTrackRecordControllerA
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 跟踪记录分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairTrackRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairTrackRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairTrackRecord> result = repairTrackRecordService.queryPageRepairTrackRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除跟踪记录
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairTrackRecordById(int id) {
+    public CommonResult deleteRepairTrackRecordById(int id) {
         RepairTrackRecord data = repairTrackRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在,删除失败!");

+ 28 - 4
src/main/java/com/repair/controller/RepairTransferRecordController.java

@@ -25,8 +25,14 @@ public class RepairTransferRecordController implements RepairTransferRecordContr
     @Autowired
     private RepairTransferRecordService repairTransferRecordService;
 
+    /**
+     * 新增转单审核记录
+     * @param rc 转单审核数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult InsertrepairTransferRecord(RepairTransferRecord rc, BindingResult bindingResult) {
+    public CommonResult insertRepairTransferRecord(RepairTransferRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -37,8 +43,14 @@ public class RepairTransferRecordController implements RepairTransferRecordContr
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新转单审核数据
+     * @param rc 转单审核数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
-    public CommonResult updaterepairTransferRecordById(RepairTransferRecord rc, BindingResult bindingResult) {
+    public CommonResult updateRepairTransferRecordById(RepairTransferRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -49,15 +61,27 @@ public class RepairTransferRecordController implements RepairTransferRecordContr
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 转单审核分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
-    public CommonResult queryPagerepairTransferRecords(int currentPage, int pageCount, String name) {
+    public CommonResult queryPageRepairTransferRecords(int currentPage, int pageCount, String name) {
         PageUtils<RepairTransferRecord> result = repairTransferRecordService.queryPageRepairTransferRecords(currentPage, pageCount, name);
 
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除转单审核数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
-    public CommonResult deleterepairTransferRecordById(int id) {
+    public CommonResult deleteRepairTransferRecordById(int id) {
         RepairTransferRecord data = repairTransferRecordService.getRepairById(id);
         if (data == null) {
             return CommonResult.fail("当前数据不存在,删除失败!");

+ 42 - 6
src/main/java/com/repair/controller/RepairUserController.java

@@ -48,8 +48,8 @@ public class RepairUserController implements RepairUserControllerAPI {
     /**
      * 添加员工数据接口
      *
-     * @param irur
-     * @param bindingResult
+     * @param irur 员工数据
+     * @param bindingResult 是否为空判断
      * @return
      */
     @Override
@@ -93,8 +93,8 @@ public class RepairUserController implements RepairUserControllerAPI {
     /**
      * 根据ID编辑用户数据的名称、手机号、身份、工种、维修班、楼栋关联ID、是否能转换、接单考核时间、维修考核时间
      *
-     * @param ra
-     * @param bindingResult
+     * @param ra 员工数据
+     * @param bindingResult 是否为空判断
      * @return
      */
     @Override
@@ -134,7 +134,6 @@ public class RepairUserController implements RepairUserControllerAPI {
      *                    黄家湖校区:1
      *                    墨轩湖校区:2
      * @return
-     * @Param schoolId   校区ID
      */
     @Override
     public CommonResult queryPageRepairUser(int currentPage, int pageCount, String keyWord, Integer teamId, Integer schoolId) {
@@ -162,7 +161,7 @@ public class RepairUserController implements RepairUserControllerAPI {
     /**
      * 根据ID删除用户数据
      *
-     * @param id
+     * @param id 数据ID
      * @return
      */
     @Override
@@ -200,6 +199,14 @@ public class RepairUserController implements RepairUserControllerAPI {
         return result == null ? CommonResult.fail("数据不存在") : CommonResult.ok(result);
     }
 
+    /**
+     * 员工分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param recordId 报修记录ID
+     * @param keyWord 关键字
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairUsers(int currentPage, int pageCount, Integer recordId, String keyWord) {
 
@@ -215,6 +222,13 @@ public class RepairUserController implements RepairUserControllerAPI {
         return CommonResult.ok(users);
     }
 
+    /**
+     * 通讯录数据查询
+     * @param schoolId 校区ID
+     * @param userId 用户ID
+     * @param keyWord 关键字
+     * @return
+     */
     @Override
     public CommonResult getAddressBook(Integer schoolId, Integer userId, String keyWord) {
         List<AddressBookVo> abs = repairUserService.queryAddressBook(userId, schoolId, keyWord);
@@ -232,6 +246,12 @@ public class RepairUserController implements RepairUserControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 编辑通讯录
+     * @param uabp 通讯录数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateAddressBook(updateAddressBookRequest uabp, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -254,6 +274,15 @@ public class RepairUserController implements RepairUserControllerAPI {
         return result <= 0 ? CommonResult.fail("更新失败") : CommonResult.ok("更新成功");
     }
 
+    /**
+     * 协作人员分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param schoolId 校区ID
+     * @param userId 用户ID
+     * @param keyWord 关键字
+     * @return
+     */
     @Override
     public CommonResult queryPageCollaborator(int currentPage, int pageCount, Integer schoolId, Integer userId,String keyWord) {
         String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
@@ -261,6 +290,13 @@ public class RepairUserController implements RepairUserControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 后勤首页工单完成排行榜
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param schoolId 校区ID
+     * @return
+     */
     @Override
     public CommonResult queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId) {
         PageUtils<PositiveReviewVo> result = repairUserService.queryPositiveReviewPage(currentPage, pageCount, schoolId);

+ 36 - 0
src/main/java/com/repair/controller/RepairWorkTypeController.java

@@ -30,6 +30,12 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
     @Autowired
     private RepairWorkTypeService repairWorkTypeService;
 
+    /**
+     * 新增工种数据
+     * @param rwt 工种数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult InsertRepairWorkType(RepairWorkType rwt, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -50,6 +56,12 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 更新工种数据
+     * @param rwt 工种数据
+     * @param bindingResult 是否为空判断
+     * @return
+     */
     @Override
     public CommonResult updateRepairWorkTypeById(RepairWorkType rwt, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -72,12 +84,24 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 工种分页数据查询
+     * @param currentPage 当前页数
+     * @param pageCount 一页数据条数
+     * @param name 查询名称
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairWorkTypes(int currentPage, int pageCount, String name) {
         PageUtils<RepairWorkType> result = repairWorkTypeService.queryPageRepairWorkTypes(currentPage, pageCount, name);
         return CommonResult.ok(result);
     }
 
+    /**
+     * 根据数据ID删除工种数据
+     * @param id 数据ID
+     * @return
+     */
     @Override
     public CommonResult deleteRepairWorkTypeById(int id) {
         RepairWorkType data = repairWorkTypeService.getRepairById(id);
@@ -90,6 +114,10 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
 
+    /**
+     * 获取工种下拉列表数据
+     * @return
+     */
     @Override
     public CommonResult getRepairWorkTypes() {
         List<RepairWorkTypeVo> result = repairWorkTypeService.getRepairWorkTypes();
@@ -97,6 +125,10 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
         return CommonResult.ok(result);
     }
 
+    /**
+     * 获取接单状态下拉数据
+     * @return
+     */
     @Override
     public CommonResult getReceivingState() {
         List<RepairWorkTypeVo> rs = new ArrayList<>();
@@ -111,6 +143,10 @@ public class RepairWorkTypeController implements RepairWorkTypeControllerAPI {
         return CommonResult.ok(rs);
     }
 
+    /**
+     * 身份列表数据查询
+     * @return
+     */
     @Override
     public CommonResult getRepairIdentitys() {
         List<RepairWorkTypeVo> result = new ArrayList<>();

+ 1 - 1
src/main/java/com/repair/model/request/finishOrderRequest.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 public class finishOrderRequest {
     /**
-     * 原密码
+     * 报修记录ID
      */
     @NotNull(message = "报修记录ID不能为空")
     private Integer recordId;

binární
target/repair_system-0.0.1-SNAPSHOT.jar.original