添加报价和报价接口

.idea/workspace.xml

@@ -2,10 +2,42 @@
 <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/common/utils/DelayedUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCloseControllerAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.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/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/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/RepairConsumeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/request/timeVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/timeVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairArticleTypeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairArticleTypeMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumeMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.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/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairArticleTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairArticleTypeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.xml" 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/" />
@@ -20,20 +52,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="507" column="13" lean-forward="true" selection-start-line="507" selection-start-column="13" selection-end-line="507" selection-end-column="13" />
+            <state relative-caret-position="256">
+              <caret line="654" selection-start-line="654" selection-end-line="654" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.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="-3555">
-              <caret line="44" column="49" selection-start-line="44" selection-start-column="49" selection-end-line="44" selection-end-column="49" />
+            <state relative-caret-position="584">
+              <caret line="36" column="32" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -41,11 +73,38 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <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="172">
+              <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="363">
+              <caret line="69" column="35" selection-start-line="69" selection-start-column="35" selection-end-line="69" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/timeVo.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="263">
-              <caret line="13" column="19" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="19" />
+            <state relative-caret-position="-1434">
+              <caret line="14" column="34" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="249">
+              <caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -54,10 +113,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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="310">
-              <caret line="40" column="42" selection-start-line="40" selection-start-column="42" selection-end-line="40" selection-end-column="42" />
+            <state relative-caret-position="491">
+              <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -77,22 +136,7 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryMyRepairRecordList</find>
-      <find>coun</find>
-      <find>foreach</find>
-      <find>queryTimeout</find>
-      <find>queryNotTimeout</find>
-      <find>startTime</find>
-      <find>receiveOrders</find>
-      <find>DateToString</find>
-      <find>version</find>
-      <find>getRepairById</find>
-      <find>update</find>
-      <find>List</find>
-      <find>List&lt;</find>
-      <find>.before</find>
       <find>getRepairsByRecordIds</find>
-      <find>queryPendingOrder</find>
       <find>shifts</find>
       <find>.sort</find>
       <find>isDuty</find>
@@ -107,10 +151,23 @@
       <find>downloadRepairClassesSettingExcel</find>
       <find>excelDownload</find>
       <find>nowDate</find>
