测试数据

.idea/workspace.xml

@@ -2,7 +2,19 @@
 <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/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/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/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/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/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -35,64 +47,67 @@
   <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/RepairAreaController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-214">
-              <caret line="59" column="46" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
+            <state relative-caret-position="12">
+              <caret line="89" column="62" selection-start-line="89" selection-start-column="62" selection-end-line="89" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1357">
-              <caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
+            <state relative-caret-position="184">
+              <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="112">
-              <caret line="78" column="97" selection-start-line="78" selection-start-column="68" selection-end-line="78" selection-end-column="97" />
+            <state relative-caret-position="324">
+              <caret line="293" column="47" selection-start-line="293" selection-start-column="47" selection-end-line="293" selection-end-column="47" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="48" column="37" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" />
+            <state relative-caret-position="424">
+              <caret line="51" column="12" selection-start-line="51" selection-start-column="12" selection-end-line="51" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret line="171" column="80" selection-start-line="171" selection-start-column="80" selection-end-line="171" selection-end-column="80" />
+            <state relative-caret-position="64">
+              <caret line="3634" column="33" selection-start-line="3634" selection-start-column="33" selection-end-line="3634" selection-end-column="33" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+      <file pinned="false" current-in-tab="false">
+        <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="43">
-              <caret line="60" column="62" selection-start-line="60" selection-start-column="62" selection-end-line="60" selection-end-column="62" />
+            <state relative-caret-position="552">
+              <caret line="40" column="29" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="29" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="202" column="40" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="40" />
+            <state relative-caret-position="460">
+              <caret line="24" column="29" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -100,29 +115,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WeiXiaoUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="959">
-              <caret line="71" column="104" selection-start-line="71" selection-start-column="85" selection-end-line="71" selection-end-column="104" />
+            <state relative-caret-position="402">
+              <caret line="90" column="33" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/CommonResult.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1568">
-              <caret line="220" column="25" selection-start-line="220" selection-start-column="25" selection-end-line="220" selection-end-column="25" />
+            <state relative-caret-position="318">
+              <caret line="41" column="64" selection-start-line="41" selection-start-column="64" selection-end-line="41" selection-end-column="64" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="483">
-              <caret line="291" column="17" selection-start-line="281" selection-start-column="16" selection-end-line="291" selection-end-column="17" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="230">
+              <caret line="10" column="15" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -139,14 +151,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <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>
@@ -166,9 +170,17 @@
       <find>!= null</find>
       <find>queryProsperityRepairPayRecords</find>
       <find>wxAccessTokenSer</find>
-      <find>openid</find>
       <find>getApplicationToken</find>
       <find>repairPayment</find>
+      <find>notifyPay</find>
+      <find>openid</find>
+      <find>downloadRepairAdminExcel</find>
+      <find>过期</find>
+      <find>撤销</find>
+      <find>queryManageCount</find>
+      <find>revokeRepairRecordById</find>
+      <find>readSystemMessage</find>
+      <find>repairRecordReminder</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -209,8 +221,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesSettingVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassSettingDateVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateDetailVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumableExcelVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumeVo.java" />
@@ -238,7 +248,6 @@
         <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/resources/mapper/repair/RepairRecordMapper.xml" />
-        <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" />
@@ -247,7 +256,6 @@
         <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/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/resources/mapper/repair/RepairTrackRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
@@ -255,11 +263,15 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairAreaService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
   </component>
@@ -611,7 +623,7 @@
       <module name="repair_backend" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.repair.controller.*" />
+          <option name="PATTERN" value="com.repair.model.request.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -624,7 +636,7 @@
       <module name="repair_backend" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.repair.controller.*" />
+          <option name="PATTERN" value="com.repair.model.request.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -704,12 +716,12 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="24632000" />
+      <workItem from="1692753806714" duration="31077000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="872847000" />
+    <option name="totallyTimeSpent" value="879292000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -733,11 +745,11 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.38512036" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.26258206" />
       <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.7428884" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.85856354" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.7513812" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.82209945" />
       <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" />
@@ -753,7 +765,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.7450766" />
+      <window_info anchor="right" id="Maven" order="2" visible="true" weight="0.42231947" />
       <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" />
@@ -852,7 +864,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>118</line>
+          <line>117</line>
           <properties />
           <option name="timeStamp" value="244" />
         </line-breakpoint>
@@ -894,7 +906,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
-          <line>156</line>
+          <line>157</line>
           <properties />
           <option name="timeStamp" value="310" />
         </line-breakpoint>
@@ -906,10 +918,34 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
-          <line>285</line>
+          <line>284</line>
           <properties />
           <option name="timeStamp" value="322" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>487</line>
+          <properties />
+          <option name="timeStamp" value="323" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>590</line>
+          <properties />
+          <option name="timeStamp" value="324" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1369</line>
+          <properties />
+          <option name="timeStamp" value="325" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1220</line>
+          <properties />
+          <option name="timeStamp" value="326" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -918,86 +954,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="287">
-          <caret line="149" selection-start-line="149" selection-end-line="149" />
-        </state>
-      </provider>
-    </entry>
-    <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="460">
-          <caret line="51" selection-start-line="51" selection-end-line="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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/controller/RepairArticleTypeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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="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="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/model/pojo/RepairConsumables.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/common/utils/SHA1.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/model/vo/ClassesDataVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/common/utils/DelayedUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/services/impl/RepairUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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="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="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/java/com/repair/common/utils/TimeExchange.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="287">
@@ -1054,13 +1010,6 @@
         </state>
       </provider>
     </entry>
-    <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="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/request/transferApplyRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="506">
@@ -1082,13 +1031,6 @@
         </state>
       </provider>
     </entry>
-    <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="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/services/impl/RepairArticleTypeServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -1117,13 +1059,6 @@
         </state>
       </provider>
     </entry>
-    <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="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">
@@ -1137,16 +1072,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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/RepairConsumeService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="575">
@@ -1203,13 +1128,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-214">
-          <caret line="59" column="46" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="287">
@@ -1245,48 +1163,163 @@
         </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/services/impl/RepairNoticeSettingServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="202" column="40" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="40" />
+        <state relative-caret-position="135">
+          <caret line="48" column="37" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WeiXiaoUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="959">
-          <caret line="71" column="104" selection-start-line="71" selection-start-column="85" selection-end-line="71" selection-end-column="104" />
+        <state relative-caret-position="-207">
+          <caret line="65" selection-start-line="65" selection-end-line="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/MaintenanceConsumeablesRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1357">
-          <caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
+        <state relative-caret-position="2779">
+          <caret line="214" column="26" selection-start-line="214" selection-start-column="26" selection-end-line="214" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairNoticeSettingServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="48" column="37" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" />
+        <state relative-caret-position="624">
+          <caret line="41" column="46" selection-start-line="41" selection-start-column="46" selection-end-line="41" selection-end-column="46" />
         </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/model/pojo/RepairArea.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <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/api/RepairAreaControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="45" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="83" column="9" selection-start-line="83" selection-start-column="9" selection-end-line="83" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="632">
+          <caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsExceptionHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="71" selection-start-line="71" selection-end-line="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="291" column="17" selection-start-line="281" selection-start-column="16" selection-end-line="291" selection-end-column="17" />
+        <state relative-caret-position="1235">
+          <caret line="325" column="11" selection-start-line="287" selection-start-column="9" selection-end-line="325" selection-end-column="11" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#26033#26037#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="12">
+          <caret line="89" column="62" selection-start-line="89" selection-start-column="62" selection-end-line="89" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/wxLoginVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="424">
+          <caret line="51" column="12" selection-start-line="51" selection-start-column="12" selection-end-line="51" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="293" column="47" selection-start-line="293" selection-start-column="47" selection-end-line="293" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WeiXiaoUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="402">
+          <caret line="90" column="33" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/CommonResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="41" column="64" selection-start-line="41" selection-start-column="64" selection-end-line="41" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="10" column="15" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <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="43">
-          <caret line="60" column="62" selection-start-line="60" selection-start-column="62" selection-end-line="60" selection-end-column="62" />
+        <state relative-caret-position="552">
+          <caret line="40" column="29" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="24" column="29" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="3634" column="33" selection-start-line="3634" selection-start-column="33" selection-end-line="3634" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -1,6 +1,6 @@
 package com.repair.api;
 
-import com.repair.controller.MaintenanceConsumeablesRequest;
+import com.repair.model.request.MaintenanceConsumeablesRequest;
 import com.repair.model.pojo.RepairConsumables;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;

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

@@ -69,7 +69,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairRecordReminder")
     @ApiOperation(value = "催单接口", notes = "催单接口", httpMethod = "GET")
-    CommonResult repairRecordReminder(@RequestParam int recordId);
+    CommonResult repairRecordReminder(@RequestParam int recordId) throws Exception;
 
     @GetMapping(value = "/queryManageCount")
     @ApiOperation(value = "工单状态数量", notes = "工单状态数量", httpMethod = "GET")

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

@@ -51,12 +51,11 @@ import java.util.Map;
 public class LoginController implements LoginControllerAPI {
 
     @Autowired
-    private RepairAdminService repairAdminService;
+    private WxOpenidConfig wxOpenidConfig;
     @Autowired
     private RepairUserService repairUserService;
     @Autowired
-    private WxOpenidConfig wxOpenidConfig;
-
+    private RepairAdminService repairAdminService;
 
     /**
      * 查看系统版本号
@@ -242,10 +241,10 @@ public class LoginController implements LoginControllerAPI {
         }
         //根据卡号查询repair_user表中的用户信息
         RepairUser user = repairUserService.getRepairByCardNumber(card_number);
-        //谁都能进
-//        if (identity_type != 4 && user == null) {
-//            return CommonResult.fail("非法权限，授权失败");
-//        }
+        //取消授权的身份验证 谁都能进
+        //if (identity_type != 4 && user == null) {
+        //   return CommonResult.fail("非法权限，授权失败");
+        //}
 
         System.out.println("微校授权校区："+campus);
         System.out.println("微校授权校区ID："+eSchool.integerOf(campus));
@@ -302,6 +301,7 @@ public class LoginController implements LoginControllerAPI {
         wlv.setRoutes(data == null ? new ArrayList<>() : data.getRoutes());
         wlv.setBtns(data == null ? new ArrayList<>() : data.getBtns());
         wlv.setUserName(user.getUserName());
+        wlv.setUserPhone(user.getUserPhone());
         wlv.setUserZZid(user.getUserZzid());
         wlv.setUserZZName(eUserZZ.stringOf(user.getUserZzid()));
         wlv.setSchoolId(user.getSchoolId());
@@ -414,7 +414,11 @@ public class LoginController implements LoginControllerAPI {
         return CommonResult.ok(wov);
     }
 
-
+    /**
+     * 获取移动端路由
+     * @param userZZid 用户身份ID
+     * @return
+     */
     public routeDataVo getRoutes(Integer userZZid) {
         routeDataVo result = new routeDataVo();
         List<String> routes = new ArrayList<>();

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

@@ -39,8 +39,6 @@ public class RepairAdminController implements RepairAdminControllerAPI {
 
     @Autowired
     private RepairAdminService repairAdminService;
-    @Autowired
-    private RepairUserService repairUserService;
 
     /**
      * 添加账号数据
@@ -64,11 +62,11 @@ public class RepairAdminController implements RepairAdminControllerAPI {
             return CommonResult.fail("只有超级管理员才能添加账号！");
         }
 
-//        //根据微校卡号判断移动端是否存在数据
-//        RepairUser user = repairUserService.getRepairByCardNumber(ra.getCardNumber());
-//        if(user == null){
-//            return CommonResult.fail("此账号无法与移动端用户信息进行绑定，新增账号失败");
-//        }
+        // //根据微校卡号判断移动端是否存在数据
+        // RepairUser user = repairUserService.getRepairByCardNumber(ra.getCardNumber());
+        // if(user == null){
+        //     return CommonResult.fail("此账号无法与移动端用户信息进行绑定，新增账号失败");
+        // }
 
         RepairAdmin data = repairAdminService.getRepairByAccount(ra.getAccount());
         if (data != null) {
@@ -209,6 +207,17 @@ public class RepairAdminController implements RepairAdminControllerAPI {
         return result > 0 ? CommonResult.ok("编辑成功") : CommonResult.fail("编辑失败");
     }
 
+    /**
+     * 账号管理导出表单数据
+     * @param account 账号
+     * @param startTime 起始时间
+     * @param endTime 结束时间
+     * @param response 响应流
+     * @throws NoSuchMethodException
+     * @throws InstantiationException
+     * @throws IllegalAccessException
+     * @throws InvocationTargetException
+     */
     @Override
     public void downloadRepairAdminExcel(String account, String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
 

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

@@ -32,6 +32,12 @@ public class RepairAreaController implements RepairAreaControllerAPI {
     @Autowired
     private RepairAreaService repairAreaService;
 
+    /**
+     * 添加区域
+     * @param repairArea 添加区域参数
+     * @param bindingResult 判断是否为空校验
+     * @return
+     */
     @Override
     public CommonResult InsertRepairArea(RepairArea repairArea, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -48,6 +54,12 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
     }
 
+    /**
+     * 编辑区域数据
+     * @param urar 编辑的区域内容
+     * @param bindingResult 判断是否为空校验
+     * @return
+     */
     @Override
     public CommonResult updateRepairAreaById(updateRepairAreaRequest urar, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -68,6 +80,13 @@ public class RepairAreaController implements RepairAreaControllerAPI {
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
+    /**
+     * 区域
+     * @param currentPage
+     * @param pageCount
+     * @param name
+     * @return
+     */
     @Override
     public CommonResult queryPageRepairAreas(int currentPage, int pageCount, String name) {
         PageUtils<RepairArea> result = repairAreaService.queryPageRepairAreas(currentPage, pageCount, name);

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

@@ -6,6 +6,7 @@ import com.repair.common.utils.*;
 import com.repair.model.enumModel.eIsSuper;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.*;
+import com.repair.model.request.MaintenanceConsumeablesRequest;
 import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;

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

@@ -50,20 +50,19 @@ import static com.repair.common.utils.StrUtils.getUUIDBits;
 public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     @Autowired
-    private RepairRecordService repairRecordService;
+    private RepairUserService repairUserService;
     @Autowired
-    private RepairPayRecordService repairPayRecordService;
+    private RepairAdminService repairAdminService;
     @Autowired
-    private RepairSystemMessagesService repairSystemMessagesService;
+    private RepairRecordService repairRecordService;
     @Autowired
-    private RepairUserService repairUserService;
+    private RepairPayRecordService repairPayRecordService;
     @Autowired
     private RepairTrackRecordService repairTrackRecordService;
     @Autowired
     private RepairRefundRecordService repairRefundRecordService;
-
     @Autowired
-    private RepairAdminService repairAdminService;
+    private RepairSystemMessagesService repairSystemMessagesService;
 
     @Override
     public CommonResult InsertrepairPayRecord(RepairPayRecord rc, BindingResult bindingResult) {

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

@@ -588,7 +588,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("当前数据不存在，撤销失败！");
         }
 
-        if (data.getMaintenanceState() != eRecordStatu.Dispatch.getValue() || data.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
+        if (data.getMaintenanceState() != eRecordStatu.Dispatch.getValue() && data.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
             return CommonResult.fail("待接单或待确认才能进行撤销操作！");
         }
 
@@ -716,7 +716,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
-    public CommonResult repairRecordReminder(int recordId) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult repairRecordReminder(int recordId) throws Exception {
         // 根据报修ID查找是否有派单数据 并且是有效的
         RepairRecord record = repairRecordService.getRepairById(recordId);
         if (record == null) {
@@ -758,14 +759,23 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rsm.setContent("您有工单用户催促，请尽快处理！");
             rsms.add(rsm);
         }
-        boolean insertS = repairSystemMessagesService.inserBatchSystemMessage(rsms);
-        if (!insertS) {
-            return CommonResult.fail("催单失败");
+
+        try{
+            boolean insertS = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+            if (!insertS) {
+                throw new Exception("催单失败！");
+            }
+
+            String content = MessageFormat.format("【报修系统】维修师傅，你好，工单{0}用户催单，请及时处理，谢谢！", record.getRecordNo());
+            CommonResult result = weiXiaoUtil.sendNotice(cardnumber, "报修工单催单", "催单", content, null);
+            if(!result.getCode().equals("200")){
+                throw new Exception("催单失败！");
+            }
+        }catch (Exception e){
+            throw new Exception("催单失败！");
         }
 
-        String content = MessageFormat.format("【报修系统】维修师傅，你好，工单{0}用户催单，请及时处理，谢谢！", record.getRecordNo());
-        CommonResult result = weiXiaoUtil.sendNotice(cardnumber, "报修工单催单", "催单", content, null);
-        return result;
+        return CommonResult.ok("催单成功");
     }
 
     @Override
@@ -1237,6 +1247,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 return CommonResult.fail("当天未排班，无法接单！");
             }
 
+            if(result.getArticleId() == null){
+                return CommonResult.fail("无法维修该种类物品！");
+            }
             long count = Arrays.asList(result.getArticleId().split(",")).stream().filter(e -> e.equals(recordData.getArticleId().toString())).count();
             if (count <= 0) {
                 return CommonResult.fail("无法维修该种类物品！");
@@ -3529,6 +3542,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                         return CommonResult.fail("耗材单价不能为空");
                     }
                     RepairConsumables rcData = new RepairConsumables();
+                    rcData.setArticleId(rc.getArticleId());
                     rcData.setRecordId(data.getRecordId());
                     rcData.setConsumeId(rc.getConsumeId());
                     rcData.setConsumeName(rc.getConsumeName());

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

@@ -1,4 +1,4 @@
-package com.repair.controller;
+package com.repair.model.request;
 
 import com.repair.model.request.insertConsumablesRequest;
 import lombok.Data;

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

@@ -49,6 +49,10 @@ public class wxLoginVo {
      */
     private String userName;
     /**
+     * 用户手机号
+     */
+    private String userPhone;
+    /**
      * 用户身份ID
      */
     private Integer userZZid;

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

@@ -279,6 +279,7 @@ com\repair\model\enumModel\eWeekStatu.class
 com\repair\services\impl\RepairTransferRecordServiceImpl.class
 com\repair\services\RepairSystemSettingService.class
 com\repair\model\pojo\RepairSystemSetting.class
+com\repair\model\request\MaintenanceConsumeablesRequest.class
 com\repair\mapper\WxAccessTokenMapper.class
 com\repair\model\vo\ClassSettingDateVo.class
 com\repair\model\vo\ClassesSettingPageDataVo.class
@@ -293,7 +294,6 @@ com\repair\model\request\updateRepairShiftRequest.class
 com\repair\model\vo\UserDataVo.class
 com\repair\model\vo\QueryExportVo.class
 com\repair\services\RepairEvaluateService.class
-com\repair\controller\MaintenanceConsumeablesRequest.class
 com\repair\model\request\AlterPriceRequest.class
 com\repair\model\pojo\RepairShiftSettings.class
 com\repair\model\vo\RepairRecordCountVo.class

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

@@ -207,6 +207,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\cooperationOrdersRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\collaborateApplyRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCloseMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\routeDataVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MySecurity.java
@@ -308,7 +309,6 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\WxOpenVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemSettingController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RevertRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\UserScheduleRequest.java