报修物品

.idea/workspace.xml

@@ -2,12 +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/LoginControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairEvaluateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairEvaluateMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/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/RepairAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairTrackRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairTrackRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -41,19 +50,37 @@
   <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/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1712">
-              <caret line="245" column="16" selection-start-line="245" selection-start-column="16" selection-end-line="245" selection-end-column="16" />
+            <state relative-caret-position="286">
+              <caret line="62" selection-start-line="62" selection-end-line="62" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <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="610">
+              <caret line="284" column="133" selection-start-line="284" selection-start-column="88" selection-end-line="284" selection-end-column="133" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="916">
+              <caret line="52" column="150" selection-start-line="52" selection-start-column="150" selection-end-line="52" selection-end-column="150" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.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="161">
-              <caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+            <state relative-caret-position="158">
+              <caret line="1865" column="31" selection-start-line="1865" selection-start-column="12" selection-end-line="1865" selection-end-column="31" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -62,19 +89,64 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="71" column="68" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="68" />
+            <state relative-caret-position="368">
+              <caret line="22" column="28" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+      <file pinned="false" current-in-tab="false">
+        <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="333">
+              <caret line="155" column="36" selection-start-line="155" selection-start-column="36" selection-end-line="155" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="336">
+              <caret line="57" column="21" selection-start-line="57" selection-start-column="21" selection-end-line="57" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="962">
+              <caret line="404" column="74" selection-start-line="404" selection-start-column="61" selection-end-line="404" selection-end-column="74" />
+              <folding>
+                <element signature="e#26033#26037#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="72" column="43" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="43" />
+            <state relative-caret-position="309">
+              <caret line="76" column="52" selection-start-line="76" selection-start-column="52" selection-end-line="76" selection-end-column="52" />
+              <folding>
+                <element signature="e#1302#1303#0" expanded="true" />
+                <element signature="e#1394#1395#0" expanded="true" />
+                <element signature="e#1175#1176#0" expanded="true" />
+                <element signature="e#1211#1212#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="322">
+              <caret line="14" column="72" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
             </state>
           </provider>
         </entry>