+      <find>close</find>
+      <find>退款记录</find>
+      <find>RefundRecord</find>
+      <find>repairClose&quot;</find>
+      <find>getRepairArticleTypes</find>
+      <find>join(</find>
+      <find>queryArticleTypeList</find>
+      <find>RepairArticleChildVo</find>
+      <find>queryConsumeMaterial</find>
+      <find>getRepairParentArticleTypes</find>
+      <find>repairAreaService</find>
+      <find>queryPendingOrder</find>
+      <find>repairRecord/getRepairRecordsByUserId</find>
+      <find>getRepairRecordsByUserId</find>
+      <find>join</find>
     </findStrings>
     <replaceStrings>
-      <replace>ArticleType</replace>
-      <replace>RepairArticleTypeTreeVo</replace>
       <replace>Consume</replace>
       <replace>耗材管理</replace>
       <replace>RepairConsume</replace>
@@ -139,6 +196,8 @@
       <replace>Record</replace>
       <replace>rr.area_id as area_name,</replace>
       <replace>wxAccessToken</replace>
+      <replace>关单原因</replace>
+      <replace>Close</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -147,57 +206,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/WxAccessTokenController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/WxAccessTokenMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/WxAccessTokenService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/WxAccessTokenServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCardNumberVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairCollaborateRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateRecordVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairLeaveMessageService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairLeaveMessageServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/WeiXiaoUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/pendingOrderVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eUserStatu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/timeVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCloseService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairCloseMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCloseServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRefundRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCloseControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairClose.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairArticleTypeMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumeMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumeService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumeControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairConsumables.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/MaintenanceConsumeablesRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/insertConsumablesRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
   </component>
@@ -229,7 +288,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -298,6 +357,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
+              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -481,7 +549,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../视频系统/gitvideo/Back-endDevelopmentFramework" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../智慧酒店/ihotel-backend" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Artifacts" />
@@ -500,10 +568,10 @@
       <recent name="D:\Bingo\Desktop\工作内容\报修系统\BackRepairSystem\src\main\resources\excelFile" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.repair.model.enumModel" />
-      <recent name="com.repair.model.vo" />
       <recent name="com.repair.model.request" />
+      <recent name="com.repair.model.vo" />
       <recent name="com.repair.api" />
+      <recent name="com.repair.model.enumModel" />
       <recent name="com.repair.common.utils" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -525,7 +593,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.DelayedUtils">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.repair.AutoCode" />
       <module name="repair_backend" />
@@ -600,11 +668,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.TimeExchange" />
+        <item itemvalue="Application.AutoCode" />
         <item itemvalue="Application.DelayedUtils" />
         <item itemvalue="Application.RepairRecordController" />
         <item itemvalue="Application.RepairShiftSettingsController" />
-        <item itemvalue="Application.TimeExchange" />
-        <item itemvalue="Application.AutoCode" />
       </list>
     </recent_temporary>
   </component>
@@ -632,12 +700,12 @@
       <workItem from="1689834821108" duration="40536000" />
       <workItem from="1690247776483" duration="78760000" />
       <workItem from="1690506045062" duration="61277000" />
-      <workItem from="1690850680543" duration="91990000" />
+      <workItem from="1690850680543" duration="124276000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="516568000" />
+    <option name="totallyTimeSpent" value="548854000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -649,10 +717,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.4573304" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2439825" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -663,8 +731,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <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.84309393" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.60175055" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.5325967" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.15469614" />
       <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" />
@@ -681,7 +749,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.6203501" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.61993605" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -722,20 +790,14 @@
           <option name="timeStamp" value="90" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>634</line>
-          <properties />
-          <option name="timeStamp" value="125" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java</url>
-          <line>154</line>
+          <line>178</line>
           <properties />
           <option name="timeStamp" value="137" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>317</line>
+          <line>320</line>
           <properties />
           <option name="timeStamp" value="146" />
         </line-breakpoint>
@@ -753,7 +815,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>251</line>
+          <line>254</line>
           <properties />
           <option name="timeStamp" value="157" />
         </line-breakpoint>
@@ -775,6 +837,12 @@
           <properties />
           <option name="timeStamp" value="220" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
+          <line>208</line>
+          <properties />
+          <option name="timeStamp" value="227" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -783,376 +851,376 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-588">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="194">
+          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairCloseControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <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="598">
+          <caret line="32" column="37" lean-forward="true" selection-start-line="32" selection-start-column="37" selection-end-line="32" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleTypeTreeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2198">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="391">
+          <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/model/vo/RepairClassesVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairArticleType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="56">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+        <state relative-caret-position="617">
+          <caret line="45" column="28" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairConsumeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-542">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="253">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairLogisticsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml">
       <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>
+        <state relative-caret-position="-717" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/shiftSettingVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumeVo.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" />
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCardNumberVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumablePageVo.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" />
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleTypeTreeVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateRecordVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <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="253">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumableExcelVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="976">
-          <caret line="91" column="20" selection-start-line="91" selection-start-column="20" selection-end-line="91" selection-end-column="20" />
+        <state relative-caret-position="253">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairShiftSettingRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairArticleTypeMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="37" column="23" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="23" />
+        <state relative-caret-position="368">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/time/Duration.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairArticleTypeService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="470" column="27" selection-start-line="470" selection-start-column="27" selection-end-line="470" selection-end-column="27" />
+        <state relative-caret-position="493">
+          <caret line="31" column="29" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/time/LocalDateTime.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="489" column="32" selection-start-line="489" selection-start-column="32" selection-end-line="489" selection-end-column="32" />
+          <caret line="63" column="42" selection-start-line="63" selection-start-column="25" selection-end-line="63" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-644">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1045#1046#0" expanded="true" />
-            <element signature="e#1136#1137#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairWorkTypeMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-335">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/WxAccessTokenMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.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="608">
-          <caret line="58" column="8" selection-start-line="58" selection-start-column="8" selection-end-line="58" selection-end-column="8" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+          <caret line="69" column="100" selection-start-line="69" selection-start-column="67" selection-end-line="69" selection-end-column="100" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCloseMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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="400">
-          <caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="621">
+          <caret line="35" column="32" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/routeDataVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairConsumeMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <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="414">
+          <caret line="27" column="4" lean-forward="true" selection-start-line="27" selection-start-column="4" selection-end-line="27" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairShiftSettings.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleConsumeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="55" column="18" selection-start-line="55" selection-start-column="12" selection-end-line="55" selection-end-column="18" />
+        <state relative-caret-position="460">
+          <caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
+    <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="449">
-          <caret line="73" column="57" selection-start-line="73" selection-start-column="37" selection-end-line="73" selection-end-column="57" />
+        <state relative-caret-position="608">
+          <caret line="84" column="60" selection-start-line="84" selection-start-column="40" selection-end-line="84" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="587">
-          <caret line="73" column="39" selection-start-line="73" selection-start-column="26" selection-end-line="73" selection-end-column="39" />
+        <state relative-caret-position="121">
+          <caret line="68" column="43" selection-start-line="68" selection-start-column="43" selection-end-line="68" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairArticleTypeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1157">
-          <caret line="75" column="57" selection-start-line="75" selection-start-column="8" selection-end-line="75" selection-end-column="57" />
+        <state relative-caret-position="-13">
+          <caret line="11" column="41" lean-forward="true" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/EncryptionUtil.java">
+    <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="115">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="130">
+          <caret line="70" selection-start-line="70" selection-end-line="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="243" column="34" selection-start-line="243" selection-start-column="34" selection-end-line="243" selection-end-column="34" />
+        <state relative-caret-position="130">
+          <caret line="74" column="27" selection-start-line="74" selection-start-column="27" selection-end-line="74" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.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="173">
-          <caret line="187" column="34" selection-start-line="187" selection-start-column="34" selection-end-line="187" selection-end-column="34" />
+        <state relative-caret-position="332">
+          <caret line="213" selection-start-line="213" selection-end-line="213" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/io/File.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairArticleTypeMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="221" column="31" selection-start-line="221" selection-start-column="31" selection-end-line="221" selection-end-column="31" />
+        <state relative-caret-position="375">
+          <caret line="27" column="71" selection-start-line="27" selection-start-column="71" selection-end-line="27" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="382">
-          <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+        <state relative-caret-position="424">
+          <caret line="23" column="18" selection-start-line="23" selection-start-column="18" selection-end-line="23" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/aop/LoginCheckAspect.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="194">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="-109">
+          <caret line="116" column="15" selection-start-line="116" selection-start-column="15" selection-end-line="116" selection-end-column="15" />
         </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/request/insertRepairConsumeRequest.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="41">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" 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/api/RepairConsumeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        <state relative-caret-position="184">
+          <caret line="21" column="50" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="-660">
+          <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1045#1046#0" expanded="true" />
+            <element signature="e#1136#1137#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handle/NonStaticResourceHttpRequestHandler.java">
+    <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="253">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state relative-caret-position="453">
+          <caret line="637" lean-forward="true" selection-start-line="637" selection-end-line="637" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/SwaggerConfiguration.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/insertRepairAssociationRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <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="582">
+          <caret line="35" column="29" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="35" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.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="115">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="-1035">
+          <caret line="79" column="45" selection-start-line="79" selection-start-column="45" selection-end-line="79" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-326">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+        <state relative-caret-position="248">
+          <caret line="26" column="32" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/CORSConfiguration.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="115">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="240">
+          <caret line="60" column="19" selection-start-line="60" selection-start-column="19" selection-end-line="60" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="166">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state relative-caret-position="207">
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="19" />
+          <folding>
+            <element signature="e#487#488#0" expanded="true" />
+            <element signature="e#540#541#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MySecurity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="536">
+          <caret line="38" column="11" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/SmsConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="513">
+          <caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsException.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="161">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="92">
+          <caret line="17" column="39" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsExceptionHandler.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="138">
-          <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
+        <state relative-caret-position="477">
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/MyCustomException.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/changePasswordRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="115">
+          <caret line="7" column="7" lean-forward="true" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.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="161">
-          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+        <state relative-caret-position="-1434">
+          <caret line="14" column="34" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/Code.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="46">
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+        <state relative-caret-position="584">
+          <caret line="36" column="32" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
+    <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="299">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="363">
+          <caret line="69" column="35" selection-start-line="69" selection-start-column="35" selection-end-line="69" 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/java/com/repair/model/result/CommonResult.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" />
+        <state relative-caret-position="245">
+          <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/common/utils/TimeExchange.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="310">
-          <caret line="40" column="42" selection-start-line="40" selection-start-column="42" selection-end-line="40" selection-end-column="42" />
+        <state relative-caret-position="249">
+          <caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/timeVo.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="263">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="19" />
+        <state relative-caret-position="491">
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.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="-3555">
-          <caret line="44" column="49" selection-start-line="44" selection-start-column="49" selection-end-line="44" selection-end-column="49" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="256">
+          <caret line="654" selection-start-line="654" selection-end-line="654" />
         </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/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="507" column="13" lean-forward="true" selection-start-line="507" selection-start-column="13" selection-end-line="507" selection-end-column="13" />
+        <state relative-caret-position="172">
+          <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
         </state>
       </provider>
     </entry>

src/main/java/com/repair/AutoCode.java

@@ -65,7 +65,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("repair_record"); // 设置要映射的表名
+        strategy.setInclude("repair_close"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

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

@@ -36,4 +36,8 @@ public interface RepairArticleTypeControllerAPI {
     @GetMapping(value = "/queryRepairArticleType")
     @ApiOperation(value = "物品类型关联", notes = "物品类型关联", httpMethod = "GET")
     CommonResult queryRepairArticleType(@RequestParam int schoolId);
+
+    @GetMapping(value = "/queryConsumeMaterial")
+    @ApiOperation(value = "关联耗材", notes = "关联耗材", httpMethod = "GET")
+    CommonResult queryConsumeMaterial(@RequestParam int schoolId, String keyWord);
 }

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

@@ -0,0 +1,34 @@
+package com.repair.api;
+
+import com.repair.model.pojo.RepairClose;
+import com.repair.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/api/repairClose")
+@Api(tags = {"repairCloseController"}, value = "关单原因")
+public interface RepairCloseControllerAPI {
+
+    @PostMapping(value = "/insertRepairClose")
+    @ApiOperation(value = "添加关单原因", notes = "添加关单原因数据", httpMethod = "POST")
+    CommonResult InsertRepairClose(@Validated @RequestBody RepairClose rc, BindingResult bindingResult);
+
+    @PostMapping(value = "/updateRepairCloseById")
+    @ApiOperation(value = "编辑关单原因数据", notes = "编辑关单原因数据", httpMethod = "POST")
+    CommonResult updateRepairCloseById(@Validated @RequestBody RepairClose rc, BindingResult bindingResult);
+
+    @GetMapping(value = "/queryPageRepairClose")
+    @ApiOperation(value = "关单原因分页数据", notes = "关单原因分页数据", httpMethod = "GET")
+    CommonResult queryPageRepairCloses(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+
+    @GetMapping(value = "/deleteRepairCloseById")
+    @ApiOperation(value = "根据ID删除指定关单原因", notes = "根据ID删除指定关单原因", httpMethod = "GET")
+    CommonResult deleteRepairCloseById(@RequestParam int id);
+
+    @GetMapping(value = "/queryRepairCloses")
+    @ApiOperation(value = "关单原因数据", notes = "关单原因数据", httpMethod = "GET")
+    CommonResult queryRepairCloses();
+}

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

@@ -1,6 +1,8 @@
 package com.repair.api;
 
+import com.repair.controller.MaintenanceConsumeablesRequest;
 import com.repair.model.pojo.RepairConsumables;
+import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
+import java.util.List;
 
 @RequestMapping("/api/repairConsumables")
 @Api(tags = {"repairConsumablesController"}, value = "耗材记录")
@@ -39,4 +42,10 @@ public interface RepairConsumablesControllerAPI {
     @GetMapping(value = "/downloadRepairConsumableExcel")
     @ApiOperation(value = "导出耗材记录数据", notes = "导出耗材记录数据", httpMethod = "GET")
     void downloadRepairConsumableExcel(String keyWord, String startTime, String endTime, HttpServletResponse response) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException;
+
+    @PostMapping(value = "/insertMaintenanceConsumables")
+    @ApiOperation(value = "维修师傅报价", notes = "维修师傅报价", httpMethod = "POST")
+    CommonResult InsertMaintenanceConsumables(@Validated @RequestBody MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception;
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.repair.api;
 
+import com.repair.model.request.insertRepairAssociationRequest;
 import com.repair.model.request.insertRepairConsumeRequest;
 import com.repair.model.request.updateRepairConsumeRequest;
 import com.repair.model.result.CommonResult;
@@ -18,6 +19,10 @@ import java.lang.reflect.InvocationTargetException;
 @Api(tags = {"RepairConsumeController"}, value = "耗材管理")
 public interface RepairConsumeControllerAPI {
 
+    @PostMapping(value = "/insertRepairAssociation")
+    @ApiOperation(value = "关联耗材中添加耗材", notes = "关联耗材中添加耗材", httpMethod = "POST")
+    CommonResult InsertRepairAssociation(@Validated @RequestBody insertRepairAssociationRequest irc, BindingResult bindingResult);
+
     @PostMapping(value = "/insertRepairConsume")
     @ApiOperation(value = "添加耗材管理", notes = "添加耗材管理数据", httpMethod = "POST")
     CommonResult InsertRepairConsume(@Validated @RequestBody insertRepairConsumeRequest rc, BindingResult bindingResult);

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

@@ -1,6 +1,7 @@
 package com.repair.api;
 
 import com.repair.model.pojo.RepairRecord;
+import com.repair.model.request.finishOrderRequest;
 import com.repair.model.request.repairRecordRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
@@ -74,4 +75,12 @@ public interface RepairRecordControllerAPI {
     @GetMapping(value = "/receiveOrders")
     @ApiOperation(value = "接单", notes = "接单", httpMethod = "GET")
     CommonResult receiveOrders(@RequestParam int recordId, @RequestParam int userId) throws Exception;
+
+    @GetMapping(value = "/closeOrder")
+    @ApiOperation(value = "关单", notes = "关单", httpMethod = "GET")
+    CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason);
+
+    @PostMapping(value = "/finishOrder")
+    @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "GET")
+    CommonResult finishOrder(@Validated @RequestBody finishOrderRequest data, BindingResult bindingResult) throws Exception;
 }

src/main/java/com/repair/common/utils/TimeExchange.java

@@ -625,11 +625,15 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) throws ParseException {
-        LocalDateTime start = StringToLocalTime("12:00","HH:mm");
-        LocalDateTime end = StringToLocalTime("14:00","HH:mm");
-
-        LocalDateTime start1 = StringToLocalTime("13:00","HH:mm");
-        LocalDateTime end1 = StringToLocalTime("15:00","HH:mm");
+//        LocalDateTime start = StringToLocalTime("12:00","HH:mm");
+//        LocalDateTime end = StringToLocalTime("14:00","HH:mm");
+//
+//        LocalDateTime start1 = StringToLocalTime("13:00","HH:mm");
+//        LocalDateTime end1 = StringToLocalTime("15:00","HH:mm");
+
+        int minute = 150;
+        int hour = 150/60;//小时
+        int newMinute = 150%60;//分钟
 
 
         String sss = "";

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

@@ -0,0 +1,35 @@
+package com.repair.controller;
+
+import com.repair.model.request.insertConsumablesRequest;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/5 星期六 10:05
+ * @Description: com.repair.controller
+ * @Version: 1.0
+ */
+@Data
+public class MaintenanceConsumeablesRequest {
+    /**
+     * 报修记录
+     */
+    @NotNull(message = "报修记录ID不能为空")
+    private Integer recordId;
+    /**
+     * 耗材集合
+     */
+    @NotEmpty(message = "耗材集合不能为空")
+    private List<insertConsumablesRequest> consumes;
+
+    /**
+     * 总价
+     */
+    @NotNull(message = "总价不能为空")
+    private BigDecimal totalPrice;
+}

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

@@ -12,12 +12,15 @@ import com.repair.model.vo.*;
 import com.repair.model.vo.RepairArticleTypeTreeVo;
 import com.repair.services.RepairAreaService;
 import com.repair.services.RepairArticleTypeService;
+import com.repair.services.RepairConsumeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,7 +38,7 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
     @Autowired
     private RepairArticleTypeService repairArticleTypeService;
     @Autowired
-    private RepairAreaService repairAreaService;
+    private RepairConsumeService repairConsumeService;
 
     @Override
     public CommonResult InsertRepairArticleType(RepairArticleType rat, BindingResult bindingResult) {
@@ -107,6 +110,35 @@ public class RepairArticleTypeController implements RepairArticleTypeControllerA
         return CommonResult.ok(result);
     }
 
+    @Override
+    public CommonResult queryConsumeMaterial(int schoolId, String keyWord) {
+        List<RepairArticleChildVo> result = repairArticleTypeService.getRepairParentArticleTypes(schoolId);
+        List<String> articleIds = Arrays.stream(StringUtils.join(result.stream().map(RepairArticleChildVo::getChildId).collect(Collectors.toList()), ',').split(",")).distinct().collect(Collectors.toList());
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < articleIds.size(); i++) {
+            sb.append("FIND_IN_SET(" + articleIds.get(i) + ",article_id)");
+            if (i + 1 != articleIds.size()) {
+                sb.append(" or ");
+            }
+        }
+
+        String sss = sb.toString();
+        //耗材数据
+        List<RepairArticleConsumeVo> consumeResult = repairConsumeService.queryArticleConsumes(schoolId, keyWord, sb.toString());
+        for (RepairArticleChildVo article : result) {
+            List<String> ids =  new ArrayList<>(Arrays.asList(article.getChildId().split(",")));
+            for (String id:ids) {
+                List<RepairArticleConsumeVo> datas = consumeResult.stream().filter(e -> (","+e.getArticleId()+",").contains((","+id+","))).collect(Collectors.toList());
+                if(datas.size() > 0){
+                    article.setConsumes(datas);
+                }
+            }
+        }
+
+        //判断获取子类的 按查询内容模糊查询获取
+        return CommonResult.ok(result);
+    }
+
     /*
     根据父类ID获取树形菜单数据
      */

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

@@ -0,0 +1,80 @@
+package com.repair.controller;
+
+
+import com.repair.api.RepairCloseControllerAPI;
+
+import com.repair.common.utils.paramUtils;
+import com.repair.model.pojo.RepairClose;
+import com.repair.model.result.CommonResult;
+import com.repair.model.result.PageUtils;
+import com.repair.services.RepairCloseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-08-04
+ */
+@RestController
+public class RepairCloseController implements RepairCloseControllerAPI {
+
+    @Autowired
+    private RepairCloseService repairCloseService;
+
+    @Override
+    public CommonResult InsertRepairClose(RepairClose rc, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        int result = repairCloseService.insertRepairClose(rc);
+
+        return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
+    }
+
+    @Override
+    public CommonResult updateRepairCloseById(RepairClose rc, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        int result = repairCloseService.updateRepairClose(rc);
+
+        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+    }
+
+    @Override
+    public CommonResult queryPageRepairCloses(int currentPage, int pageCount, String name) {
+        PageUtils<RepairClose> result = repairCloseService.queryPageRepairCloses(currentPage, pageCount, name);
+
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult deleteRepairCloseById(int id) {
+        RepairClose data = repairCloseService.getRepairById(id);
+        if (data == null) {
+            return CommonResult.fail("当前数据不存在，删除失败！");
+        }
+
+        int result = repairCloseService.deleteRepairCloseById(id);
+
+        return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+    }
+
+    @Override
+    public CommonResult queryRepairCloses() {
+        List<RepairClose> result = repairCloseService.getRepairs();
+        return CommonResult.ok(result);
+    }
+}
+

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

@@ -6,23 +6,26 @@ 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.model.pojo.RepairCollaborateRecord;
+import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairConsumables;
-import com.repair.model.pojo.RepairShiftSettings;
+import com.repair.model.pojo.RepairRecord;
+import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.model.vo.ConsumablePageVo;
-import com.repair.model.vo.ConsumeVo;
 import com.repair.services.RepairConsumablesService;
+import com.repair.services.RepairRecordService;
 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.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,7 +34,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -42,6 +45,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
 
     @Autowired
     private RepairConsumablesService repairConsumablesService;
+    @Autowired
+    private RepairRecordService repairRecordService;
 
     @Override
     public CommonResult InsertrepairConsumables(RepairConsumables rc, BindingResult bindingResult) {
@@ -89,7 +94,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
     @Override
     public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
 
-        if(startTime != null && endTime != null){
+        if (startTime != null && endTime != null) {
             try {
                 startTime = TimeExchange.getStartOfDayStr(TimeExchange.StringToDate(startTime, "yyyy-MM-dd"));
                 endTime = TimeExchange.getEndOfDayStr(TimeExchange.StringToDate(endTime, "yyyy-MM-dd"));
@@ -97,7 +102,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             }
         }
 
-        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount, keyWord,startTime,endTime);
+        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount, keyWord, startTime, endTime);
         return CommonResult.ok(result);
     }
 
@@ -114,7 +119,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
         map.put("reportTimeStr", "报修时间");
         map.put("updateTimeStr", "维修时间");
 
-        if(startTime != null && endTime != null){
+        if (startTime != null && endTime != null) {
             try {
                 startTime = TimeExchange.getStartOfDayStr(TimeExchange.StringToDate(startTime, "yyyy-MM-dd"));
                 endTime = TimeExchange.getEndOfDayStr(TimeExchange.StringToDate(endTime, "yyyy-MM-dd"));
@@ -138,5 +143,75 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
 
         ExcelUtils.excelDownload(workbook, "耗材记录.xlsx", response);
     }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult InsertMaintenanceConsumables(MaintenanceConsumeablesRequest data, BindingResult bindingResult) throws Exception {
+        try {
+            if (bindingResult.hasErrors()) {
+                String st = paramUtils.getParamError(bindingResult);
+                return CommonResult.fail(st);
+            }
+
+            if(data.getConsumes().size() <= 0){
+                return CommonResult.fail("无耗材数据，报价失败");
+            }
+
+            List<RepairConsumables> rcDatas = new ArrayList<>();
+            for (insertConsumablesRequest rc : data.getConsumes()) {
+                if(rc.getConsumeId() == null){
+                    return CommonResult.fail("耗材ID不能为空");
+                }
+                if(rc.getConsumeName() == null){
+                    return CommonResult.fail("耗材名称不能为空");
+                }
+                if(rc.getNumber() == null || rc.getNumber() <= 0){
+                    return CommonResult.fail("耗材数量不能为空");
+                }
+                if(rc.getPrice() == null){
+                    return CommonResult.fail("耗材单价不能为空");
+                }
+                RepairConsumables rcData = new RepairConsumables();
+                rcData.setRecordId(data.getRecordId());
+                rcData.setConsumeId(rc.getConsumeId());
+                rcData.setConsumeName(rc.getConsumeName());
+                rcData.setNumber(rc.getNumber());
+                rcData.setPrice(rc.getPrice());
+                rcData.setTotalPrice(new BigDecimal(rcData.getNumber()).multiply(rcData.getPrice()));
+                rcDatas.add(rcData);
+            }
+
+            RepairRecord rr = repairRecordService.getRepairById(data.getRecordId());
+            if (rr == null) {
+                return CommonResult.fail("报修工单不存在，报价失败");
+            }
+
+            if (rr.getMaintenanceState() == eRecordStatu.Finished.getValue()
+                    || rr.getMaintenanceState() == eRecordStatu.Canceled.getValue()
+                    || rr.getMaintenanceState() == eRecordStatu.Closed.getValue()) {
+                return CommonResult.fail("当前报修工单状态发生变化，报价失败");
+            }
+
+            boolean result = repairConsumablesService.insertConsumableBatch(rcDatas);
+
+            if (!result) {
+                throw new Exception("报价失败！");
+            }
+
+            //只有用户支付完了之后，维修师傅才能继续看到这个单子
+            rr.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
+            rr.setPrice(data.getTotalPrice());
+            int updateRecord = repairRecordService.updateRepairRecord(rr);
+            if (updateRecord <= 0) {
+                throw new Exception("报价失败！");
+            }
+        } catch (Exception e) {
+            throw new Exception("报价失败！");
+        }
+
+        return CommonResult.ok("报价成功");
+    }
+
+
 }
 

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

@@ -8,6 +8,7 @@ import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eFileType;
 import com.repair.model.pojo.*;
+import com.repair.model.request.insertRepairAssociationRequest;
 import com.repair.model.request.insertRepairConsumeRequest;
 import com.repair.model.request.updateRepairConsumeRequest;
 import com.repair.model.result.CommonResult;
@@ -61,6 +62,29 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
     private RepairArticleTypeService repairArticleTypeService;
 
     @Override
+    public CommonResult InsertRepairAssociation(insertRepairAssociationRequest irc, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        RepairConsume data = repairConsumeService.queryConsumeByName(irc.getName());
+        if (data != null) {
+            return CommonResult.fail("该报修耗材已存在！");
+        }
+
+        RepairConsume rc = new RepairConsume()
+                .setName(irc.getName())
+                .setSchoolId(irc.getSchoolId())
+                .setArticleId(irc.getArticleId())
+                .setPrice(new BigDecimal(0));
+
+        int result = repairConsumeService.insertRepairConsume(rc);
+
+        return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
+    }
+
+    @Override
     public CommonResult InsertRepairConsume(insertRepairConsumeRequest ircr, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);

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

@@ -8,6 +8,8 @@ import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eTechnicianStatu;
 import com.repair.model.enumModel.eUserZZ;
 import com.repair.model.pojo.*;
+import com.repair.model.request.finishOrderRequest;
+import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.request.repairRecordRequest;
 import com.repair.model.request.timeVo;
 import com.repair.model.result.CommonResult;
@@ -27,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -348,7 +351,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 stateStr = "=1)";
                 result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime);
                 for (RepairRecordPageVo r : result.getList()) {
+                    //待接单才能关单
                     r.setState("待接单");
+                    r.setClose(1);
                 }
                 break;
             case 2:
@@ -438,14 +443,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 }
             }
 
-            if (state < 5 || state == 8) {
-                for (RepairRecordPageVo r : result.getList()) {
-                    if (r.getMaintenanceState() < eRecordStatu.Finished.getValue()) {
-                        r.setClose(1);
-                    }
-                }
-            }
-
             /**
              * 全部 待处理 待审核 维修中
              * 有耗材记录就显示改价按钮
@@ -554,7 +551,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                             maintenanceAssessTime = DelayedUtils.addMinuteStart(tvs, endWorkTime, maintenanceAssessTime, nowDate, dateNow, workMinte, i, 1);
                             break;
 
-                        } else{
+                        } else {
                             //非工作时间段的单子
                             Date nextStartWorkTime = TimeExchange.StringToDate(dateNow + " " + tvs.get(i + 1).getStart() + ":00", "yyyy-MM-dd HH:mm:ss");
                             if ((endWorkTime.before(nowDate) || endWorkTime.equals(nowDate)) && (nowDate.before(nextStartWorkTime) || nowDate.equals(nextStartWorkTime))) {
@@ -619,6 +616,105 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("抢单成功");
     }
 
+    @Override
+    public CommonResult closeOrders(int recordId, String userId, String reason) {
+
+        //获取订单
+        RepairRecord recordData = repairRecordService.getRepairById(recordId);
+        if (recordData == null) {
+            return CommonResult.fail("订单不存在，关单失败！");
+        }
+
+        //待接单才能关单
+        if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
+            return CommonResult.fail("待接单状态的工单才能关闭");
+        }
+
+        //将工单状态更新为维修中
+        recordData.setCustomsOfficerId(userId);
+        recordData.setRemark(reason);
+        recordData.setMaintenanceState(eRecordStatu.Closed.getValue());
+        int updateRecord = repairRecordService.updateRepairRecord(recordData);
+        if (updateRecord <= 0) {
+            return CommonResult.fail("关单失败！");
+        }
+
+        return CommonResult.ok("关单成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult finishOrder(finishOrderRequest data, BindingResult bindingResult) throws Exception {
+        try {
+            if (bindingResult.hasErrors()) {
+                String st = paramUtils.getParamError(bindingResult);
+                return CommonResult.fail(st);
+            }
+            List<RepairConsumables> rcDatas = new ArrayList<>();
+            //需要记录后续添加的耗材数据 但是不把钱记录到订单总金额中
+            if (data.getConsumes().size() > 0) {
+                for (insertConsumablesRequest rc : data.getConsumes()) {
+                    if (rc.getConsumeId() == null) {
+                        return CommonResult.fail("耗材ID不能为空");
+                    }
+                    if (rc.getConsumeName() == null) {
+                        return CommonResult.fail("耗材名称不能为空");
+                    }
+                    if (rc.getNumber() == null || rc.getNumber() <= 0) {
+                        return CommonResult.fail("耗材数量不能为空");
+                    }
+                    if (rc.getPrice() == null) {
+                        return CommonResult.fail("耗材单价不能为空");
+                    }
+                    RepairConsumables rcData = new RepairConsumables();
+                    rcData.setRecordId(data.getRecordId());
+                    rcData.setConsumeId(rc.getConsumeId());
+                    rcData.setConsumeName(rc.getConsumeName());
+                    rcData.setNumber(rc.getNumber());
+                    rcData.setPrice(rc.getPrice());
+                    rcData.setTotalPrice(new BigDecimal(0));
+                    rcDatas.add(rcData);
+                }
+            }
+
+            //获取订单
+            RepairRecord recordData = repairRecordService.getRepairById(data.getRecordId());
+            if (recordData == null) {
+                return CommonResult.fail("工单不存在，提交失败！");
+            }
+
+            //待接单才能关单
+            if (recordData.getMaintenanceState() == eRecordStatu.Finished.getValue()) {
+                return CommonResult.fail("该工单已被提交，请勿重复操作");
+            }
+
+            if (recordData.getMaintenanceState() != eRecordStatu.Maintenance.getValue()) {
+                return CommonResult.fail("维修中的工单才能进行提交");
+            }
+
+            if (rcDatas.size() > 0) {
+                boolean result = repairConsumablesService.insertConsumableBatch(rcDatas);
+
+                if (!result) {
+                    throw new Exception("提交失败！");
+                }
+            }
+
+            //将工单状态更新为已完成
+            recordData.setFinishVoice(data.getVoice());
+            recordData.setContent(data.getContnet());
+            recordData.setMaintenancer(data.getImages().size() > 0 ? StringUtils.join(data.getImages(), ',') : null);
+            recordData.setMaintenanceState(eRecordStatu.Finished.getValue());
+            int updateRecord = repairRecordService.updateRepairRecord(recordData);
+            if (updateRecord <= 0) {
+                throw new Exception("提交失败！");
+            }
+        } catch (Exception e) {
+            throw new Exception("提交失败！");
+        }
+
+        return CommonResult.ok("提交成功！");
+    }
 
 }
 

src/main/java/com/repair/mapper/RepairArticleTypeMapper.java

@@ -2,6 +2,7 @@ package com.repair.mapper;
 
 import com.repair.model.pojo.RepairArticleType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.vo.RepairArticleChildVo;
 import com.repair.model.vo.RepairWorkTypeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -19,4 +20,6 @@ import java.util.List;
 @Repository
 public interface RepairArticleTypeMapper extends BaseMapper<RepairArticleType> {
     List<RepairWorkTypeVo> queryArticleTypeList(@Param("schoolId")Integer schoolId);
+
+    List<RepairArticleChildVo> queryArticleChildList(@Param("schoolId")Integer schoolId);
 }

src/main/java/com/repair/mapper/RepairCloseMapper.java

@@ -0,0 +1,18 @@
+package com.repair.mapper;
+
+import com.repair.model.pojo.RepairClose;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-08-04
+ */
+@Repository
+public interface RepairCloseMapper extends BaseMapper<RepairClose> {
+
+}

src/main/java/com/repair/mapper/RepairConsumeMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairConsume;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.ConsumeVo;
+import com.repair.model.vo.RepairArticleConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -23,4 +24,6 @@ public interface RepairConsumeMapper extends BaseMapper<RepairConsume> {
     List<ConsumeVo> queryConsumeList(@Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<RepairArticleConsumeVo> queryArticleConsumes(@Param("schoolId") Integer schoolId, @Param("keyWork") String keyWork, @Param("findInSet") String findInSet);
 }

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

@@ -0,0 +1,69 @@
+package com.repair.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="RepairClose对象", description="")
+public class RepairClose implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "关单原因")
+    private String name;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonIgnore
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonIgnore
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonIgnore
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonIgnore
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    @JsonIgnore
+    private Integer deleted;
+
+
+}

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

@@ -46,7 +46,7 @@ public class RepairConsumables implements Serializable {
 
     @ApiModelProperty(value = "耗材ID")
     @NotBlank(message = "耗材数据不能为空")
-    private String consumeId;
+    private Integer consumeId;
 
     @ApiModelProperty(value = "耗材名称")
     @NotBlank(message = "耗材名称不能为空")

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

@@ -64,6 +64,12 @@ public class RepairRecord implements Serializable {
     @ApiModelProperty(value = "报修录音")
     private String voice;
 
+    @ApiModelProperty(value = "维修录音")
+    private String finishVoice;
+
+    @ApiModelProperty(value = "维修内容")
+    private String content;
+
     @ApiModelProperty(value = "关单人ID 多个人用逗号隔开")
     private String customsOfficerId;
 

src/main/java/com/repair/model/request/finishOrderRequest.java

@@ -0,0 +1,44 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/5 星期六 15:32
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class finishOrderRequest {
+    /**
+     * 原密码
+     */
+    @NotNull(message = "报修记录ID不能为空")
+    private Integer recordId;
+
+    /**
+     * 维修内容
+     */
+    private String contnet;
+
+    /**
+     * 维修结果
+     */
+    private String voice;
+
+    /**
+     * 关联耗材数据集合
+     */
+    private List<insertConsumablesRequest> consumes;
+
+    /**
+     * 现场拍照
+     */
+    @NotEmpty(message = "现场拍照不能为空")
+    private List<String> images;
+}

src/main/java/com/repair/model/request/insertConsumablesRequest.java

@@ -0,0 +1,32 @@
+package com.repair.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/5 星期六 9:48
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class insertConsumablesRequest {
+
+    @NotNull(message = "耗材数据不能为空")
+    private Integer consumeId;
+
+    @NotBlank(message = "耗材名称不能为空")
+    private String consumeName;
+
+    @NotNull(message = "耗材单价不能为空")
+    private BigDecimal price;
+
+    @NotNull(message = "耗材数量不能为空")
+    private Double number;
+
+    private BigDecimal totalPrice;
+}

src/main/java/com/repair/model/request/insertRepairAssociationRequest.java

@@ -0,0 +1,37 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/13 星期四 15:21
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class insertRepairAssociationRequest {
+
+    /**
+     * 耗材名称
+     */
+    @NotBlank(message = "耗材名称不能为空")
+    private String name;
+
+    /**
+     * 报修物品ID集合
+     */
+    @NotBlank(message = "报修物品不能为空")
+    private String articleId;
+
+    /**
+     * 校区ID
+     */
+    @NotNull(message = "校区ID不能为空")
+    private Integer schoolId;
+}

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

@@ -0,0 +1,36 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/1 星期二 20:36
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class RepairArticleChildVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+
+    /**
+     * 报修种类名称
+     */
+    private String name;
+
+    /**
+     * 子类ID
+     */
+    @JsonIgnore
+    private String childId;
+
+    /**
+     * 耗材数据
+     */
+    private List<RepairArticleConsumeVo> consumes;
+}

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

@@ -0,0 +1,37 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/1 星期二 20:36
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class RepairArticleConsumeVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+
+    /**
+     * 报修物品ID
+     */
+    @JsonIgnore
+    private String articleId;
+
+    /**
+     * 耗材名称
+     */
+    private String name;
+
+    /**
+     * 耗材价格
+     */
+    private BigDecimal price;
+}

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

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 public class RepairTechnicianVo {
     /**
-     * 待接单
+     * 数据ID
      */
     private Integer id;
 

src/main/java/com/repair/services/RepairArticleTypeService.java

@@ -3,13 +3,14 @@ package com.repair.services;
 import com.repair.model.pojo.RepairArticleType;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.RepairArticleChildVo;
 import com.repair.model.vo.RepairWorkTypeVo;
 
 import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -28,6 +29,8 @@ public interface RepairArticleTypeService extends IService<RepairArticleType> {
 
     List<RepairArticleType> getRepairArticleTypes();
 
+    List<RepairArticleChildVo> getRepairParentArticleTypes(int schoolId);
+
     RepairArticleType getRepairArticleTypeByName(String name);
 
     List<RepairArticleType> getRepairArticleTypesBySchoolId(int schoolId);

src/main/java/com/repair/services/RepairCloseService.java

@@ -0,0 +1,29 @@
+package com.repair.services;
+
+import com.repair.model.pojo.RepairClose;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.repair.model.result.PageUtils;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-08-04
+ */
+public interface RepairCloseService extends IService<RepairClose> {
+    int insertRepairClose(RepairClose rns);
+
+    int updateRepairClose(RepairClose rns);
+
+    PageUtils<RepairClose> queryPageRepairCloses(int currentPage, int pageCount, String name);
+
+    int deleteRepairCloseById(int id);
+
+    RepairClose getRepairById(int id);
+
+    List<RepairClose> getRepairs();
+}

src/main/java/com/repair/services/RepairConsumablesService.java

@@ -35,4 +35,6 @@ public interface RepairConsumablesService extends IService<RepairConsumables> {
     PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
 
     List<ConsumableExcelVo> queryConsumablePageList(String keyWord, String startTime, String endTime);
+
+    boolean insertConsumableBatch(List<RepairConsumables> rns);
 }

src/main/java/com/repair/services/RepairConsumeService.java

@@ -4,7 +4,9 @@ import com.repair.model.pojo.RepairConsume;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.ConsumeVo;
+import com.repair.model.vo.RepairArticleConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -30,4 +32,6 @@ public interface RepairConsumeService extends IService<RepairConsume> {
     List<ConsumeVo> queryConsumeList(String name, String startTime, String endTime);
 
     RepairConsume queryConsumeByName(String name);
+
+    List<RepairArticleConsumeVo> queryArticleConsumes(Integer schoolId, String keyWork, String findInSet);
 }

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

@@ -7,6 +7,7 @@ import com.repair.model.pojo.RepairArticleType;
 import com.repair.mapper.RepairArticleTypeMapper;
 import com.repair.model.pojo.RepairWorkType;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.RepairArticleChildVo;
 import com.repair.model.vo.RepairWorkTypeVo;
 import com.repair.services.RepairArticleTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -70,6 +71,12 @@ public class RepairArticleTypeServiceImpl extends ServiceImpl<RepairArticleTypeM
     }
 
     @Override
+    public List<RepairArticleChildVo> getRepairParentArticleTypes(int schoolId) {
+        List<RepairArticleChildVo> datas = repairArticleTypeMapper.queryArticleChildList(schoolId);
+        return datas;
+    }
+
+    @Override
     public RepairArticleType getRepairArticleTypeByName(String name) {
         QueryWrapper<RepairArticleType> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.hasText(name),"name",name);

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

@@ -0,0 +1,69 @@
+package com.repair.services.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.repair.mapper.RepairCloseMapper;
+import com.repair.model.pojo.RepairClose;
+import com.repair.mapper.RepairCloseMapper;
+import com.repair.model.pojo.RepairClose;
+import com.repair.model.result.PageUtils;
+import com.repair.services.RepairCloseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-08-04
+ */
+@Service
+public class RepairCloseServiceImpl extends ServiceImpl<RepairCloseMapper, RepairClose> implements RepairCloseService {
+
+    @Autowired
+    private RepairCloseMapper repairCloseMapper;
+
+    @Override
+    public int insertRepairClose(RepairClose rc) {
+        int result = repairCloseMapper.insert(rc);
+        return result;
+    }
+
+    @Override
+    public int updateRepairClose(RepairClose rc) {
+        int result = repairCloseMapper.updateById(rc);
+        return result;
+    }
+
+    @Override
+    public PageUtils<RepairClose> queryPageRepairCloses(int currentPage, int pageCount, String name) {
+        Page<RepairClose> page = new Page<>(currentPage, pageCount);
+        QueryWrapper<RepairClose> queryWrapper = new QueryWrapper<>();
+        IPage<RepairClose> result = repairCloseMapper.selectPage(page, queryWrapper);
+        return new PageUtils(result);
+    }
+
+    @Override
+    public int deleteRepairCloseById(int id) {
+        int result = repairCloseMapper.deleteById(id);
+        return result;
+    }
+
+    @Override
+    public RepairClose getRepairById(int id) {
+        RepairClose result = repairCloseMapper.selectById(id);
+        return result;
+    }
+
+    @Override
+    public List<RepairClose> getRepairs() {
+        List<RepairClose> result = repairCloseMapper.selectList(null);
+        return result;
+    }
+}

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

@@ -95,4 +95,10 @@ public class RepairConsumablesServiceImpl extends ServiceImpl<RepairConsumablesM
         List<ConsumableExcelVo> result = repairConsumablesMapper.queryConsumableExcelList(keyWord, startTime, endTime);
         return result;
     }
+
+    @Override
+    public boolean insertConsumableBatch(List<RepairConsumables> rns) {
+        boolean result = this.saveBatch(rns);
+        return result;
+    }
 }

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

@@ -10,6 +10,7 @@ import com.repair.model.pojo.RepairConsume;
 import com.repair.model.pojo.RepairWorkType;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.ConsumeVo;
+import com.repair.model.vo.RepairArticleConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
 import com.repair.services.RepairConsumeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -80,4 +81,10 @@ public class RepairConsumeServiceImpl extends ServiceImpl<RepairConsumeMapper, R
         return result;
     }
 
+    @Override
+    public List<RepairArticleConsumeVo> queryArticleConsumes(Integer schoolId, String keyWork, String findInSet) {
+        List<RepairArticleConsumeVo> result = repairConsumeMapper.queryArticleConsumes(schoolId, keyWork, findInSet);
+        return result;
+    }
+
 }

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

@@ -29,14 +29,14 @@ public class RepairRefundRecordServiceImpl extends ServiceImpl<RepairRefundRecor
     private RepairRefundRecordMapper repairRefundRecordMapper;
 
     @Override
-    public int insertRepairRefundRecord(RepairRefundRecord rrr) {
-        int result = repairRefundRecordMapper.insert(rrr);
+    public int insertRepairRefundRecord(RepairRefundRecord rc) {
+        int result = repairRefundRecordMapper.insert(rc);
         return result;
     }
 
     @Override
-    public int updateRepairRefundRecord(RepairRefundRecord rrr) {
-        int result = repairRefundRecordMapper.updateById(rrr);
+    public int updateRepairRefundRecord(RepairRefundRecord rc) {
+        int result = repairRefundRecordMapper.updateById(rc);
         return result;
     }
 

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

@@ -16,4 +16,21 @@
             </if>
         </where>
     </select>
+
+
+    <resultMap type="com.repair.model.vo.RepairArticleChildVo" id="repairArticleChildMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="childId" column="child_id"/>
+    </resultMap>
+
+    <select id="queryArticleChildList" resultType="com.repair.model.vo.RepairArticleChildVo" resultMap="repairArticleChildMap">
+        SELECT CONCAT_WS(',', GROUP_CONCAT(rt.id separator','), rat.id) as child_id,rat.id,rat.`name` FROM repair_article_type rat
+        left join repair_article_type rt on rt.deleted = 0 and rt.parent_id = rat.id
+        where rat.deleted = 0 and rat.parent_id = 0 and rat.school_id = #{schoolId}
+        group by rat.id
+
+    </select>
+    <!--order by locate(#{keyWord},rat.name) desc 按关键字模糊查询排序-->
+
 </mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairCloseMapper">
+
+</mapper>

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

@@ -53,4 +53,27 @@
         </where>
     </select>
 
+
+    <resultMap type="com.repair.model.vo.RepairArticleConsumeVo" id="repairArticleConsumeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="articleId" column="article_id"/>
+        <result property="price" column="price"/>
+    </resultMap>
+
+    <select id="queryArticleConsumes" resultType="com.repair.model.vo.RepairArticleConsumeVo" resultMap="repairArticleConsumeMap">
+        select id,article_id,name,price from repair_consume
+        <where>
+            and deleted =0
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
+            </if>
+            <if test="keyWork != null and keyWork != ''">
+                and name like '%' #{keyWork} '%'
+            </if>
+            <if test="findInSet != null and findInSet != ''">
+                and (${findInSet})
+            </if>
+        </where>
+    </select>
 </mapper>

target/classes/mapper/repair/RepairArticleTypeMapper.xml

@@ -16,4 +16,21 @@
             </if>
         </where>
     </select>
+
+
+    <resultMap type="com.repair.model.vo.RepairArticleChildVo" id="repairArticleChildMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="childId" column="child_id"/>
+    </resultMap>
+
+    <select id="queryArticleChildList" resultType="com.repair.model.vo.RepairArticleChildVo" resultMap="repairArticleChildMap">
+        SELECT CONCAT_WS(',', GROUP_CONCAT(rt.id separator','), rat.id) as child_id,rat.id,rat.`name` FROM repair_article_type rat
+        left join repair_article_type rt on rt.deleted = 0 and rt.parent_id = rat.id
+        where rat.deleted = 0 and rat.parent_id = 0 and rat.school_id = #{schoolId}
+        group by rat.id
+
+    </select>
+    <!--order by locate(#{keyWord},rat.name) desc 按关键字模糊查询排序-->
+
 </mapper>

target/classes/mapper/repair/RepairCloseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairCloseMapper">
+
+</mapper>

target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -53,4 +53,27 @@
         </where>
     </select>
 
+
+    <resultMap type="com.repair.model.vo.RepairArticleConsumeVo" id="repairArticleConsumeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="articleId" column="article_id"/>
+        <result property="price" column="price"/>
+    </resultMap>
+
+    <select id="queryArticleConsumes" resultType="com.repair.model.vo.RepairArticleConsumeVo" resultMap="repairArticleConsumeMap">
+        select id,article_id,name,price from repair_consume
+        <where>
+            and deleted =0
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
+            </if>
+            <if test="keyWork != null and keyWork != ''">
+                and name like '%' #{keyWork} '%'
+            </if>
+            <if test="findInSet != null and findInSet != ''">
+                and (${findInSet})
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -29,8 +29,10 @@ com\repair\common\utils\WeiXiaoUtil.class
 com\repair\model\vo\RepairCardNumberVo.class
 com\repair\model\pojo\RepairPayRecord.class
 com\repair\handler\MyMetaObjectHandler.class
+com\repair\auto\services\RepairCloseService.class
 com\repair\model\vo\SystemMenuTreeVo.class
 com\repair\controller\RepairSchoolController.class
+com\repair\services\RepairCloseService.class
 com\repair\api\RepairWorkTypeControllerAPI.class
 com\repair\handle\NonStaticResourceHttpRequestHandler.class
 com\repair\mapper\RepairConsumeMapper.class
@@ -63,6 +65,7 @@ com\repair\services\RepairWorkTypeService.class
 com\repair\mapper\RepairConsumablesMapper.class
 com\repair\model\enumModel\eIsTop.class
 com\repair\model\enumModel\eUserZZ.class
+com\repair\auto\controller\RepairCloseController.class
 com\repair\services\impl\RepairWorkTypeServiceImpl.class
 com\repair\api\RepairClassesSettingsControllerAPI.class
 com\repair\model\vo\RepairClassesVo.class
@@ -99,6 +102,8 @@ com\repair\mapper\RepairDispatchRecordMapper.class
 com\repair\model\pojo\RepairRecord.class
 com\repair\api\RepairSchoolControllerAPI.class
 com\repair\model\pojo\RepairArticleType.class
+com\repair\api\RepairCloseControllerAPI.class
+com\repair\model\pojo\RepairClose.class
 com\repair\common\utils\WeiXiaoUtil$1.class
 com\repair\model\vo\RepairArticleTreeVo.class
 com\repair\common\utils\SeqUtils.class
@@ -115,6 +120,7 @@ com\repair\model\vo\RepairArticleTreeVo$RepairArticleTreeVoBuilder.class
 com\repair\model\vo\RepairWorkTypeVo.class
 com\repair\common\utils\ExcelUtils.class
 com\repair\common\utils\StrUtils.class
+com\repair\services\impl\RepairCloseServiceImpl.class
 com\repair\model\vo\LoginVo.class
 com\repair\services\impl\RepairSystemSettingServiceImpl.class
 com\repair\common\result\Code.class
@@ -125,9 +131,11 @@ com\repair\services\RepairShiftSettingsService.class
 com\repair\common\utils\WxUtil.class
 com\repair\model\vo\ClassesSettingPageVo.class
 com\repair\controller\RepairAreaController.class
+com\repair\auto\model\RepairClose.class
 com\repair\model\vo\RepairTechnicianVo.class
 com\repair\services\impl\RepairArticleTypeServiceImpl.class
 com\repair\api\RepairConsumeControllerAPI.class
+com\repair\controller\RepairCloseController.class
 com\repair\model\pojo\RepairSchool.class
 com\repair\common\exception\MyCustomException.class
 com\repair\controller\RepairSystemSettingController.class
@@ -197,6 +205,7 @@ com\repair\model\vo\RepairArticleTypeTreeVo$RepairArticleTypeTreeVoBuilder.class
 com\repair\controller\RepairTrackRecordController.class
 com\repair\services\RepairSystemMessagesService.class
 com\repair\api\RepairConsumablesControllerAPI.class
+com\repair\mapper\RepairCloseMapper.class
 com\repair\config\WxOpenidConfig.class
 com\repair\common\utils\TimeExchange.class
 com\repair\controller\RepairTransferRecordController.class
@@ -207,6 +216,7 @@ com\repair\api\RepairAreaControllerAPI.class
 com\repair\model\request\updateRepairClassesRequest.class
 com\repair\common\utils\JWTUtil.class
 com\repair\services\RepairUserService.class
+com\repair\auto\mapper\RepairCloseMapper.class
 com\repair\model\pojo\RepairRefundRecord.class
 com\repair\model\vo\SystemMenuTreeVo$SystemMenuTreeVoBuilder.class
 com\repair\controller\RepairNoticeSettingController.class
@@ -243,6 +253,7 @@ com\repair\annotation\UserLoginCheck.class
 com\repair\common\utils\DelayedUtils.class
 com\repair\controller\RepairUserController.class
 com\repair\model\request\updateRepairConsumeRequest.class
+com\repair\auto\service\impl\RepairCloseServiceImpl.class
 com\repair\controller\RepairShiftSettingsController.class
 com\repair\api\RepairTrackRecordControllerAPI.class
 com\repair\common\utils\SHA1.class

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

@@ -126,6 +126,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairClassesSettingsMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairEvaluateMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairRecordRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\mapper\RepairCloseMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTrackRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairReceivingControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
@@ -134,7 +135,9 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaTreeVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UploadFileVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\service\impl\RepairCloseServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\WxAccessToken.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\model\RepairClose.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemMessagesService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuTreeVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemMessagesServiceImpl.java
@@ -162,6 +165,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRecordServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCollaborateRecordServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.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
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairShiftSettingsMapper.java
@@ -171,6 +175,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairSchoolVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SeqUtils.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\paramUtils.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\controller\RepairCloseController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\HttpsClient.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\UserLoginCheck.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ValidateCode.java
@@ -183,8 +188,10 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\AutoCode.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSchoolService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\CORSConfiguration.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCloseControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSchoolServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairArticleTypeControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClose.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsException.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCollaborateRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTrackRecordControllerAPI.java
@@ -229,11 +236,14 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordCountVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairLeaveMessageControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairWorkTypeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\auto\services\RepairCloseService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAreaRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordPageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairClassesSettingsServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCloseController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTransferRecord.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairShiftSettingsController.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCloseServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairPayRecord.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRecord.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateUserDataRequest.java
@@ -252,6 +262,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairPayRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairPayRecordMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTreeVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCloseService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtAuthenticationInterceptor.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTransferRecordService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\freezeRepairAdminRequest.java