@@ -91,36 +163,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryLogisticHomeCount</find>
-      <find>queryTeamWorkTimeout</find>
-      <find>queryTeamWorkPage</find>
-      <find>queryTeamWorkPending</find>
-      <find>repairRecordTechnicianDataMap</find>
-      <find>queryTimeout</find>
-      <find>repairRecordPageMap</find>
-      <find>queryManagePage</find>
-      <find>user</find>
-      <find>queryTime</find>
-      <find>maintenanceState</find>
-      <find>split(&quot;-</find>
-      <find>maintenance_state</find>
-      <find>join</find>
-      <find>area_name</find>
-      <find>querySystemMessagePage</find>
-      <find>Mana</find>
-      <find>queryManageCount</find>
-      <find>queryNotTimeout</find>
-      <find>all_count</find>
-      <find>.or</find>
-      <find>deleteRepairArticleTypeById</find>
-      <find>insertRepairArticleType</find>
-      <find>card_number</find>
-      <find>isEm</find>
-      <find>@Tr</find>
       <find>getRepairArticleTypeByName</find>
       <find>queryEvaluatePageList</find>
       <find>queryPageList</find>
       <find>微校授权异常信息</find>
+      <find>finishOrder</find>
+      <find>queryConsumeByName</find>
+      <find>queryRepairArticleTypeTree</find>
+      <find>派单</find>
+      <find>QueryArticleTypeTreeRecords</find>
+      <find>==</find>
+      <find>receiveOwnOrders</find>
+      <find>deleteRepairAreaById</find>
+      <find>repairRecordReminder</find>
+      <find>queryRepairCardNumber</find>
+      <find>改价</find>
+      <find>mobileReply</find>
+      <find>senderId</find>
+      <find>finish</find>
+      <find>join</find>
+      <find>InsertM</find>
+      <find>case</find>
+      <find>new RepairTrackRecord</find>
+      <find>changeMaintenanceConsumables</find>
+      <find>.setContent(&quot;改价&quot;)</find>
+      <find>new RepairTrackRecord();</find>
+      <find>details</find>
+      <find>change</find>
+      <find>queryDetailData</find>
+      <find>isEmp</find>
+      <find>userhead</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -161,15 +233,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/freezeRepairAdminRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairClassesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairConsumeRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairShiftSettingRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/queryAccountPageRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairClassesRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateRepairShiftRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java" />
@@ -187,7 +250,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairClassesVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairUserVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TransferDetailVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxCodeVo.java" />
@@ -204,14 +266,24 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTrackRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
       </list>
     </option>
   </component>
@@ -656,12 +728,12 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="7358000" />
+      <workItem from="1692753806714" duration="18248000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="855573000" />
+    <option name="totallyTimeSpent" value="866463000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -673,7 +745,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -685,11 +757,11 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.21428572" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.1705757" />
       <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.71823204" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.9569061" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.73812157" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.36906078" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32932165" />
@@ -705,7 +777,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.75273526" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.7297593" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -797,12 +869,6 @@
           <option name="timeStamp" value="229" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>315</line>
-          <properties />
-          <option name="timeStamp" value="242" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java</url>
           <line>92</line>
           <properties />
@@ -864,7 +930,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>159</line>
+          <line>156</line>
           <properties />
           <option name="timeStamp" value="310" />
         </line-breakpoint>
@@ -882,368 +948,375 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/WxOpenVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <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="295">
+          <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eSchool.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="295">
+          <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairEvaluate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        <state relative-caret-position="88">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/MybatisPlusApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="552">
+          <caret line="35" column="24" selection-start-line="35" selection-start-column="16" selection-end-line="35" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3289">
-          <caret line="158" column="44" selection-start-line="158" selection-start-column="44" selection-end-line="158" selection-end-column="44" />
+        <state relative-caret-position="52">
+          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
         </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/services/impl/RepairEvaluateServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-533">
-          <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="943">
+          <caret line="55" column="77" selection-start-line="55" selection-start-column="56" selection-end-line="55" selection-end-column="77" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ChangeConsumesVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <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="295">
+          <caret line="71" column="68" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="68" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="394">
-          <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
+        <state relative-caret-position="402">
+          <caret line="117" column="35" lean-forward="true" selection-start-line="116" selection-start-column="12" selection-end-line="117" selection-end-column="35" />
         </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/model/request/repairRecordRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="81" column="47" selection-start-line="81" selection-start-column="47" selection-end-line="81" selection-end-column="47" />
+        <state relative-caret-position="309">
+          <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.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="792">
-          <caret line="129" column="47" selection-start-line="129" selection-start-column="36" selection-end-line="129" selection-end-column="47" />
+        <state relative-caret-position="287">
+          <caret line="59" column="32" lean-forward="true" selection-start-line="59" selection-start-column="32" selection-end-line="59" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="10">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+        <state relative-caret-position="483">
+          <caret line="23" column="26" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="361">
+          <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <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="322">
-          <caret line="14" column="17" lean-forward="true" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+        <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/controller/RepairSystemSettingController.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="287">
+          <caret line="149" selection-start-line="149" selection-end-line="149" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.3/spring-webmvc-5.3.3.jar!/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="460">
+          <caret line="51" selection-start-line="51" selection-end-line="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.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="654">
-          <caret line="45" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="437">
+          <caret line="70" column="50" selection-start-line="70" selection-start-column="50" selection-end-line="70" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="667">
-          <caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
+        <state relative-caret-position="-1278">
+          <caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="28" column="7" selection-start-line="28" selection-start-column="4" selection-end-line="28" selection-end-column="7" />
+          <caret line="78" column="16" selection-start-line="78" selection-start-column="16" selection-end-line="78" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.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="594">
-          <caret line="84" column="35" selection-start-line="84" selection-start-column="15" selection-end-line="84" selection-end-column="35" />
+        <state relative-caret-position="295">
+          <caret line="38" column="20" selection-start-line="38" selection-start-column="20" selection-end-line="38" selection-end-column="20" />
         </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/common/utils/HttpsClient.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+          <caret line="338" column="52" selection-start-line="338" selection-start-column="52" selection-end-line="338" selection-end-column="52" />
         </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/common/utils/SHA1.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1071">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1075#1076#0" expanded="true" />
-            <element signature="e#1166#1167#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="448">
+          <caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
+        <state relative-caret-position="425">
+          <caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
         </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/common/utils/DelayedUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="287">
+          <caret line="227" column="88" selection-start-line="227" selection-start-column="88" selection-end-line="227" selection-end-column="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2369">
-          <caret line="118" column="13" selection-start-line="118" selection-start-column="13" selection-end-line="118" selection-end-column="13" />
+        <state relative-caret-position="295">
+          <caret line="84" column="86" selection-start-line="84" selection-start-column="86" selection-end-line="84" selection-end-column="86" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/Calendar.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1472">
-          <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
+        <state relative-caret-position="295">
+          <caret line="467" column="28" selection-start-line="467" selection-start-column="28" selection-end-line="467" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="436" column="18" selection-start-line="436" selection-start-column="18" selection-end-line="436" selection-end-column="18" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PageUtils.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/org/w3c/dom/Node.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="897">
-          <caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
+        <state relative-caret-position="295">
+          <caret line="169" column="30" selection-start-line="169" selection-start-column="30" selection-end-line="169" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="35" column="182" selection-start-line="35" selection-start-column="182" selection-end-line="35" selection-end-column="182" />
+        <state relative-caret-position="295">
+          <caret line="276" column="53" selection-start-line="276" selection-start-column="53" selection-end-line="276" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ValidateCode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="135" column="47" selection-start-line="135" selection-start-column="31" selection-end-line="135" selection-end-column="47" />
+        <state relative-caret-position="207">
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="568">
-          <caret line="46" column="107" selection-start-line="46" selection-start-column="100" selection-end-line="46" selection-end-column="107" />
+        <state relative-caret-position="295">
+          <caret line="50" column="84" selection-start-line="50" selection-start-column="84" selection-end-line="50" selection-end-column="84" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <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="551">
+          <caret line="177" column="35" selection-start-line="177" selection-start-column="35" selection-end-line="177" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml">
       <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="207">
+          <caret line="9" column="67" selection-start-line="9" selection-start-column="67" selection-end-line="9" selection-end-column="67" />
         </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/request/MobileRevertRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="76" selection-start-line="76" selection-end-line="76" />
+        <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/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="70">
-          <caret line="208" column="12" selection-start-line="208" selection-start-column="12" selection-end-line="208" selection-end-column="12" />
+        <state relative-caret-position="287">
+          <caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
         </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/model/request/finishOrderRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="49" column="37" selection-start-line="47" selection-start-column="8" selection-end-line="49" selection-end-column="37" />
+        <state relative-caret-position="759">
+          <caret line="46" column="31" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.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="295">
-          <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
+        <state relative-caret-position="506">
+          <caret line="25" column="26" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.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="632">
-          <caret line="48" selection-start-line="48" selection-end-line="49" />
+        <state relative-caret-position="269">
+          <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
         </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/model/request/repairLeaveMessageRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="31" column="26" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="26" />
+        <state relative-caret-position="571">
+          <caret line="28" column="26" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="1830" column="31" selection-start-line="1830" selection-start-column="12" selection-end-line="1830" selection-end-column="31" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-105">
+          <caret line="78" column="59" selection-start-line="78" selection-start-column="39" selection-end-line="78" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairEvaluate.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArea.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
+        <state relative-caret-position="295">
           <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="35" column="24" selection-start-line="35" selection-start-column="16" selection-end-line="35" selection-end-column="24" />
+        <state relative-caret-position="286">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="85" column="24" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+        <state relative-caret-position="336">
+          <caret line="57" column="21" selection-start-line="57" selection-start-column="21" selection-end-line="57" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml">
+    <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="52">
-          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+        <state relative-caret-position="333">
+          <caret line="155" column="36" selection-start-line="155" selection-start-column="36" selection-end-line="155" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="943">
-          <caret line="55" column="77" selection-start-line="55" selection-start-column="56" selection-end-line="55" selection-end-column="77" />
+        <state relative-caret-position="916">
+          <caret line="52" column="150" selection-start-line="52" selection-start-column="150" selection-end-line="52" selection-end-column="150" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="640">
-          <caret line="130" column="78" selection-start-line="130" selection-start-column="65" selection-end-line="130" selection-end-column="78" />
+        <state relative-caret-position="322">
+          <caret line="14" column="72" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1712">
-          <caret line="245" column="16" selection-start-line="245" selection-start-column="16" selection-end-line="245" selection-end-column="16" />
+        <state relative-caret-position="158">
+          <caret line="1865" column="31" selection-start-line="1865" selection-start-column="12" selection-end-line="1865" selection-end-column="31" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="46" column="9" selection-start-line="46" selection-start-column="9" selection-end-line="46" selection-end-column="9" />
+        <state relative-caret-position="368">
+          <caret line="22" column="28" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <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="309">
+          <caret line="76" column="52" selection-start-line="76" selection-start-column="52" selection-end-line="76" selection-end-column="52" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1302#1303#0" expanded="true" />
+            <element signature="e#1394#1395#0" expanded="true" />
+            <element signature="e#1175#1176#0" expanded="true" />
+            <element signature="e#1211#1212#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.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="295">
-          <caret line="71" column="68" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="68" />
+        <state relative-caret-position="962">
+          <caret line="404" column="74" selection-start-line="404" selection-start-column="61" selection-end-line="404" selection-end-column="74" />
+          <folding>
+            <element signature="e#26033#26037#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.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="200">
-          <caret line="72" column="43" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="43" />
+        <state relative-caret-position="610">
+          <caret line="284" column="133" selection-start-line="284" selection-start-column="88" selection-end-line="284" selection-end-column="133" />
         </state>
       </provider>
     </entry>

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

@@ -42,7 +42,7 @@ public interface RepairConsumablesControllerAPI {
 
     @PostMapping(value = "/insertMaintenanceConsumables")
     @ApiOperation(value = "维修师傅报价", notes = "维修师傅报价", httpMethod = "POST")
-    CommonResult InsertMaintenanceConsumables(@Validated @RequestBody MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception;
+    CommonResult InsertMaintenanceConsumables(@Validated @RequestBody MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/queryChangePriceConsumables")
     @ApiOperation(value = "获取改价耗材集合数据", notes = "获取改价耗材集合数据", httpMethod = "GET")
@@ -50,6 +50,6 @@ public interface RepairConsumablesControllerAPI {
 
     @PostMapping(value = "/changeMaintenanceConsumables")
     @ApiOperation(value = "后勤人员改价", notes = "后勤人员改价", httpMethod = "POST")
-    CommonResult changeMaintenanceConsumables(@Validated @RequestBody MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception;
+    CommonResult changeMaintenanceConsumables(@Validated @RequestBody MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
 }

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

@@ -97,7 +97,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/finishOrder")
     @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "POST")
-    CommonResult finishOrder(@Validated @RequestBody finishOrderRequest data, BindingResult bindingResult) throws Exception;
+    CommonResult finishOrder(@Validated @RequestBody finishOrderRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @PostMapping(value = "/transferApply")
     @ApiOperation(value = "转单申请", notes = "转单申请", httpMethod = "POST")
@@ -117,7 +117,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/receiveSendOrders")
     @ApiOperation(value = "派单", notes = "派单", httpMethod = "POST")
-    CommonResult receiveSendOrders(@RequestBody ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception;
+    CommonResult receiveSendOrders(@RequestBody ReceiveSendOrdersRequest rsor, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/dropDown")
     @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
@@ -157,7 +157,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/alterPrice")
     @ApiOperation(value = "改价", notes = "改价", httpMethod = "POST")
-    CommonResult alterPrice(@RequestBody AlterPriceRequest apr, BindingResult bindingResult) throws Exception;
+    CommonResult alterPrice(@RequestBody AlterPriceRequest apr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @PostMapping(value = "/delayed")
     @ApiOperation(value = "延时", notes = "延时", httpMethod = "POST")

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

@@ -94,7 +94,7 @@ public class RepairAreaController implements RepairAreaControllerAPI {
     private List<RepairAreaTreeVo> QueryAreaTreeRecords(Integer parentID, List<RepairArea> lists) {
         List<RepairAreaTreeVo> newTrees = new ArrayList<>();
 
-        List<RepairArea> datas = lists.stream().filter(e -> e.getParentId() == parentID).collect(Collectors.toList());
+        List<RepairArea> datas = lists.stream().filter(e -> e.getParentId().equals(parentID)).collect(Collectors.toList());
 
         for (RepairArea data : datas) {
             RepairAreaTreeVo item = RepairAreaTreeVo.builder()
@@ -129,7 +129,7 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         i--;
         List<RepairAreaTreeVo> newTrees = new ArrayList<>();
 
-        List<RepairArea> datas = lists.stream().filter(e -> e.getParentId() == parentID).collect(Collectors.toList());
+        List<RepairArea> datas = lists.stream().filter(e -> e.getParentId().equals(parentID)).collect(Collectors.toList());
         if(i < 0){
             datas = new ArrayList<>();
         }

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

@@ -144,7 +144,7 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
     private List<RepairArticleTypeTreeVo> QueryArticleTypeTreeRecords(Integer parentID, List<RepairArticleType> lists) {
         List<RepairArticleTypeTreeVo> newTrees = new ArrayList<>();
 
-        List<RepairArticleType> datas = lists.stream().filter(e -> e.getParentId() == parentID).collect(Collectors.toList());
+        List<RepairArticleType> datas = lists.stream().filter(e -> e.getParentId().equals(parentID)).collect(Collectors.toList());
 
         for (RepairArticleType data : datas) {
             RepairArticleTypeTreeVo item = RepairArticleTypeTreeVo.builder()

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

@@ -2,15 +2,10 @@ package com.repair.controller;
 
 
 import com.repair.api.RepairConsumablesControllerAPI;
-import com.repair.common.utils.ExcelExportUtil;
-import com.repair.common.utils.ExcelUtils;
-import com.repair.common.utils.TimeExchange;
-import com.repair.common.utils.paramUtils;
+import com.repair.common.utils.*;
+import com.repair.model.enumModel.eIsSuper;
 import com.repair.model.enumModel.eRecordStatu;
-import com.repair.model.pojo.RepairConsumables;
-import com.repair.model.pojo.RepairRecord;
-import com.repair.model.pojo.RepairSystemMessages;
-import com.repair.model.pojo.RepairTrackRecord;
+import com.repair.model.pojo.*;
 import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
@@ -18,14 +13,12 @@ import com.repair.model.vo.ChangeConsumesVo;
 import com.repair.model.vo.ChangePriceConsumeVo;
 import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.model.vo.ConsumablePageVo;
-import com.repair.services.RepairConsumablesService;
-import com.repair.services.RepairRecordService;
-import com.repair.services.RepairSystemMessagesService;
-import com.repair.services.RepairTrackRecordService;
+import com.repair.services.*;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -49,6 +42,10 @@ import java.util.stream.Collectors;
 public class RepairConsumablesController implements RepairConsumablesControllerAPI {
 
     @Autowired
+    private RepairUserService repairUserService;
+    @Autowired
+    private RepairAdminService repairAdminService;
+    @Autowired
     private RepairRecordService repairRecordService;
     @Autowired
     private RepairTrackRecordService repairTrackRecordService;
@@ -155,7 +152,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public CommonResult InsertMaintenanceConsumables(MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception {
+    public CommonResult InsertMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
         try {
             if (bindingResult.hasErrors()) {
                 String st = paramUtils.getParamError(bindingResult);
@@ -226,11 +223,29 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 throw new Exception("报价失败！");
             }
 
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                throw new Exception("操作人信息不合法，无法进行回复！");
+            }
+
+            //发送人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                if (user == null) {
+                    throw new Exception("管理端账号未与移动端账号绑定，无法进行审核！");
+                }
+                senderId = user.getId();
+            }
+
             //添加跟踪记录
             RepairTrackRecord rtr = new RepairTrackRecord();
             rtr.setRecordId(data.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             rtr.setContent("待确认");
+            rtr.setUserId(senderId);
+            rtr.setUserZzstr("技术员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("报价失败");
@@ -267,7 +282,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public CommonResult changeMaintenanceConsumables(MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception {
+    public CommonResult changeMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
         try {
             if (bindingResult.hasErrors()) {
                 String st = paramUtils.getParamError(bindingResult);
@@ -350,6 +365,37 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 }
             }
 
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                //return CommonResult.fail("操作人信息不合法，无法进行回复！");
+                throw new Exception("操作人信息不合法，无法进行回复！");
+            }
+
+            //发送人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                if (user == null) {
+                    //return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行审核！");
+                    throw new Exception("管理端账号未与移动端账号绑定，无法进行审核！");
+                }
+                senderId = user.getId();
+            }
+
+            //追踪记录表
+            RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+            repairTrackRecord.setRecordId(data.getRecordId());
+            repairTrackRecord.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
+            repairTrackRecord.setContent("改价");
+            repairTrackRecord.setUserId(senderId);
+            repairTrackRecord.setUserZzstr("技术员");
+            int save = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
+
+            if(save <= 0){
+                throw new Exception("改价失败！");
+            }
+
         } catch (Exception e) {
             throw new Exception("改价失败！");
         }

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

@@ -114,6 +114,8 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
             rtr.setRecordId(repairEvaluate.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.Finished.getValue());
             rtr.setContent("用户评价");
+            rtr.setUserId(rr.getUserId());
+            rtr.setUserZzstr("用户");
             int insertRtr =repairTrackRecordService.insertRepairTrackRecord(rtr);
             if(insertRtr <= 0){
                 throw new Exception("评价失败！");

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

@@ -157,6 +157,8 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             rtr.setRecordId(rlmr.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
             rtr.setContent("用户转后勤：" + rlmr.getContent());
+            rtr.setUserId(rlmr.getUserId());
+            rtr.setUserZzstr("用户");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("转后勤失败！");

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

@@ -285,6 +285,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 rtr.setRecordId(rr.getId());
                 rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
                 rtr.setContent("订单支付");
+                rtr.setUserId(rr.getUserId());
+                rtr.setUserZzstr("用户");
                 int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
                 if (insertRtr <= 0) {
                     throw new Exception("支付回调失败！");
@@ -473,6 +475,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(result);
             rtr.setMaintenanceState(eRecordStatu.Dispatch.getValue());
             rtr.setContent("提交订单");
+            rtr.setUserId(rr.getUserId());
+            rtr.setUserZzstr("用户");
+            rtr.setImage(StringUtils.join(rrr.getImages(), ','));
+            rtr.setVoice(rrr.getVoice());
+            rtr.setVoiceLength(rrr.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("报修单提交失败！");
@@ -634,6 +641,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(id);
             rtr.setMaintenanceState(eRecordStatu.Canceled.getValue());
             rtr.setContent("用户撤销");
+            rtr.setUserId(data.getUserId());
+            rtr.setUserZzstr("用户");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("报修单提交失败！");
@@ -660,7 +669,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             long count = evaluates.stream().filter(e -> e.getRecordId().equals(r.getId())).count();
             r.setState(eRecordStatu.stringOf(r.getStateId()));
             r.setImages(Arrays.asList(r.getImage().split(",")));
-            List<RepairConsumables> datas = rcs.stream().filter(e -> e.getRecordId() == r.getId()).collect(Collectors.toList());
+            List<RepairConsumables> datas = rcs.stream().filter(e -> e.getRecordId().equals(r.getId())).collect(Collectors.toList());
             r.setConsumables(datas);
             r.setEvaluate((count <= 0 && r.getStateId() == eRecordStatu.Finished.getValue()) ? 1 : 0);
         }
@@ -1174,6 +1183,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(recordId);
             rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
             rtr.setContent("已接单");
+            rtr.setUserId(userId);
+            rtr.setUserZzstr("技术员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("抢单失败！");
@@ -1337,6 +1348,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(recordId);
             rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
             rtr.setContent("已接单");
+            rtr.setUserId(userId);
+            rtr.setUserZzstr("技术员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("接单失败");
@@ -1358,7 +1371,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public CommonResult receiveSendOrders(ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception {
+    public CommonResult receiveSendOrders(ReceiveSendOrdersRequest rsor, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -1460,11 +1473,29 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
             }
 
-            //添加跟踪记录
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                return CommonResult.fail("操作人信息不合法，无法进行回复！");
+            }
+
+            //操作人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                if (user == null) {
+                    return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行审核！");
+                }
+                senderId = user.getId();
+            }
+
+            //添加跟踪记录  派单不加跟踪记录
             RepairTrackRecord rtr = new RepairTrackRecord();
             rtr.setRecordId(rsor.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.Dispatch.getValue());
             rtr.setContent("已派单");
+            rtr.setUserId(senderId);
+            rtr.setUserZzstr("管理员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("派单失败");
@@ -1612,6 +1643,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             repairTrackRecord.setRecordId(rr.getId());
             repairTrackRecord.setContent("转单审核");
             repairTrackRecord.setMaintenanceState(rr.getMaintenanceState());
+            repairTrackRecord.setUserId(senderId);
+            repairTrackRecord.setUserZzstr("管理员");
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             if (insertTrack <= 0) {
                 throw new Exception("转单审核失败！");
@@ -1780,6 +1813,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(collaborateRecord.getRecordId());
             rtr.setMaintenanceState(rr.getMaintenanceState());
             rtr.setContent("协作审批");
+            rtr.setUserId(senderId);
+            rtr.setUserZzstr("管理员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("协作审核失败！");
@@ -1935,7 +1970,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public CommonResult alterPrice(AlterPriceRequest apr, BindingResult bindingResult) throws Exception {
+    public CommonResult alterPrice(AlterPriceRequest apr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -1994,20 +2029,38 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     }
                 }
             }
-//        修改维修表总价
+            //        修改维修表总价
             RepairRecord repairRecord = repairRecordService.getById(recordId);
             if (ObjectUtils.isEmpty(repairRecord)) {
                 return CommonResult.fail("改价失败");
             }
 
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                return CommonResult.fail("操作人信息不合法，无法进行回复！");
+            }
+
+            //发送人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                if (user == null) {
+                    return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行审核！");
+                }
+                senderId = user.getId();
+            }
+
             repairRecord.setPrice(apr.getTotalPrice());
             boolean update = repairRecordService.updateById(repairRecord);
 
-            //        追踪记录表
+            //追踪记录表
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(recordId);
             repairTrackRecord.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             repairTrackRecord.setContent("改价");
+            repairTrackRecord.setUserId(senderId);
+            repairTrackRecord.setUserZzstr("管理员");
             boolean save = repairTrackRecordService.save(repairTrackRecord);
 
             if (!(update && save)) {
@@ -2070,15 +2123,15 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             }
 
-            //追踪记录表
-            RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
-            repairTrackRecord.setRecordId(dr.getRecordId());
-            repairTrackRecord.setContent("延时");
-            boolean save = repairTrackRecordService.save(repairTrackRecord);
-
-            if (!save) {
-                throw new Exception("延时失败");
-            }
+//            //追踪记录表
+//            RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+//            repairTrackRecord.setRecordId(dr.getRecordId());
+//            repairTrackRecord.setContent("延时");
+//            boolean save = repairTrackRecordService.save(repairTrackRecord);
+//
+//            if (!save) {
+//                throw new Exception("延时失败");
+//            }
         } catch (Exception e) {
             throw new Exception("延时失败");
         }
@@ -2160,6 +2213,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(data.getId());
             repairTrackRecord.setContent("回复");
+            repairTrackRecord.setUserId(senderId);
+            repairTrackRecord.setUserZzstr("管理员");
+
             boolean save = repairTrackRecordService.save(repairTrackRecord);
 
             if (!save) {
@@ -3371,6 +3427,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(data.getId());
             repairTrackRecord.setContent("回复");
+            repairTrackRecord.setUserId(mrr.getUserId());
+            repairTrackRecord.setUserZzstr("管理员");
             boolean save = repairTrackRecordService.save(repairTrackRecord);
 
             if (!save) {
@@ -3434,6 +3492,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(recordId);
             rtr.setMaintenanceState(eRecordStatu.Closed.getValue());
             rtr.setContent("订单关闭");
+            rtr.setUserId(Integer.valueOf(userId));
+            rtr.setUserZzstr("技术员");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("关单失败");
@@ -3447,7 +3507,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public CommonResult finishOrder(finishOrderRequest data, BindingResult bindingResult) throws Exception {
+    public CommonResult finishOrder(finishOrderRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
         try {
             if (bindingResult.hasErrors()) {
                 String st = paramUtils.getParamError(bindingResult);
@@ -3532,11 +3592,32 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("提交失败！");
             }
 
+            String userID = AesUtils.decrypt(userhead);
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if (operateData == null) {
+                return CommonResult.fail("操作人信息不合法，无法进行回复！");
+            }
+
+            //发送人
+            Integer senderId = 0;//超级管理员用ID为0
+            if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+                RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+                if (user == null) {
+                    return CommonResult.fail("管理端账号未与移动端账号绑定，无法进行审核！");
+                }
+                senderId = user.getId();
+            }
+
             //添加跟踪记录
             RepairTrackRecord rtr = new RepairTrackRecord();
             rtr.setRecordId(data.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.Finished.getValue());
             rtr.setContent("已完成");
+            rtr.setUserId(senderId);
+            rtr.setUserZzstr("技术员");
+            rtr.setImage(StringUtils.join(data.getImages()));
+            rtr.setVoice(data.getVoice());
+            rtr.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("提交失败");
@@ -3616,6 +3697,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtrR.setRecordId(data.getRecordId());
             rtrR.setMaintenanceState(eRecordStatu.Transfer.getValue());
             rtrR.setContent("转单审核申请");
+            rtrR.setUserId(data.getUserId());
+            rtrR.setUserZzstr("技术员");
+            rtrR.setVoice(data.getVoice());
+            rtrR.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtrR);
             if (insertRtr <= 0) {
                 throw new Exception("转单审核发起失败！");
@@ -3704,6 +3789,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setRecordId(data.getRecordId());
             rtr.setMaintenanceState(eRecordStatu.Collaborate.getValue());
             rtr.setContent("协作审核申请");
+            rtr.setUserId(data.getUserId());
+            rtr.setUserZzstr("技术员");
+            rtr.setVoice(data.getVoice());
+            rtr.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("协作审核发起失败");

src/main/java/com/repair/model/pojo/RepairTrackRecord.java

@@ -44,6 +44,21 @@ public class RepairTrackRecord implements Serializable {
     @NotNull(message = "维修状态不能为空")
     private Integer maintenanceState;
 
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "用户身份")
+    private String userZzstr;
+
+    @ApiModelProperty(value = "照片")
+    private String image;
+
+    @ApiModelProperty(value = "录音")
+    private String voice;
+
+    @ApiModelProperty(value = "录音时长")
+    private Integer voiceLength;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -1,9 +1,13 @@
 package com.repair.model.vo;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.repair.model.enumModel.eRecordStatu;
 import lombok.Data;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class TrackDetailsVo {
@@ -47,4 +51,43 @@ public class TrackDetailsVo {
      * 跟踪时间
      */
     private Date createTime;
+
+    /**
+     * 名称
+     */
+    private String userName;
+
+    /**
+     * 身份
+     */
+    private String userZzstr;
+
+    /**
+     * 照片
+     */
+    @JsonIgnore
+    private String image;
+
+    /**
+     * 照片集合
+     */
+    private List<String> images;
+
+    public List<String> getImages() {
+        return ObjectUtils.isEmpty(image) ? images : Arrays.asList(image.split(","));
+    }
+
+    public void setImages(List<String> images) {
+        this.images = images;
+    }
+
+    /**
+     * 录音
+     */
+    private String voice;
+
+    /**
+     * 录音时长
+     */
+    private Integer voiceLength;
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.repair.mapper.RepairAreaMapper;
 import com.repair.model.pojo.RepairArea;
+import com.repair.model.pojo.RepairArticleType;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.RepairSchoolVo;
 import com.repair.services.RepairAreaService;
@@ -52,7 +53,11 @@ public class RepairAreaServiceImpl extends ServiceImpl<RepairAreaMapper, RepairA
 
     @Override
     public int deleteRepairAreaById(int id) {
-        int result = repairAreaMapper.deleteById(id);
+        QueryWrapper<RepairArea> queryWrapper = new QueryWrapper<>();
+        queryWrapper.and(e -> e.eq("id", id)
+                .or()
+                .eq("parent_id", id));
+        int result = repairAreaMapper.delete(queryWrapper);
         return result;
     }
 

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

@@ -6,14 +6,20 @@
         <result property="maintenanceState" column="maintenance_state"/>
         <result property="state" column="state"/>
         <result property="createTime" column="create_time"/>
+        <result property="userName" column="user_name"/>
+        <result property="userZzstr" column="user_zzstr"/>
+        <result property="image" column="image"/>
+        <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
     </resultMap>
     <select id="queryDetailData" resultType="com.repair.model.vo.TrackDetailsVo" resultMap="detailDatasMap">
-        select id,maintenance_state,content as state,create_time from repair_track_record
-        where deleted = 0
+        select rtr.id,rtr.maintenance_state,rtr.content as state,rtr.create_time,ru.user_name,rtr.user_zzstr,rtr.image,rtr.voice,rtr.voice_length from repair_track_record rtr
+        left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
+        where rtr.deleted = 0
         <if test="recordId != null and recordId != ''">
-            and record_id = #{recordId}
+            and rtr.record_id = #{recordId}
         </if>
-        order by create_time asc
+        order by rtr.create_time asc
     </select>
 
 </mapper>

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

@@ -67,7 +67,7 @@
     <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
         select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
         left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and ( FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
         where ru.id = #{userId} and ru.deleted = 0
     </select>
 
@@ -192,7 +192,7 @@
         from repair_user ru
         where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
     </select>
-    
+
     <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
         select * from (
         select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru

target/classes/mapper/repair/RepairTrackRecordMapper.xml

@@ -6,14 +6,20 @@
         <result property="maintenanceState" column="maintenance_state"/>
         <result property="state" column="state"/>
         <result property="createTime" column="create_time"/>
+        <result property="userName" column="user_name"/>
+        <result property="userZzstr" column="user_zzstr"/>
+        <result property="image" column="image"/>
+        <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
     </resultMap>
     <select id="queryDetailData" resultType="com.repair.model.vo.TrackDetailsVo" resultMap="detailDatasMap">
-        select id,maintenance_state,content as state,create_time from repair_track_record
-        where deleted = 0
+        select rtr.id,rtr.maintenance_state,rtr.content as state,rtr.create_time,ru.user_name,rtr.user_zzstr,rtr.image,rtr.voice,rtr.voice_length from repair_track_record rtr
+        left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
+        where rtr.deleted = 0
         <if test="recordId != null and recordId != ''">
-            and record_id = #{recordId}
+            and rtr.record_id = #{recordId}
         </if>
-        order by create_time asc
+        order by rtr.create_time asc
     </select>
 
 </mapper>

target/classes/mapper/repair/RepairUserMapper.xml

@@ -67,7 +67,7 @@
     <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
         select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
         left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and ( FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
         where ru.id = #{userId} and ru.deleted = 0
     </select>
 
@@ -192,7 +192,7 @@
         from repair_user ru
         where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
     </select>
-    
+
     <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
         select * from (
         select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru