Browse Source

刘子麟的代码合并

夏文涛 2 years ago
parent
commit
af20c750a3
63 changed files with 1252 additions and 2104 deletions
  1. 319 234
      .idea/workspace.xml
  2. 46 7
      src/main/java/com/repair/api/RepairRecordControllerAPI.java
  3. 4 0
      src/main/java/com/repair/api/RepairUserControllerAPI.java
  4. 30 0
      src/main/java/com/repair/common/utils/DateUtils.java
  5. 538 24
      src/main/java/com/repair/controller/RepairRecordController.java
  6. 5 0
      src/main/java/com/repair/controller/RepairUserController.java
  7. 2 0
      src/main/java/com/repair/mapper/RepairUserMapper.java
  8. 22 0
      src/main/java/com/repair/model/enumModel/eApprovalStatu.java
  9. 18 0
      src/main/java/com/repair/model/enumModel/eDispatchResult.java
  10. 21 0
      src/main/java/com/repair/model/enumModel/eDispatchType.java
  11. 4 0
      src/main/java/com/repair/model/pojo/RepairConsumables.java
  12. 8 0
      src/main/java/com/repair/model/pojo/RepairDispatchRecord.java
  13. 8 0
      src/main/java/com/repair/model/pojo/RepairReceiving.java
  14. 9 0
      src/main/java/com/repair/model/request/AlterPriceRequest.java
  15. 16 0
      src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java
  16. 23 0
      src/main/java/com/repair/model/request/cooperationOrdersRequest.java
  17. 28 0
      src/main/java/com/repair/model/request/transferRequest.java
  18. 12 0
      src/main/java/com/repair/model/vo/AlterPriceShowVo.java
  19. 67 0
      src/main/java/com/repair/model/vo/AutoDispatchUserVo.java
  20. 21 0
      src/main/java/com/repair/model/vo/DetailsVo.java
  21. 2 0
      src/main/java/com/repair/services/RepairUserService.java
  22. 1 1
      src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java
  23. 7 0
      src/main/java/com/repair/services/impl/RepairUserServiceImpl.java
  24. 16 16
      src/main/resources/mapper/repair/RepairRecordMapper.xml
  25. 25 0
      src/main/resources/mapper/repair/RepairUserMapper.xml
  26. 0 72
      target/classes/META-INF/spring-configuration-metadata.json
  27. 0 69
      target/classes/application-dev.yml
  28. 0 70
      target/classes/application-prod.yml
  29. 0 67
      target/classes/application.yml
  30. BIN
      target/classes/excelFile/耗材管理模板.xlsx
  31. BIN
      target/classes/excelFile/自定义排班模板.xls
  32. BIN
      target/classes/excelFile/自定义排班模板.xlsx
  33. 0 5
      target/classes/mapper/repair/RepairAdminMapper.xml
  34. 0 14
      target/classes/mapper/repair/RepairAreaMapper.xml
  35. 0 36
      target/classes/mapper/repair/RepairArticleTypeMapper.xml
  36. 0 33
      target/classes/mapper/repair/RepairClassesSettingsMapper.xml
  37. 0 5
      target/classes/mapper/repair/RepairCloseMapper.xml
  38. 0 36
      target/classes/mapper/repair/RepairCollaborateRecordMapper.xml
  39. 0 62
      target/classes/mapper/repair/RepairConsumablesMapper.xml
  40. 0 79
      target/classes/mapper/repair/RepairConsumeMapper.xml
  41. 0 20
      target/classes/mapper/repair/RepairDispatchRecordMapper.xml
  42. 0 34
      target/classes/mapper/repair/RepairEvaluateMapper.xml
  43. 0 5
      target/classes/mapper/repair/RepairLeaveMessageMapper.xml
  44. 0 24
      target/classes/mapper/repair/RepairNoticeSettingMapper.xml
  45. 0 5
      target/classes/mapper/repair/RepairPayRecordMapper.xml
  46. 0 5
      target/classes/mapper/repair/RepairReceivingMapper.xml
  47. 0 436
      target/classes/mapper/repair/RepairRecordMapper.xml
  48. 0 5
      target/classes/mapper/repair/RepairRefundRecordMapper.xml
  49. 0 5
      target/classes/mapper/repair/RepairSchoolMapper.xml
  50. 0 5
      target/classes/mapper/repair/RepairShiftSettingsMapper.xml
  51. 0 5
      target/classes/mapper/repair/RepairSystemMessagesMapper.xml
  52. 0 5
      target/classes/mapper/repair/RepairSystemSettingMapper.xml
  53. 0 5
      target/classes/mapper/repair/RepairTrackRecordMapper.xml
  54. 0 5
      target/classes/mapper/repair/RepairTransferRecordMapper.xml
  55. 0 129
      target/classes/mapper/repair/RepairUserMapper.xml
  56. 0 13
      target/classes/mapper/repair/RepairWorkTypeMapper.xml
  57. 0 5
      target/classes/mapper/repair/WxAccessTokenMapper.xml
  58. 0 3
      target/maven-archiver/pom.properties
  59. 0 285
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  60. 0 271
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  61. 0 2
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  62. 0 2
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  63. BIN
      target/repair_system-0.0.1-SNAPSHOT.jar.original

+ 319 - 234
.idea/workspace.xml

@@ -2,28 +2,58 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaboratorVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.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/api/RepairUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.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/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.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/RepairDispatchRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/excelFile/耗材管理模板.xlsx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/excelFile/自定义排班模板.xls" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/excelFile/自定义排班模板.xlsx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairAdminMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairAreaMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairArticleTypeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairClassesSettingsMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairCloseMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairCollaborateRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumablesMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairDispatchRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairEvaluateMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairLeaveMessageMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairNoticeSettingMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairPayRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairReceivingMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRefundRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSchoolMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairShiftSettingsMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemSettingMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairTrackRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairTransferRecordMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairWorkTypeMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/WxAccessTokenMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -38,59 +68,86 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-66">
-              <caret line="831" column="10" selection-start-line="831" selection-start-column="7" selection-end-line="831" selection-end-column="10" />
+            <state relative-caret-position="144">
+              <caret line="958" column="15" selection-start-line="958" selection-start-column="15" selection-end-line="958" 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/services/RepairRecordService.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="700">
-              <caret line="65" column="54" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="54" />
+            <state relative-caret-position="193">
+              <caret line="103" column="48" selection-start-line="103" selection-start-column="48" selection-end-line="103" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+        <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="1208">
-              <caret line="418" column="321" selection-start-line="418" selection-start-column="321" selection-end-line="418" selection-end-column="321" />
-              <folding>
-                <element signature="e#2405#2409#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="259">
+              <caret line="186" column="8" selection-start-line="186" selection-start-column="8" selection-end-line="186" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22">
-              <caret line="88" column="42" lean-forward="true" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
+            <state relative-caret-position="201">
+              <caret line="156" column="44" selection-start-line="156" selection-start-column="44" selection-end-line="156" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.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="759">
-              <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
+            <state relative-caret-position="686">
+              <caret line="147" column="96" selection-start-line="147" selection-start-column="89" selection-end-line="147" selection-end-column="96" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="178" column="82" selection-start-line="178" selection-start-column="62" selection-end-line="178" selection-end-column="82" />
+            <state relative-caret-position="678">
+              <caret line="48" column="97" selection-start-line="48" selection-start-column="97" selection-end-line="48" selection-end-column="114" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="181">
+              <caret line="28" column="48" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="618">
+              <caret line="145" column="113" selection-start-line="145" selection-start-column="113" selection-end-line="145" selection-end-column="113" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="529">
+              <caret line="30" selection-start-line="30" selection-end-line="30" />
             </state>
           </provider>
         </entry>
@@ -107,27 +164,11 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>join</find>
-      <find>My</find>
-      <find>queryMyRepairRecordList</find>
-      <find>queryManagePage</find>
-      <find>transferToLogistics</find>
-      <find>queryRepairCollaborate</find>
-      <find>queryCollaborateRecordList</find>
-      <find>closeOrder</find>
-      <find>repairCollaborateRecordService</find>
-      <find>insertRepairUserSetting</find>
-      <find>case</find>
-      <find>InsertRepairUser</find>
-      <find>不考核</find>
-      <find>queryCollaborator</find>
-      <find>通讯录</find>
       <find>getRepairWorkTypes</find>
       <find>deleteRepairUserById</find>
       <find>queryPageRepairUsers</find>
       <find>examine_count</find>
       <find>maintenance_count</find>
-      <find>timeout_count</find>
       <find>school_id</find>
       <find>queryManageCount</find>
       <find>dateNow</find>
@@ -135,8 +176,24 @@
       <find>rr1</find>
       <find>finished_count</find>
       <find>#</find>
-      <find>queryTeamWorkExamine</find>
       <find>RepairTechnicianVo</find>
+      <find>receiveOrders</find>
+      <find>InsertRepairRecord</find>
+      <find>DateNo</find>
+      <find>queryTeamWorkExamine</find>
+      <find>timeout_count</find>
+      <find>queryMyRepairRecordList</find>
+      <find>queryUserData</find>
+      <find>getRepairsByShiftIds</find>
+      <find>&quot;,&quot;</find>
+      <find>&quot;,&quot;+</find>
+      <find>.con</find>
+      <find>queryArticleConsumes</find>
+      <find>getRepairParentArticleTypes</find>
+      <find>HH:mm</find>
+      <find>抢单</find>
+      <find>queryConsumeMaterial</find>
+      <find>insertRepairRecord</find>
     </findStrings>
     <replaceStrings>
       <replace>Consume</replace>
@@ -177,9 +234,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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" />
@@ -209,25 +263,28 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.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/model/vo/AddressBookListVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaboratorVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/teamWorkCountVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
+        <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/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
       </list>
     </option>
   </component>
@@ -259,7 +316,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -671,12 +728,12 @@
       <workItem from="1689834821108" duration="40536000" />
       <workItem from="1690247776483" duration="78760000" />
       <workItem from="1690506045062" duration="61277000" />
-      <workItem from="1690850680543" duration="153723000" />
+      <workItem from="1690850680543" duration="167784000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="578301000" />
+    <option name="totallyTimeSpent" value="592362000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -688,10 +745,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.12260128" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12579957" />
       <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" />
@@ -702,7 +759,7 @@
       <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 active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.520442" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.52407" />
       <window_info anchor="bottom" id="Debug" order="3" 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" />
@@ -720,7 +777,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.22538294" />
+      <window_info anchor="right" id="Maven" order="3" visible="true" weight="0.2249467" />
       <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" />
@@ -768,7 +825,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>320</line>
+          <line>303</line>
           <properties />
           <option name="timeStamp" value="146" />
         </line-breakpoint>
@@ -786,7 +843,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>254</line>
+          <line>252</line>
           <properties />
           <option name="timeStamp" value="157" />
         </line-breakpoint>
@@ -822,356 +879,384 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRefundRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="45" column="19" selection-start-line="45" selection-start-column="19" selection-end-line="45" selection-end-column="19" />
+        <state>
+          <caret column="3" selection-start-column="3" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaborateRecordVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemSettingMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaboratorVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="685">
+          <caret line="45" column="5" selection-start-line="39" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#562#563#0" expanded="true" />
+            <element signature="e#593#594#0" expanded="true" />
+            <element signature="e#641#642#0" expanded="true" />
+            <element signature="e#681#682#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <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="561">
+          <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/collaborateApplyRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <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="-840">
+          <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/services/impl/RepairCollaborateRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="569">
-          <caret line="70" column="99" selection-start-line="70" selection-start-column="73" selection-end-line="70" selection-end-column="99" />
+        <state relative-caret-position="621">
+          <caret line="39" column="35" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="35" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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/model/vo/RepairWorkTypeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="70" selection-start-line="70" selection-end-line="70" />
+        <state relative-caret-position="253">
+          <caret line="11" column="29" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="10" column="42" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="42" />
+        <state relative-caret-position="474">
+          <caret line="32" column="38" lean-forward="true" selection-start-line="32" selection-start-column="38" selection-end-line="32" selection-end-column="38" />
         </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/controller/RepairWorkTypeController.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="2231">
+          <caret line="111" column="33" selection-start-line="111" selection-start-column="33" selection-end-line="111" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.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="166">
-          <caret line="25" column="11" lean-forward="true" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
+        <state relative-caret-position="318">
+          <caret line="15" column="15" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="15" />
         </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/model/vo/MaintenanceTechnicianVo.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="460">
+          <caret line="20" column="32" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="32" />
         </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/model/vo/RepairManageCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <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="529">
+          <caret line="50" column="27" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumableExcelVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="23">
+          <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/ConsumablePageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <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/EvaluateVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="759">
+          <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/LoginVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="667">
-          <caret line="29" column="26" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="29" selection-end-column="26" />
+        <state relative-caret-position="253">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/WxAccessTokenMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <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/resources/mapper/repair/RepairTransferRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairShiftSettingsMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSchoolMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <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="-188">
+          <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" />
+          </folding>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRefundRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="35" column="55" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="55" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairReceivingServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="3" selection-start-column="3" selection-end-column="3" />
+        <state relative-caret-position="295">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemSettingMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MyRepairRecordVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2198">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1919">
-          <caret line="205" column="25" lean-forward="true" selection-start-line="205" selection-start-column="25" selection-end-line="205" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="594">
+          <caret line="58" column="30" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairReceiving.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="138" column="47" selection-start-line="138" selection-start-column="31" selection-end-line="138" selection-end-column="47" />
+        <state relative-caret-position="568">
+          <caret line="57" column="29" lean-forward="true" selection-start-line="57" selection-start-column="29" selection-end-line="57" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/CollaboratorVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="685">
-          <caret line="45" column="5" selection-start-line="39" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
+        <state relative-caret-position="-4094">
+          <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#562#563#0" expanded="true" />
-            <element signature="e#593#594#0" expanded="true" />
-            <element signature="e#641#642#0" expanded="true" />
-            <element signature="e#681#682#0" expanded="true" />
+            <element signature="e#2405#2409#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookListVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassesSettingPageDataVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="575">
+          <caret line="27" column="29" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="27" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairClassesSettings.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="110" column="116" selection-start-line="110" selection-start-column="116" selection-end-line="110" selection-end-column="116" />
+        <state relative-caret-position="263">
+          <caret line="50" column="21" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-840">
-          <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="449">
+          <caret line="73" column="57" selection-start-line="73" selection-start-column="37" selection-end-line="73" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="259">
-          <caret line="22" column="7" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="7" />
+        <state relative-caret-position="575">
+          <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/updateAddressBookRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairShiftSettings.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="39" column="35" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="35" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-50">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AutoDispatchUserVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="46" column="69" selection-start-line="46" selection-start-column="69" selection-end-line="46" selection-end-column="69" />
+        <state relative-caret-position="447">
+          <caret line="55" column="4" lean-forward="true" selection-start-line="55" selection-start-column="4" selection-end-line="59" selection-end-column="27" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.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="253">
-          <caret line="11" column="29" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" />
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairWorkTypeControllerAPI.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="474">
-          <caret line="32" column="38" lean-forward="true" selection-start-line="32" selection-start-column="38" selection-end-line="32" selection-end-column="38" />
+        <state relative-caret-position="219">
+          <caret line="60" column="49" lean-forward="true" selection-start-line="60" selection-start-column="49" selection-end-line="60" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairArticleChildVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="543">
-          <caret line="225" column="80" selection-start-line="225" selection-start-column="80" selection-end-line="225" selection-end-column="80" />
+        <state relative-caret-position="253">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairWorkTypeController.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="2231">
-          <caret line="111" column="33" selection-start-line="111" selection-start-column="33" selection-end-line="111" selection-end-column="33" />
+        <state relative-caret-position="315">
+          <caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
         </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/request/timeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="15" />
+        <state relative-caret-position="345">
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/MaintenanceTechnicianVo.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/Date.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="20" column="32" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="32" />
+        <state relative-caret-position="295">
+          <caret line="915" column="19" selection-start-line="915" selection-start-column="19" selection-end-line="915" selection-end-column="19" />
+          <folding>
+            <element signature="e#38710#38711#0" expanded="true" />
+            <element signature="e#38770#38771#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="50" column="27" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="27" />
+        <state relative-caret-position="425">
+          <caret line="32" column="71" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="71" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/AddressBookVo.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="23">
-          <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="-356">
+          <caret line="23" column="2" lean-forward="true" selection-start-line="23" selection-start-column="2" selection-end-line="23" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="29" column="40" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="40" />
+        <state relative-caret-position="56">
+          <caret line="19" column="32" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/TeamWorkCountVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="223">
+          <caret line="114" column="96" selection-start-line="114" selection-start-column="69" selection-end-line="114" selection-end-column="96" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="759">
-          <caret line="53" column="81" selection-start-line="53" selection-start-column="81" selection-end-line="53" selection-end-column="81" />
+        <state relative-caret-position="315">
+          <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.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="253">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="686">
+          <caret line="147" column="96" selection-start-line="147" selection-start-column="89" selection-end-line="147" selection-end-column="96" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="700">
-          <caret line="65" column="54" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="54" />
+        <state relative-caret-position="529">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-188">
-          <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="618">
+          <caret line="145" column="113" selection-start-line="145" selection-start-column="113" selection-end-line="145" selection-end-column="113" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="678">
+          <caret line="48" column="97" selection-start-line="48" selection-start-column="97" selection-end-line="48" selection-end-column="114" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="28" column="48" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="178" column="82" selection-start-line="178" selection-start-column="62" selection-end-line="178" selection-end-column="82" />
+        <state relative-caret-position="193">
+          <caret line="103" column="48" selection-start-line="103" selection-start-column="48" selection-end-line="103" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/ExcelExportUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1208">
-          <caret line="418" column="321" selection-start-line="418" selection-start-column="321" selection-end-line="418" selection-end-column="321" />
-          <folding>
-            <element signature="e#2405#2409#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="201">
+          <caret line="156" column="44" selection-start-line="156" selection-start-column="44" selection-end-line="156" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="259">
+          <caret line="186" column="8" selection-start-line="186" selection-start-column="8" selection-end-line="186" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar!/org/apache/commons/lang3/time/DateUtils.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-66">
-          <caret line="831" column="10" selection-start-line="831" selection-start-column="7" selection-end-line="831" selection-end-column="10" />
+        <state relative-caret-position="138">
+          <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/api/RepairRecordControllerAPI.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="22">
-          <caret line="88" column="42" lean-forward="true" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
+        <state relative-caret-position="144">
+          <caret line="958" column="15" selection-start-line="958" selection-start-column="15" selection-end-line="958" selection-end-column="15" />
         </state>
       </provider>
     </entry>

+ 46 - 7
src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -1,10 +1,7 @@
 package com.repair.api;
 
 import com.repair.model.pojo.RepairRecord;
-import com.repair.model.request.collaborateApplyRequest;
-import com.repair.model.request.finishOrderRequest;
-import com.repair.model.request.repairRecordRequest;
-import com.repair.model.request.transferApplyRequest;
+import com.repair.model.request.*;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +17,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/insertRepairRecord")
     @ApiOperation(value = "提交报修订单", notes = "提交报修订单", httpMethod = "POST")
-    CommonResult InsertRepairRecord(@Validated @RequestBody repairRecordRequest rrr, BindingResult bindingResult);
+    CommonResult InsertRepairRecord(@Validated @RequestBody repairRecordRequest rrr, BindingResult bindingResult) throws Exception;
 
     @PostMapping(value = "/updateRepairRecordById")
     @ApiOperation(value = "编辑报修记录数据", notes = "编辑报修记录数据", httpMethod = "POST")
@@ -77,8 +74,7 @@ public interface RepairRecordControllerAPI {
     @GetMapping(value = "/receiveOrders")
     @ApiOperation(value = "接单", notes = "接单", httpMethod = "GET")
     CommonResult receiveOrders(@RequestParam int recordId, @RequestParam int userId) throws Exception;
-
-    @GetMapping(value = "/closeOrder")
+@GetMapping(value = "/closeOrder")
     @ApiOperation(value = "关单", notes = "关单", httpMethod = "GET")
     CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason);
 
@@ -101,4 +97,47 @@ public interface RepairRecordControllerAPI {
     @GetMapping(value = "/queryTeamWorkPage")
     @ApiOperation(value = "根据校区ID获取团队工单报修分页数据", notes = "根据校区ID获取团队工单报修分页数据", httpMethod = "GET")
     CommonResult queryTeamWorkPage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int state, @RequestParam int schoolId);
+
+
+	@PostMapping(value = "/receiveSendOrders")
+    @ApiOperation(value = "派单", notes = "派单", httpMethod = "POST")
+    CommonResult receiveSendOrders(@RequestBody ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception;
+
+
+    @GetMapping(value = "/dropDown")
+    @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
+    CommonResult dropDown() throws Exception;
+
+    @PostMapping(value = "/cooperationOrders")
+    @ApiOperation(value = "协作审核", notes = "协作审核", httpMethod = "POST")
+    CommonResult cooperationOrders(@RequestBody cooperationOrdersRequest cor, BindingResult bindingResult) throws Exception;
+
+
+    @GetMapping(value = "/details")
+    @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")
+    CommonResult details(@RequestParam int recordId) throws Exception;
+
+    @PostMapping(value = "/transfer")
+    @ApiOperation(value = "转单审核", notes = "转单审核", httpMethod = "POST")
+    CommonResult transfer(@RequestBody transferRequest transferRequest, BindingResult bindingResult) throws Exception;
+
+    @GetMapping(value = "/alterPriceShow")
+    @ApiOperation(value = "改价显示", notes = "改价显示", httpMethod = "GET")
+    CommonResult alterPriceShow(@RequestParam int recordId) throws Exception;
+
+    @GetMapping(value = "/alterPriceGoodsType")
+    @ApiOperation(value = "改价物品种类下拉框", notes = "改价物品种类下拉框", httpMethod = "GET")
+    CommonResult alterPriceGoodsType(@RequestParam int schoolId) throws Exception;
+
+
+    @GetMapping(value = "/alterPriceGoodsName")
+    @ApiOperation(value = "改价耗材名称下拉框", notes = "改价耗材名称下拉框", httpMethod = "GET")
+    CommonResult alterPriceGoodsName(@RequestParam int articleId) throws Exception;
+
+
+    @PostMapping(value = "/alterPrice")
+    @ApiOperation(value = "改价", notes = "改价", httpMethod = "POST")
+    CommonResult alterPrice(@RequestBody AlterPriceRequest apr, BindingResult bindingResult) throws Exception;
+
+
 }

+ 4 - 0
src/main/java/com/repair/api/RepairUserControllerAPI.java

@@ -34,6 +34,10 @@ public interface RepairUserControllerAPI {
     @ApiOperation(value = "根据卡号删除指定用户", notes = "根据卡号删除指定用户", httpMethod = "GET")
     CommonResult queryRepairUserByCardNumber(@RequestParam String cardNumber);
 
+    @GetMapping(value = "/queryPageRepairUsers")
+    @ApiOperation(value = "获取添加人员分页数据", notes = "获取添加人员分页数据", httpMethod = "GET")
+    CommonResult queryPageRepairUsers(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId, String phone, Integer workTypId);
+
     @GetMapping(value = "/getCollaborator")
     @ApiOperation(value = "获取除自己以外的协作人员分页数据", notes = "获取除自己以外的协作人员分页数据", httpMethod = "GET")
     CommonResult getCollaborator(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam Integer schoolId,@RequestParam Integer userId, String keyWord);

+ 30 - 0
src/main/java/com/repair/common/utils/DateUtils.java

@@ -0,0 +1,30 @@
+package com.repair.common.utils;
+
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+public class DateUtils {
+
+//    计算时差
+   public static String difference(Date start,Date end){
+       SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+       String time1 = sdf.format(start);
+       String time2 = sdf.format(end);
+
+       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+       LocalDateTime dateTime1 = LocalDateTime.parse(time1, formatter);
+       LocalDateTime dateTime2 = LocalDateTime.parse(time2, formatter);
+       Duration duration = Duration.between(dateTime1, dateTime2);
+
+       long days = duration.toDays();
+       long hours = duration.toHours() % 24;
+       long minutes = duration.toMinutes() % 60;
+       long seconds = duration.getSeconds() % 60;
+//       System.out.println("时间差为:" + days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒");
+       return days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒";
+   }
+
+}

+ 538 - 24
src/main/java/com/repair/controller/RepairRecordController.java

@@ -1,12 +1,13 @@
 package com.repair.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.jcraft.jsch.*;
 import com.repair.api.RepairRecordControllerAPI;
 import com.repair.common.utils.*;
-import com.repair.model.enumModel.eRecordStatu;
-import com.repair.model.enumModel.eTechnicianStatu;
-import com.repair.model.enumModel.eUserZZ;
+import com.repair.model.enumModel.*;
 import com.repair.model.pojo.*;
 import com.repair.model.request.*;
 import com.repair.model.result.CommonResult;
@@ -16,7 +17,6 @@ import com.repair.services.*;
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -64,35 +64,153 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     private RepairDispatchRecordService repairDispatchRecordService;
     @Autowired
     private RepairCollaborateRecordService repairCollaborateRecordService;
-
+    @Autowired
+    private RepairArticleTypeService repairArticleTypeService;
+    @Autowired
+    private RepairTrackRecordService repairTrackRecordService;
 
     @Autowired
     private WeiXiaoUtil weiXiaoUtil;
 
     @Override
-    public CommonResult InsertRepairRecord(repairRecordRequest rrr, BindingResult bindingResult) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult InsertRepairRecord(repairRecordRequest rrr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
-        RepairRecord rr = new RepairRecord();
-        rr.setAreaId(rrr.getAreaId());
-        rr.setArticleId(rrr.getArticleId());
-        rr.setSchoolId(rrr.getSchoolId());
-        rr.setRecordNo(getUUIDBits(15));
-        rr.setAddress(rrr.getAddress());
-        rr.setDescription(rrr.getDescription());
-        rr.setImage(StringUtils.join(rrr.getImages(), ','));
-        rr.setVoice(rrr.getVoice());
-        rr.setUserId(rrr.getUserId());
-        rr.setUserName(rrr.getUserName());
-        rr.setUserPhone(rrr.getUserPhone());
-        rr.setReportTime(new Date());
-        rr.setMaintenanceState(eRecordStatu.Dispatch.getValue());
-        rr.setBuildId(rrr.getBuildId());
-        int result = repairRecordService.insertRepairRecord(rr);
-
-        return result > 0 ? CommonResult.ok("提交成功") : CommonResult.fail("提交失败");
+
+        //循环班次数据
+        Integer isDuty = 0;
+        try {
+            String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+            String dateHour = new SimpleDateFormat("HH:mm").format(new Date());
+            Date nowDate = new Date();
+            RepairRecord rr = new RepairRecord();
+            rr.setAreaId(rrr.getAreaId());
+            rr.setArticleId(rrr.getArticleId());
+            rr.setSchoolId(rrr.getSchoolId());
+            rr.setRecordNo(getUUIDBits(15));
+            rr.setAddress(rrr.getAddress());
+            rr.setDescription(rrr.getDescription());
+            rr.setImage(StringUtils.join(rrr.getImages(), ','));
+            rr.setVoice(rrr.getVoice());
+            rr.setUserId(rrr.getUserId());
+            rr.setUserName(rrr.getUserName());
+            rr.setUserPhone(rrr.getUserPhone());
+            rr.setReportTime(new Date());
+            rr.setMaintenanceState(eRecordStatu.Dispatch.getValue());
+            rr.setBuildId(rrr.getBuildId());
+
+            //派单操作
+            //根据类型和校区找到对应的维修师傅
+            //获取到了多位师傅的话 单子随机派给满足条件的一位师傅
+            //照接单数从小到大排 最小的优先接单(前提是满足条件)
+            //值班或下班或周末有派给指定的维修师傅的单子就是值班单 并且不考核
+            //其他无人接的单子,第二天(工作日)的时候自动派
+            //派单表中需要记录接单时间  接单表中需要记录维修完成时间
+            //楼栋条件 员工必填楼栋 满足楼栋条件才能派
+            List<AutoDispatchUserVo> users = repairUserService.autoDispatchUser(rrr.getSchoolId(), dateNow, rrr.getArticleId(), rrr.getBuildId());
+
+            List<String> shifts = users.stream().map(AutoDispatchUserVo::getArticleId).collect(Collectors.toList());
+
+            RepairDispatchRecord rdr = new RepairDispatchRecord();
+            //只获取不是值班的排班数据
+            List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsByShiftIds(shifts);
+            for (AutoDispatchUserVo user : users) {
+                List<RepairShiftSettings> datas = shiftDatas.stream().filter(e -> (","+user.getArticleId()+",").contains((","+e.getId()+","))).collect(Collectors.toList());
+                if (datas.size() <= 0) {
+                    continue;
+                }
+
+                int acceptanceAssessTime = user.getAcceptanceTime();
+                try {
+
+                    //下班之后或者值班接的单不考核 将报修工单中的is_duty改为1
+                    Date workTime = TimeExchange.StringToDate(dateNow + " " + shiftDatas.get(0).getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss");
+                    if (workTime.before(nowDate)) {
+                        isDuty = 1;
+                    }
+
+                    if (isDuty == 0) {
+                        //在工作时间才去派单
+                        List<timeVo> tvs = DelayedUtils.timeVos(shiftDatas);
+                        boolean result = false;
+                        for (timeVo tv:tvs) {
+                            result = (TimeExchange.CompareDate(tv.getStart(), dateHour, "HH:mm") || tv.getStart().equals(dateHour))
+                                    && (TimeExchange.CompareDate( dateHour,tv.getStart(), "HH:mm") || tv.getStart().equals(dateHour));
+                            if(result){
+                                break;
+                            }
+                        }
+
+                        if(!result){
+                            continue;
+                        }
+
+                        //工作的时间是否够修完 临下班接的单不做延长
+                        for (int i = 0; i < tvs.size(); i++) {
+                            Date startWorkTime = TimeExchange.StringToDate(dateNow + " " + tvs.get(i).getStart() + ":00", "yyyy-MM-dd HH:mm:ss");
+                            Date endWorkTime = TimeExchange.StringToDate(dateNow + " " + tvs.get(i).getEnd() + ":00", "yyyy-MM-dd HH:mm:ss");
+
+                            //小于工作时间段的开始时间
+                            if (nowDate.before(startWorkTime) || nowDate.equals(startWorkTime) && i == 0) {
+                                //早上开始上班之前的单子
+                                int minute = TimeExchange.getOffsetMinutes(nowDate, startWorkTime);
+                                int workMinte = TimeExchange.getOffsetMinutes(nowDate, endWorkTime);
+                                acceptanceAssessTime = acceptanceAssessTime + minute;
+                                acceptanceAssessTime = DelayedUtils.addMinuteStart(tvs, endWorkTime, acceptanceAssessTime, nowDate, dateNow, workMinte, i, 1);
+                                break;
+                            } else if ((startWorkTime.before(nowDate) || startWorkTime.equals(nowDate)) && (nowDate.before(endWorkTime) || nowDate.equals(endWorkTime))) {
+                                //工作时间段内的单子
+                                int workMinte = TimeExchange.getOffsetMinutes(nowDate, endWorkTime);
+                                acceptanceAssessTime = DelayedUtils.addMinuteStart(tvs, endWorkTime, acceptanceAssessTime, nowDate, dateNow, workMinte, i, 1);
+                                break;
+
+                            } 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))) {
+                                    Date nextEndWorkTime = TimeExchange.StringToDate(dateNow + " " + tvs.get(i + 1).getEnd() + ":00", "yyyy-MM-dd HH:mm:ss");
+                                    int minute = TimeExchange.getOffsetMinutes(nowDate, nextStartWorkTime);
+                                    int workMinte = TimeExchange.getOffsetMinutes(nowDate, nextEndWorkTime);
+                                    acceptanceAssessTime = acceptanceAssessTime + minute;
+                                    acceptanceAssessTime = DelayedUtils.addMinuteStart(tvs, nextEndWorkTime, acceptanceAssessTime, nowDate, dateNow, workMinte, i, 2);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    //创建派单记录
+                    rdr.setAssignedTime(new Date());
+                    rdr.setAcceptanceAssessTime(acceptanceAssessTime);
+                    rdr.setOrderType(0);
+                    rdr.setIsLoseEfficacy(0);
+
+                } catch (Exception e) {
+                    throw new Exception("报修单提交失败!");
+                }
+            }
+
+            rr.setIsDuty(isDuty);
+            int result = repairRecordService.insertRepairRecord(rr);
+
+            if (result <= 0) {
+                throw new Exception("报修单提交失败!");
+            }
+
+            rdr.setRecordId(result);
+            rdr.setUsersId(rrr.getUserId());
+            int dispatch = repairDispatchRecordService.insertRepairDispatchRecord(rdr);
+            if (dispatch <= 0) {
+                throw new Exception("报修单提交失败!");
+            }
+
+        } catch (Exception e) {
+            throw new Exception("报修单提交失败!");
+        }
+
+        return CommonResult.ok("报修单提交成功");
     }
 
     @Override
@@ -616,6 +734,402 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok("抢单成功");
     }
 
+/**
+* 派单
+     *
+     * @param rsor
+     * @param bindingResult
+     * @return
+     * @throws Exception
+ */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult receiveSendOrders(ReceiveSendOrdersRequest rsor, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+//        维修人id
+        Integer userId = rsor.getUserId();
+        RepairUser repairUser = repairUserService.getById(userId);
+//          维修订单id
+        Integer recordId = rsor.getRecordId();
+        RepairRecord repairRecord = repairRecordService.getById(recordId);
+
+        repairRecord.setMaintenanceState(eRecordStatu.Dispatch.getValue());
+        repairRecord.setMaintenancerId(recordId + "");
+        repairRecord.setMaintenancerName(repairUser.getUserName());
+        repairRecord.setMaintenancerPhone(repairUser.getUserPhone());
+
+//        修改维修订单
+        boolean update = repairRecordService.updateById(repairRecord);
+
+//        添加派单记录
+        RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
+        repairDispatchRecord.setRecordId(recordId);
+        repairDispatchRecord.setUsersId(userId);
+        repairDispatchRecord.setAssignedTime(new Date());
+        repairDispatchRecord.setAcceptanceAssessTime(repairUser.getAcceptanceAssessTime());
+        repairDispatchRecord.setOrderType(eDispatchType.Send.getValue());
+        repairDispatchRecord.setIsLoseEfficacy(eDispatchResult.NotExpired.getValue());
+
+        boolean save = repairDispatchRecordService.save(repairDispatchRecord);
+
+//        追踪记录表
+        RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+        repairTrackRecord.setRecordId(recordId);
+        repairTrackRecord.setContent("派单");
+        boolean save1 = repairTrackRecordService.save(repairTrackRecord);
+
+
+        if (update || save || save1) {
+            return CommonResult.ok("派单成功");
+        }
+
+        return CommonResult.fail("派单失败");
+    }
+
+ /**
+     * 协作下拉框
+     *
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult dropDown() throws Exception {
+//        将可以接单的师傅显示到协作下拉框中(员工状态 大量接单:1)
+        LambdaQueryWrapper<RepairUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairUser::getState, eUserStatu.Received.getValue())
+                .eq(RepairUser::getUserZzid, eUserZZ.Maintenance.getValue());
+
+        List<RepairUser> repairUsers = repairUserService.list(wrapper);
+
+        return CommonResult.ok(repairUsers);
+    }
+
+    /**
+     * 协作审核
+     *
+     * @param cor
+     * @param bindingResult
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult cooperationOrders(cooperationOrdersRequest cor, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+//         协作表id
+        Integer collaborateId = cor.getCollaborateId();
+//        协作表
+        RepairCollaborateRecord repairCollaborateRecord = repairCollaborateRecordService.getById(collaborateId);
+
+        //        维修人数组
+        String[] collaborator = cor.getCollaborator();
+
+//        获取审核状态
+        Integer approverStatu = cor.getApproverStatu();
+
+        String usersId = "";
+
+//          维修订单id
+        Integer recordId = repairCollaborateRecord.getRecordId();
+
+//         同意
+        if (eApprovalStatu.Agree.getValue() == approverStatu) {
+
+//        获取维修数据
+            RepairRecord repairRecord = repairRecordService.getById(recordId);
+
+            for (int i = 0; i < collaborator.length; i++) {
+                String userId = collaborator[i];
+//            拼接协作人id
+                if (i == 0) {
+                    usersId = userId;
+                } else {
+                    usersId = usersId + "," + userId;
+                }
+
+//            获取人员信息,用来添加派单记录
+                RepairUser repairUser = repairUserService.getById(userId);
+
+                RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
+                repairDispatchRecord.setRecordId(recordId);
+                repairDispatchRecord.setUsersId(Integer.valueOf(userId));
+                repairDispatchRecord.setAssignedTime(new Date());
+                repairDispatchRecord.setAcceptanceAssessTime(repairUser.getAcceptanceAssessTime());
+                repairDispatchRecord.setOrderType(eDispatchType.Cooperation.getValue());
+                repairDispatchRecord.setIsLoseEfficacy(eDispatchResult.NotExpired.getValue());
+
+                boolean save = repairDispatchRecordService.save(repairDispatchRecord);
+                if (!save) {
+                    return CommonResult.fail("协作审核失败");
+                }
+
+            }
+
+//        获取维修人ID,然后拼接协作人ID
+            String maintenancerId = repairRecord.getMaintenancerId();
+            if (ObjectUtils.isEmpty(maintenancerId)) {
+                repairRecord.setMaintenancerId(usersId);
+            } else {
+                repairRecord.setMaintenancerId(maintenancerId + "," + usersId);
+            }
+
+//        并将状态改成派单中
+            repairRecord.setMaintenanceState(eRecordStatu.Dispatch.getValue());
+            boolean updateRecord = repairRecordService.updateById(repairRecord);
+            if (!updateRecord) {
+                return CommonResult.fail("协作审核失败");
+            }
+//                拒绝
+        } else if (eApprovalStatu.Refuse.getValue() == approverStatu) {
+            for (int i = 0; i < collaborator.length; i++) {
+                String userId = collaborator[i];
+                //            拼接协作人id
+                if (i == 0) {
+                    usersId = userId;
+                } else {
+                    usersId = usersId + "," + userId;
+                }
+
+            }
+        } else {
+            return CommonResult.fail("协作审核失败");
+        }
+        //        修改协作表
+        repairCollaborateRecord.setApproverId(cor.getApproverId());
+        repairCollaborateRecord.setRemark(cor.getRemark());
+        repairCollaborateRecord.setApprovalStatu(approverStatu);
+//                协作人
+        repairCollaborateRecord.setCollaborator(usersId);
+
+        boolean updateCollaborate = repairCollaborateRecordService.updateById(repairCollaborateRecord);
+
+//        追踪记录表
+        RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+        repairTrackRecord.setRecordId(recordId);
+        repairTrackRecord.setContent("协作审核");
+        boolean save = repairTrackRecordService.save(repairTrackRecord);
+
+        if (updateCollaborate || save) {
+            return CommonResult.ok("协作审核成功");
+        }
+        return CommonResult.fail("协作审核失败");
+    }
+
+    /**
+     * 详情展示
+     *
+     * @param recordId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult details(int recordId) throws Exception {
+        if (ObjectUtils.isEmpty(recordId)) {
+            return CommonResult.fail("详情查看失败");
+        }
+//        工单信息
+        RepairRecord repairRecord = repairRecordService.getById(recordId);
+        if (ObjectUtils.isEmpty(repairRecord)) {
+            return CommonResult.fail("详情查看失败");
+        }
+//        故障表的id
+        Integer articleId = repairRecord.getArticleId();
+        RepairArticleType repairArticleType = repairArticleTypeService.getById(articleId);
+//        获取故障类型
+        String name = repairArticleType.getName();
+
+//        报修进度
+        LambdaQueryWrapper<RepairTrackRecord> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairTrackRecord::getRecordId, recordId)
+                .orderByDesc(RepairTrackRecord::getCreateTime);
+
+        List<RepairTrackRecord> repairTrackRecords = repairTrackRecordService.list(wrapper);
+
+//        时长
+        RepairTrackRecord repairTrackRecord = repairTrackRecords.get(0);
+        Date endTime = repairTrackRecord.getCreateTime();
+//        维修总时长
+        Date startTime = repairRecord.getReportTime();
+        String differenceZ = DateUtils.difference(startTime, endTime);
+//        维修时长
+        LambdaQueryWrapper<RepairReceiving> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.eq(RepairReceiving::getRecordId, recordId)
+                .orderByAsc(RepairReceiving::getReceivingTime);
+
+        RepairReceiving repairReceiving = repairReceivingService.list(wrapper2).get(0);
+        Date receivingTime = repairReceiving.getReceivingTime();
+        String difference = DateUtils.difference(receivingTime, endTime);
+
+        DetailsVo detailsVo = new DetailsVo();
+        detailsVo.setRepairRecord(repairRecord);
+        detailsVo.setMalfunctionName(name);
+        detailsVo.setRepairTrackRecordList(repairTrackRecords);
+        detailsVo.setTotalTime(differenceZ);
+        detailsVo.setTime(difference);
+
+        return CommonResult.ok(detailsVo);
+    }
+
+    /**
+     * 转单审核
+     *
+     * @param tr
+     * @param bindingResult
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult transfer(transferRequest tr, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+//        审批状态
+        Integer approverStatu = tr.getApproverStatu();
+//        转单表
+        RepairTransferRecord transferRecord = repairTransferRecordService.getById(tr.getTransferId());
+//        维修表id
+        Integer recordId = transferRecord.getRecordId();
+//        被派单人Id
+        Integer userId = tr.getUserId();
+//        派单用户
+        RepairUser repairUser = repairUserService.getById(userId);
+
+        if (eApprovalStatu.Agree.getValue() == approverStatu) {
+//         同意
+//            添加派单记录
+            RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
+            repairDispatchRecord.setRecordId(recordId);
+            repairDispatchRecord.setUsersId(userId);
+            repairDispatchRecord.setAssignedTime(new Date());
+            repairDispatchRecord.setAcceptanceAssessTime(repairUser.getAcceptanceAssessTime());
+            repairDispatchRecord.setOrderType(eDispatchType.Transfer.getValue());
+            repairDispatchRecord.setIsLoseEfficacy(eDispatchResult.NotExpired.getValue());
+            boolean save = repairDispatchRecordService.save(repairDispatchRecord);
+
+//            将维修表的状态改成派单中
+            RepairRecord repairRecord = repairRecordService.getById(recordId);
+            repairRecord.setMaintenanceState(eRecordStatu.Dispatch.getValue());
+            boolean update = repairRecordService.updateById(repairRecord);
+            if (!(save || update)) {
+                return CommonResult.fail("转单审核失败");
+            }
+
+        }
+        transferRecord.setApproverId(tr.getApproverId());
+        transferRecord.setApprovalStatu(approverStatu);
+        transferRecord.setRemark(tr.getRemark());
+
+        boolean update = repairTransferRecordService.updateById(transferRecord);
+//        追踪记录表
+        RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
+        repairTrackRecord.setRecordId(recordId);
+        repairTrackRecord.setContent("转单审核");
+        boolean save = repairTrackRecordService.save(repairTrackRecord);
+
+        if (update || save) {
+            return CommonResult.ok("转单审核成功");
+        }
+
+        return CommonResult.fail("转单审核失败");
+    }
+
+    /**
+     * 改价显示
+     *
+     * @param recordId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult alterPriceShow(int recordId) throws Exception {
+        if (ObjectUtils.isEmpty(recordId)) {
+            return CommonResult.fail("显示失败");
+        }
+        LambdaQueryWrapper<RepairConsumables> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairConsumables::getRecordId, recordId);
+
+        List<RepairConsumables> repairConsumablesList = repairConsumablesService.list(wrapper);
+
+        List<AlterPriceShowVo> vos = new ArrayList<>();
+
+        repairConsumablesList.forEach(rc -> {
+            Integer articleId = rc.getArticleId();
+            RepairArticleType articleType = repairArticleTypeService.getById(articleId);
+            AlterPriceShowVo alterPriceShowVo = new AlterPriceShowVo();
+            alterPriceShowVo.setRepairConsumables(rc);
+            alterPriceShowVo.setArticleName(articleType.getName());
+            vos.add(alterPriceShowVo);
+        });
+
+        return CommonResult.ok(vos);
+    }
+
+    /**
+     * 物品种类下拉框
+     *
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult alterPriceGoodsType(int schoolId) throws Exception {
+        LambdaQueryWrapper<RepairArticleType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(RepairArticleType::getId, RepairArticleType::getName)
+                .eq(RepairArticleType::getSchoolId, schoolId)
+                .eq(RepairArticleType::getParentId, 0);
+
+        List<RepairArticleType> list = repairArticleTypeService.list(wrapper);
+        return CommonResult.ok(list);
+
+    }
+
+    /**
+     * @param articleId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult alterPriceGoodsName(int articleId) throws Exception {
+
+
+        LambdaQueryWrapper<RepairArticleType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(RepairArticleType::getId)
+                .eq(RepairArticleType::getParentId, articleId);
+        List<RepairArticleType> list = repairArticleTypeService.list(wrapper);
+
+        ArrayList<Integer> integers = new ArrayList<>();
+
+        list.forEach(rat->{
+            Integer id = rat.getId();
+            integers.add(id);
+        });
+
+        LambdaQueryWrapper<RepairConsumables> consumablesWrapper=new LambdaQueryWrapper<>();
+        consumablesWrapper.in(RepairConsumables::getArticleId,integers)
+                        .select();
+
+        repairConsumablesService.list(consumablesWrapper);
+
+
+
+        return null;
+    }
+
+    @Override
+    public CommonResult alterPrice(AlterPriceRequest apr, BindingResult bindingResult) throws Exception {
+        return null;
+    }
+
     @Override
     public CommonResult closeOrders(int recordId, String userId, String reason) {
 

+ 5 - 0
src/main/java/com/repair/controller/RepairUserController.java

@@ -183,6 +183,11 @@ public class RepairUserController implements RepairUserControllerAPI {
     }
 
     @Override
+    public CommonResult queryPageRepairUsers(int currentPage, int pageCount, Integer schoolId, String phone, Integer workTypId) {
+        return null;
+    }
+
+    @Override
     public CommonResult getCollaborator(int currentPage, int pageCount, Integer schoolId, Integer userId, String keyWord) {
         PageUtils<CollaboratorVo> result = repairUserService.queryCollaborator(currentPage, pageCount, userId, schoolId, keyWord);
         return CommonResult.ok(result);

+ 2 - 0
src/main/java/com/repair/mapper/RepairUserMapper.java

@@ -28,4 +28,6 @@ public interface RepairUserMapper extends BaseMapper<RepairUser> {
     IPage<CollaboratorVo> queryCollaborator(IPage<CollaboratorVo> page, @Param("userId") Integer userId, @Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord);
 
     List<AddressBookVo> queryAddressBook(@Param("userId") Integer userId, @Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord);
+
+    List<AutoDispatchUserVo> autoDispatchUser(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId,@Param("articleId") Integer buildId);
 }

+ 22 - 0
src/main/java/com/repair/model/enumModel/eApprovalStatu.java

@@ -0,0 +1,22 @@
+package com.repair.model.enumModel;
+
+
+public enum eApprovalStatu {
+    //    拒绝
+    Refuse(0),
+    //    同意
+    Agree(1),
+    //    待审批
+    ApprovalPending(2) ;
+
+    private int value;
+
+    eApprovalStatu(int value) {
+        this.value=value;
+    }
+
+
+    public int getValue() {
+        return value;
+    }
+}

+ 18 - 0
src/main/java/com/repair/model/enumModel/eDispatchResult.java

@@ -0,0 +1,18 @@
+package com.repair.model.enumModel;
+
+public enum eDispatchResult {
+//    未失效
+    NotExpired(0),
+//    已失效
+    Expired(1);
+
+    private Integer value;
+    eDispatchResult(int value) {
+        this.value=value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+}

+ 21 - 0
src/main/java/com/repair/model/enumModel/eDispatchType.java

@@ -0,0 +1,21 @@
+package com.repair.model.enumModel;
+
+public enum eDispatchType {
+//    派单
+    Send(0),
+//    协作
+    Cooperation(1),
+//    转单
+    Transfer(2) ;
+
+    private int value;
+
+    eDispatchType(int value) {
+        this.value=value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+}

+ 4 - 0
src/main/java/com/repair/model/pojo/RepairConsumables.java

@@ -44,6 +44,10 @@ public class RepairConsumables implements Serializable {
     @NotNull(message = "报修记录ID不能为空")
     private Integer recordId;
 
+    @ApiModelProperty(value = "物品类型IDID")
+    @NotNull(message = "物品类型ID不能为空")
+    private Integer articleId;
+
     @ApiModelProperty(value = "耗材ID")
     @NotBlank(message = "耗材数据不能为空")
     private Integer consumeId;

+ 8 - 0
src/main/java/com/repair/model/pojo/RepairDispatchRecord.java

@@ -53,6 +53,14 @@ public class RepairDispatchRecord implements Serializable {
     @NotBlank(message = "订单时间不能为空")
     private Date assignedTime;
 
+    /**
+     * 接单时间 用来计算是否接单超时
+     * 计算公式:
+     * (被派单时间 + 接单考核时间) < 接单时间
+     */
+    @ApiModelProperty(value = "接单时间")
+    private Date receivingTime;
+
     @ApiModelProperty(value = "接单考核时间")
     @NotNull(message = "接单考核时间不能为空")
     private Integer acceptanceAssessTime;

+ 8 - 0
src/main/java/com/repair/model/pojo/RepairReceiving.java

@@ -52,6 +52,14 @@ public class RepairReceiving implements Serializable {
     @NotNull(message = "接单时间不能为空")
     private Date receivingTime;
 
+    /**
+     * 维修完成时间 用来计算是否维修超时
+     * 计算公式:
+     * (接单时间 + 维修考核时间) < 维修完成时间
+     */
+    @ApiModelProperty(value = "维修完成时间")
+    private Date finishTime;
+
     @ApiModelProperty(value = "维修考核时间(单位:分钟)")
     @NotNull(message = "维修考核时间不能为空")
     private Integer maintenanceAssessTime;

+ 9 - 0
src/main/java/com/repair/model/request/AlterPriceRequest.java

@@ -0,0 +1,9 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+@Data
+public class AlterPriceRequest {
+
+
+}

+ 16 - 0
src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java

@@ -0,0 +1,16 @@
+package com.repair.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+@Data
+public class ReceiveSendOrdersRequest {
+
+    @NotNull(message = "维修人ID不能为空")
+    private Integer userId;
+
+    @NotNull(message = "报修记录不能为空")
+    private Integer recordId;
+
+}

+ 23 - 0
src/main/java/com/repair/model/request/cooperationOrdersRequest.java

@@ -0,0 +1,23 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class cooperationOrdersRequest {
+
+    @NotNull(message = "协作记录ID不能为空")
+    private Integer collaborateId;
+
+    @NotNull(message = "协作人ID不能为空")
+    private String[] collaborator;
+
+    @NotNull(message = "审批人ID不能为空")
+    private Integer approverId;
+
+    @NotNull(message = "审批人状态不能为空")
+    private Integer approverStatu;
+
+    private String remark;
+}

+ 28 - 0
src/main/java/com/repair/model/request/transferRequest.java

@@ -0,0 +1,28 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class transferRequest {
+
+    //    转单表id
+    @NotNull(message = "转单表不能为空")
+    private Integer transferId;
+
+    //    审批人Id
+    @NotNull(message = "审批人不能为空")
+    private Integer approverId;
+
+    //  备注
+    private String remark;
+
+    //    派单师傅Id
+    @NotNull(message = "派单师傅不能为空")
+    private Integer userId;
+
+    @NotNull(message = "审批人状态不能为空")
+    private Integer approverStatu;
+
+}

+ 12 - 0
src/main/java/com/repair/model/vo/AlterPriceShowVo.java

@@ -0,0 +1,12 @@
+package com.repair.model.vo;
+
+import com.repair.model.pojo.RepairConsumables;
+import lombok.Data;
+
+@Data
+public class AlterPriceShowVo {
+
+    private RepairConsumables repairConsumables;
+
+    private String articleName;
+}

+ 67 - 0
src/main/java/com/repair/model/vo/AutoDispatchUserVo.java

@@ -0,0 +1,67 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/8 星期二 8:28
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class AutoDispatchUserVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+
+    /**
+     * 当天接单数
+     */
+    private int rdrCount;
+
+    /**
+     * 关联楼栋
+     * 会有多个楼栋
+     */
+    private String buildId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户手机号
+     */
+    private String userPhone;
+
+    /**
+     * 接单考核时间
+     */
+    private int acceptanceTime;
+
+    /**
+     * 维修考核时间
+     */
+    private int maintenanceTime;
+
+    /**
+     * 生效日期
+     */
+    private LocalDate startDate;
+
+    /**
+     * 当天的班次ID
+     * 可能会有多个
+     */
+    private String shiftId;
+
+    /**
+     * 报修物品ID
+     * 可能会有多个
+     */
+    private String articleId;
+}

+ 21 - 0
src/main/java/com/repair/model/vo/DetailsVo.java

@@ -0,0 +1,21 @@
+package com.repair.model.vo;
+
+import com.repair.model.pojo.RepairRecord;
+import com.repair.model.pojo.RepairTrackRecord;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DetailsVo {
+    //    维修表
+    private RepairRecord repairRecord;
+    //    故障类型名称
+    private String malfunctionName;
+    //    报修进度
+    private List<RepairTrackRecord> repairTrackRecordList;
+    //    维修总时长
+    private String totalTime;
+    //    维修时长
+    private String time;
+}

+ 2 - 0
src/main/java/com/repair/services/RepairUserService.java

@@ -45,5 +45,7 @@ public interface RepairUserService extends IService<RepairUser> {
     PageUtils<CollaboratorVo> queryCollaborator(int currentPage, int pageCount, Integer userId, Integer schoolId, String keyWord);
 
     List<AddressBookVo> queryAddressBook(Integer userId, Integer schoolId, String keyWord);
+
+    List<AutoDispatchUserVo> autoDispatchUser(Integer schoolId, String dateNow, Integer articleId, Integer buildId);
 }
 

+ 1 - 1
src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java

@@ -31,7 +31,7 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     @Override
     public int insertRepairRecord(RepairRecord rr) {
         int result = repairRecordMapper.insert(rr);
-        return result;
+        return rr.getId();
     }
 
     @Override

+ 7 - 0
src/main/java/com/repair/services/impl/RepairUserServiceImpl.java

@@ -140,4 +140,11 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
         List<AddressBookVo> result = repairUserMapper.queryAddressBook(userId, schoolId, keyWord);
         return result;
     }
+
+    @Override
+    public List<AutoDispatchUserVo> autoDispatchUser(Integer schoolId, String dateNow, Integer articleId, Integer buildId) {
+        List<AutoDispatchUserVo> result = repairUserMapper.autoDispatchUser(schoolId, dateNow, articleId, buildId);
+
+        return result;
+    }
 }

+ 16 - 16
src/main/resources/mapper/repair/RepairRecordMapper.xml

@@ -43,9 +43,9 @@
     <select id="queryMyRepairRecordList" resultType="com.repair.model.vo.MyRepairRecordVo"
             resultMap="repairRecordOwnMap">
         select
-        case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() when true then '超时未接'
+        case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and rr.is_duty = 0 when true then '超时未接'
         else null end as timeout_disp_str,
-        case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() when true then '维修超时'
+        case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and rr.is_duty = 0 when true then '维修超时'
         else null end as timeout_rece_str,
         rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.dispatch_time,rr.user_name,rr.user_phone,rr.area_id
         as area_name,rr.address,rr.description,rat.name as article_name,rr.image,rr.maintenance_state as state_id from
@@ -85,13 +85,13 @@
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0
         and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        where rr3.maintenance_state = 1 and rr3.deleted = 0
+        where rr3.maintenance_state = 1 and rr3.is_duty = 0 and rr3.deleted = 0
         UNION ALL
         select rr4.* from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0
         and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        where rr4.maintenance_state = 2 and rr4.deleted = 0) c) as timeout_count,(select Count(*) as sh from (
+        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0) c) as timeout_count,(select Count(*) as sh from (
         select rr5.* from repair_record rr5
         inner join repair_collaborate_record rcr on rcr.deleted = 0 and rcr.user_id = #{userId} and rcr.record_id = rr5.id and
         rcr.approval_statu = 2
@@ -121,7 +121,7 @@
     <!--待接单-->
     <select id="queryPendingOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
-        select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
+        select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} and rr.is_duty = 0 when true then '超时未接' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
         from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
@@ -132,7 +132,7 @@
     <!--维修中-->
     <select id="queryRepairOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">
-        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state
+        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} and rr.is_duty = 0 when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state
         from repair_record rr
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
@@ -148,13 +148,13 @@
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0
+        where rr.maintenance_state = 1 and rr.is_duty = 0 and rr.deleted = 0
         UNION ALL
         select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state from repair_record rr
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 2 and rr.deleted = 0) t
+        where rr.maintenance_state = 2 and rr.is_duty = 0 and rr.deleted = 0) t
         order by t.report_time desc
     </select>
 
@@ -197,12 +197,12 @@
         (select Count(*) as cs from (select rr3.* from repair_record rr3
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0 and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
-        where rr3.maintenance_state = 1 and rr3.deleted = 0
+        where rr3.maintenance_state = 1 and rr3.is_duty = 0 and rr3.deleted = 0
         UNION ALL
         select rr4.* from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0 and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
-        where rr4.maintenance_state = 2 and rr4.deleted = 0) c) as timeout_count
+        where rr4.maintenance_state = 2 and rr4.is_duty = 0 and rr4.deleted = 0) c) as timeout_count
     </select>
 
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
@@ -254,7 +254,7 @@
         rdr.is_lose_efficacy = 0
         and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
         <where>
-            and rr3.maintenance_state = 1 and rr3.deleted = 0
+            and rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.is_duty = 0
             <if test="keyWord != null and keyWord != ''">
                 and (rr3.area_id like '%' #{keyWord} '%' or rr3.user_name like '%' #{keyWord} '%' or rr3.user_phone like
                 '%' #{keyWord} '%')
@@ -274,7 +274,7 @@
         rdv.is_lose_efficacy = 0
         and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
         <where>
-            and rr4.maintenance_state = 2 and rr4.deleted = 0
+            and rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.is_duty = 0
             <if test="keyWord != null and keyWord != ''">
                 and (rr4.area_id like '%' #{keyWord} '%' or rr4.user_name like '%' #{keyWord} '%' or rr4.user_phone like
                 '%' #{keyWord} '%')
@@ -350,13 +350,13 @@
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
         rdr.is_lose_efficacy = 0
         and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
+        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.school_id = #{schoolId}
         UNION ALL
         select rr4.* from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0
         and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count,
+        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.school_id = #{schoolId}) c) as timeout_count,
         (select Count(*) from repair_record rr8
         where rr8.deleted = 0 and rr8.school_id = #{schoolId} and rr8.maintenance_state = 9) as closed_count
     </select>
@@ -414,14 +414,14 @@
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and rdr.is_lose_efficacy = 0
         and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
-        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
+        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.school_id = #{schoolId}
         UNION ALL
         select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr4.id,rr4.record_no,rr4.report_time,rr4.user_name,rr4.user_phone,rr4.area_id as area_name,rr4.address,rat.name as article_name ,rr4.description,rr4.image,'已超时' as state from repair_record rr4
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
         rdv.is_lose_efficacy = 0
         and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
-        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) t
+        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.school_id = #{schoolId}) t
         order by t.report_time desc
     </select>
 

+ 25 - 0
src/main/resources/mapper/repair/RepairUserMapper.xml

@@ -125,5 +125,30 @@
         </where>
     </select>
 
+    <resultMap type="com.repair.model.vo.AutoDispatchUserVo" id="AutoDispatchUserMap">
+        <result property="id" column="id"/>
+        <result property="rdrCount" column="rdr_count"/>
+        <result property="buildId" column="build_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userPhone" column="user_phone"/>
+        <result property="acceptanceTime" column="acceptance_assess_time"/>
+        <result property="maintenanceTime" column="maintenance_assess_time"/>
+        <result property="startDate" column="start_date"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="articleId" column="article_id"/>
+    </resultMap>
+
+    <select id="autoDispatchUser" resultType="com.repair.model.vo.AutoDispatchUserVo" resultMap="AutoDispatchUserMap">
+        select * from (
+        select count(rdr.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
+        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and start_date = #{dateNow}
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.assigned_time like '%' ${dateNow} '%' and rdr.users_id = ru.id
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+        order by t.rdr_count
+    </select>
+
+
 
 </mapper>

+ 0 - 72
target/classes/META-INF/spring-configuration-metadata.json

@@ -1,72 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "openid",
-      "type": "com.repair.config.WxOpenidConfig",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "tencentcloud",
-      "type": "com.repair.config.SmsConfig",
-      "sourceType": "com.repair.config.SmsConfig"
-    }
-  ],
-  "properties": [
-    {
-      "name": "openid.appid",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.appkey",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.granttype",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ipconfig",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ocode",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "tencentcloud.sdk-appid",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-i-d",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-key",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.sign-name",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.sms-min",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.template-id",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    }
-  ],
-  "hints": []
-}

File diff suppressed because it is too large
+ 0 - 69
target/classes/application-dev.yml


File diff suppressed because it is too large
+ 0 - 70
target/classes/application-prod.yml


File diff suppressed because it is too large
+ 0 - 67
target/classes/application.yml


BIN
target/classes/excelFile/耗材管理模板.xlsx


BIN
target/classes/excelFile/自定义排班模板.xls


BIN
target/classes/excelFile/自定义排班模板.xlsx


+ 0 - 5
target/classes/mapper/repair/RepairAdminMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairAdminMapper">
-
-</mapper>

+ 0 - 14
target/classes/mapper/repair/RepairAreaMapper.xml

@@ -1,14 +0,0 @@
-<?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.RepairAreaMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairSchoolVo" id="repairSchoolMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryRepairSchools" resultMap="repairSchoolMap">
-        select id,name from repair_area where parent_id = 0 and deleted = 0
-    </select>
-
-</mapper>

+ 0 - 36
target/classes/mapper/repair/RepairArticleTypeMapper.xml

@@ -1,36 +0,0 @@
-<?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.RepairArticleTypeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairArticleTypeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryArticleTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairArticleTypeMap">
-       select id,name from repair_article_type
-        <where>
-            and deleted = 0 and parent_id = 0
-            <if test="schoolId != null and schoolId != ''">
-                and school_id = #{schoolId}
-            </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>

+ 0 - 33
target/classes/mapper/repair/RepairClassesSettingsMapper.xml

@@ -1,33 +0,0 @@
-<?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.RepairClassesSettingsMapper">
-
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
-        <result property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="startDate" column="start_date"/>
-        <result property="shiftId" column="shift_id"/>
-        <result property="shiftName" column="shift_name"/>
-        <result property="shiftColor" column="shift_color"/>
-    </resultMap>
-
-    <select id="queryClassesSettingList" resultType="com.repair.model.vo.ClassesSettingVo" resultMap="repairClassesListMap">
-        SELECT rcs.id,rcs.user_id,rcs.start_date,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
-        ,(select GROUP_CONCAT(color) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_color
-        FROM repair_classes_settings rcs
-        <where>
-            and rcs.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.start_date BETWEEN #{startTime} and #{endTime}
-            </if>
-            <if test="userIds != null and userIds.size() > 0">
-                and rcs.user_id in
-                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
-                    ${userId}
-                </foreach>
-            </if>
-        </where>
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairCloseMapper.xml

@@ -1,5 +0,0 @@
-<?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>

+ 0 - 36
target/classes/mapper/repair/RepairCollaborateRecordMapper.xml

@@ -1,36 +0,0 @@
-<?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.RepairCollaborateRecordMapper">
-
-    <resultMap type="com.repair.model.vo.CollaborateRecordVo" id="repairCollaborateRecordMap">
-        <result property="id" column="id"/>
-        <result property="recordId" column="record_id"/>
-        <result property="state" column="state"/>
-    </resultMap>
-
-    <select id="queryCollaborateRecordList" resultType="com.repair.model.vo.CollaborateRecordVo" resultMap="repairCollaborateRecordMap">
-        select id,record_id,'转单' as state from repair_transfer_record
-        <where>
-            and deleted = 0 and approval_statu = 2
-            <if test="recordIds != null and recordIds.size() > 0">
-                and record_id in
-                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
-                    ${recordId}
-                </foreach>
-            </if>
-        </where>
-        UNION ALL
-        select id,record_id,'协作' as state from repair_collaborate_record
-        <where>
-            and deleted = 0 and approval_statu = 2
-            <if test="recordIds != null and recordIds.size() > 0">
-                and record_id in
-                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
-                    ${recordId}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-
-</mapper>

+ 0 - 62
target/classes/mapper/repair/RepairConsumablesMapper.xml

@@ -1,62 +0,0 @@
-<?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.RepairConsumablesMapper">
-
-    <resultMap type="com.repair.model.vo.ConsumablePageVo" id="repairConsumablePageMap">
-        <result property="id" column="id"/>
-        <result property="consumeName" column="consume_name"/>
-        <result property="price" column="price"/>
-        <result property="number" column="number"/>
-        <result property="totalPrice" column="total_price"/>
-        <result property="articleName" column="article_name"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumablePageList" resultType="com.repair.model.vo.ConsumablePageVo" resultMap="repairConsumablePageMap">
-        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
-        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
-        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
-        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
-        <where>
-            and rcs.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rr.report_time desc,rcs.update_time desc
-    </select>
-
-    <resultMap type="com.repair.model.vo.ConsumableExcelVo" id="repairConsumableExcelMap">
-        <result property="id" column="id"/>
-        <result property="consumeName" column="consume_name"/>
-        <result property="price" column="price"/>
-        <result property="number" column="number"/>
-        <result property="totalPrice" column="total_price"/>
-        <result property="articleName" column="article_name"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumableExcelList" resultType="com.repair.model.vo.ConsumableExcelVo" resultMap="repairConsumableExcelMap">
-        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
-        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
-        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
-        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
-        <where>
-            and rcs.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rr.report_time desc,rcs.update_time desc
-    </select>
-</mapper>

+ 0 - 79
target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -1,79 +0,0 @@
-<?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.RepairConsumeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.ConsumeVo" id="repairConsumeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="price" column="price"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="artileName" column="artile_name"/>
-        <result property="entryName" column="entry_name"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumeList" resultType="com.repair.model.vo.ConsumeVo" resultMap="repairConsumeMap">
-       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted) as artile_name FROM `repair_consume` rc
-        left join repair_admin ra on ra.id = rc.update_user and ra.deleted = 0
-        left join repair_area rae on rae.id = rc.school_id and rae.deleted = 0
-        <where>
-            and rc.deleted = 0
-            <if test="name != null and name != ''">
-                and rc.name like '%' #{name} '%'
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rc.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairConsumeVo" id="repairConsumePageMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="content" column="content"/>
-        <result property="price" column="price"/>
-        <result property="articleId" column="article_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="articleName" column="article_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="schoolId" column="school_id"/>
-    </resultMap>
-
-    <select id="queryConsumePageList" resultType="com.repair.model.vo.RepairConsumeVo" resultMap="repairConsumePageMap">
-        select rc.school_id,rc.update_time,rc.id,rc.name,rc.content,rc.price,rc.article_id,ra.username as user_name,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id)) as article_name from repair_consume rc
-        left join repair_admin ra on rc.update_user = ra.id and ra.deleted = 0
-        <where>
-            and rc.deleted = 0
-            <if test="name != null and name != ''">
-                and rc.name like '%' #{name} '%'
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rc.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </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>

+ 0 - 20
target/classes/mapper/repair/RepairDispatchRecordMapper.xml

@@ -1,20 +0,0 @@
-<?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.RepairDispatchRecordMapper">
-    <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
-        <result property="cardNumber" column="card_number"/>
-    </resultMap>
-
-    <select id="queryRepairCardNumber" resultType="com.repair.model.vo.RepairCardNumberVo" resultMap="repairCardNumberMap">
-        SELECT ru.card_number FROM repair_dispatch_record rdr
-        left join repair_user ru on ru.deleted = 0 and ru.id = rdr.users_id
-        <where>
-            and rdr.deleted = 0 and rdr.is_lose_efficacy = 0
-            <if test="recordId != null and recordId != ''">
-                and rdr.record_id = #{recordId}
-            </if>
-        </where>
-    </select>
-
-
-</mapper>

+ 0 - 34
target/classes/mapper/repair/RepairEvaluateMapper.xml

@@ -1,34 +0,0 @@
-<?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.RepairEvaluateMapper">
-
-    <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="description" column="description"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="maintenancerName" column="maintenancer_name"/>
-        <result property="star" column="star"/>
-        <result property="content" column="content"/>
-        <result property="createTime" column="create_time"/>
-    </resultMap>
-
-    <select id="queryEvaluatePageList" resultType="com.repair.model.vo.EvaluateVo" resultMap="repairEvaluatePageMap">
-        select
-        re.id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
-        from repair_evaluate re
-        left join repair_record rr on rr.id = re.record_id and rr.deleted = 0
-        <where>
-            and re.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rr.user_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and re.create_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by re.create_time desc
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairLeaveMessageMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairLeaveMessageMapper">
-
-</mapper>

+ 0 - 24
target/classes/mapper/repair/RepairNoticeSettingMapper.xml

@@ -1,24 +0,0 @@
-<?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.RepairNoticeSettingMapper">
-
-    <resultMap type="com.repair.model.vo.NoticePageVo" id="repairNoticePageMap">
-        <result property="id" column="id"/>
-        <result property="content" column="content"/>
-        <result property="userName" column="username"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isTop" column="is_top"/>
-    </resultMap>
-
-    <select id="queryNoticePageList" resultType="com.repair.model.vo.NoticePageVo" resultMap="repairNoticePageMap">
-        SELECT rns.id,rns.content,ra.username,rns.update_time,rns.is_top FROM repair_notice_setting rns
-        left join repair_admin ra on ra.id = rns.update_user and ra.deleted = 0
-        <where>
-            and rns.deleted =0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rns.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rns.update_time desc
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairPayRecordMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairPayRecordMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairReceivingMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairReceivingMapper">
-
-</mapper>

+ 0 - 436
target/classes/mapper/repair/RepairRecordMapper.xml

@@ -1,436 +0,0 @@
-<?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.RepairRecordMapper">
-
-    <resultMap type="com.repair.model.vo.RepairRecordCountVo" id="repairRecordCountMap">
-        <result property="Incomplete" column="Incomplete"/>
-        <result property="Confirmed" column="Confirmed"/>
-        <result property="Finished" column="Finished"/>
-    </resultMap>
-
-    <select id="queryRepairRecordCount" resultType="com.repair.model.vo.RepairRecordCountVo"
-            resultMap="repairRecordCountMap">
-        SELECT COUNT(IF(maintenance_state &lt; 7,1, NULL)) Incomplete,COUNT(IF(maintenance_state=4,1, NULL))
-        Confirmed,COUNT(IF(maintenance_state &gt;=7 ,1, NULL)) Finished FROM `repair_record`
-        <where>
-            and maintenance_state &lt;= 7 and deleted = 0
-            <if test="userId != null and userId != ''">
-                and user_id = #{userId}
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.MyRepairRecordVo" id="repairRecordOwnMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="dispatchTime" column="dispatch_time"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="areaName" column="area_name"/>
-        <result property="address" column="address"/>
-        <result property="articleName" column="article_name"/>
-        <result property="descript" column="description"/>
-        <result property="image" column="image"/>
-        <result property="stateId" column="state_id"/>
-        <result property="price" column="price"/>
-        <result property="maintenancerName" column="maintenancer_name"/>
-        <result property="maintenancerPhone" column="maintenancer_phone"/>
-        <result property="timeoutDispStr" column="timeout_disp_str"/>
-        <result property="timeoutReceStr" column="timeout_rece_str"/>
-    </resultMap>
-
-    <select id="queryMyRepairRecordList" resultType="com.repair.model.vo.MyRepairRecordVo"
-            resultMap="repairRecordOwnMap">
-        select
-        case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() when true then '超时未接'
-        else null end as timeout_disp_str,
-        case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() when true then '维修超时'
-        else null end as timeout_rece_str,
-        rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.dispatch_time,rr.user_name,rr.user_phone,rr.area_id
-        as area_name,rr.address,rr.description,rat.name as article_name,rr.image,rr.maintenance_state as state_id from
-        repair_record rr
-        left join repair_article_type rat on rat.id = rr.article_id
-        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
-        left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
-        <where>
-            and rr.deleted = 0
-            <if test="stateStr != null and stateStr != ''">
-                and rr.maintenance_state ${stateStr}
-            </if>
-            <if test="userId != null and userId != ''">
-                and rr.user_id = #{userId}
-            </if>
-        </where>
-        order by rr.report_time DESC
-    </select>
-
-    <resultMap type="com.repair.model.vo.MaintenanceTechnicianVo" id="repairRecordTechnicianMap">
-        <result property="receivingCount" column="receiving_count"/>
-        <result property="maintenanceCount" column="maintenance_count"/>
-        <result property="timeoutCount" column="timeout_count"/>
-        <result property="examineCount" column="examine_count"/>
-    </resultMap>
-
-    <select id="queryRepairTechnicianCount" resultType="com.repair.model.vo.MaintenanceTechnicianVo"
-            resultMap="repairRecordTechnicianMap">
-        select (select Count(*) from repair_record rr1
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr1.id and
-        rdr.is_lose_efficacy = 0
-        where rr1.maintenance_state = 1 and rr1.deleted = 0) as receiving_count ,(select Count(*) from repair_record rr2
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr2.id and
-        rdv.is_lose_efficacy = 0
-        where rr2.maintenance_state = 2 and rr2.deleted = 0) as maintenance_count,(select Count(*) as cs from (select rr3.*
-        from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0
-        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        where rr3.maintenance_state = 1 and rr3.deleted = 0
-        UNION ALL
-        select rr4.* from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
-        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        where rr4.maintenance_state = 2 and rr4.deleted = 0) c) as timeout_count,(select Count(*) as sh from (
-        select rr5.* from repair_record rr5
-        inner join repair_collaborate_record rcr on rcr.deleted = 0 and rcr.user_id = #{userId} and rcr.record_id = rr5.id and
-        rcr.approval_statu = 2
-        where rr5.maintenance_state = 6 and rr5.deleted = 0
-        UNION ALL
-        select rr.* from repair_record rr
-        inner join repair_transfer_record rtr on rtr.deleted = 0 and rtr.user_id = #{userId} and rtr.record_id = rr.id and
-        rtr.approval_statu = 2
-        where rr.maintenance_state = 5 and rr.deleted = 0) a) as examine_count
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairTechnicianVo" id="repairRecordTechnicianDataMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="areaName" column="area_name"/>
-        <result property="address" column="address"/>
-        <result property="articleName" column="article_name"/>
-        <result property="description" column="description"/>
-        <result property="image" column="image"/>
-        <result property="state" column="state"/>
-        <result property="timeoutStr" column="timeout_str"/>
-    </resultMap>
-
-    <!--待接单-->
-    <select id="queryPendingOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
-        from repair_record rr
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0
-        order by rr.report_time DESC
-    </select>
-
-    <!--维修中-->
-    <select id="queryRepairOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state
-        from repair_record rr
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 2 and rr.deleted = 0
-        order by rr.report_time DESC
-    </select>
-
-    <!--已超时-->
-    <select id="queryTimeoutOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        SELECT * FROM (
-        select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'待接单' as state from repair_record rr
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
-        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0
-        UNION ALL
-        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state from repair_record rr
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
-        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 2 and rr.deleted = 0) t
-        order by t.report_time desc
-    </select>
-
-    <!--待审核-->
-    <select id="queryExamineOrderList" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'协作审核' as state from repair_record rr
-        inner join repair_collaborate_record rcr on rcr.deleted = 0 and rcr.user_id = #{userId} and rcr.record_id = rr.id and rcr.approval_statu = 2
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 6 and rr.deleted = 0
-        UNION ALL
-        select rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'转单审核' as state  from repair_record rr
-        inner join repair_transfer_record rtr on rtr.deleted = 0 and rtr.user_id = #{userId} and rtr.record_id = rr.id and rtr.approval_statu = 2
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 5 and rr.deleted = 0
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairManageCountVo" id="repairManageCountMap">
-        <result property="allCount" column="all_count"/>
-        <result property="dispatchCount" column="dispatch_count"/>
-        <result property="maintenanceCount" column="maintenance_count"/>
-        <result property="logisticsCount" column="logistics_count"/>
-        <result property="examineCount" column="examine_count"/>
-        <result property="finishedCount" column="finished_count"/>
-        <result property="canceledCount" column="canceled_count"/>
-        <result property="closedCount" column="closed_count"/>
-        <result property="timeoutCount" column="timeout_count"/>
-    </resultMap>
-
-    <select id="queryManageCount" resultType="com.repair.model.vo.RepairManageCountVo" resultMap="repairManageCountMap">
-        select
-        (select Count(*) from repair_record where deleted = 0) as all_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 1)  as dispatch_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 2)  as maintenance_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3)  as logistics_count,
-        (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)) as examine_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7)  as finished_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8)  as canceled_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9) as closed_count,
-        (select Count(*) as cs from (select rr3.* from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0 and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
-        where rr3.maintenance_state = 1 and rr3.deleted = 0
-        UNION ALL
-        select rr4.* from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0 and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
-        where rr4.maintenance_state = 2 and rr4.deleted = 0) c) as timeout_count
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="articleName" column="article_name"/>
-        <result property="description" column="description"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="maintenancerName" column="maintenancer_name"/>
-        <result property="details" column="details"/>
-        <result property="maintenanceState" column="maintenance_state"/>
-        <result property="userId" column="user_id"/>
-    </resultMap>
-
-    <!--除已超时外的其他数据获取方式-->
-    <select id="queryNotTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
-        article_name,
-        rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
-        from repair_record rr
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        <where>
-            and rr.deleted = 0
-            <if test="stateStr != null and stateStr != ''">
-                and (rr.maintenance_state ${stateStr}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like
-                '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rr.report_time desc
-    </select>
-
-    <!--#已超时获取方式-->
-    <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        SELECT * FROM (
-        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
-        area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
-        rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
-        from repair_record rr3
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0
-        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
-        <where>
-            and rr3.maintenance_state = 1 and rr3.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rr3.area_id like '%' #{keyWord} '%' or rr3.user_name like '%' #{keyWord} '%' or rr3.user_phone like
-                '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr3.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        UNION ALL
-        select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
-        area_name,rr4.user_name,rr4.user_phone,rat.name as
-        article_name,
-        rr4.description,rr4.report_time,rr4.maintenancer_name,rr4.maintenance_state
-        from repair_record rr4
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
-        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
-        <where>
-            and rr4.maintenance_state = 2 and rr4.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rr4.area_id like '%' #{keyWord} '%' or rr4.user_name like '%' #{keyWord} '%' or rr4.user_phone like
-                '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr4.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) t
-        order by t.report_time desc
-    </select>
-
-
-    <!--#获取待处理池数据-->
-    <resultMap type="com.repair.model.vo.pendingOrderVo" id="repairPendingOrderMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="areaName" column="area_name"/>
-        <result property="address" column="address"/>
-        <result property="articleName" column="article_name"/>
-        <result property="description" column="description"/>
-        <result property="image" column="image"/>
-        <result property="state" column="state"/>
-    </resultMap>
-
-    <select id="queryPendingOrder" resultType="com.repair.model.vo.pendingOrderVo" resultMap="repairPendingOrderMap">
-        select * from (select (select Count(*) from repair_dispatch_record where is_lose_efficacy = 0 and record_id = rr.id and users_id = #{userId}) as disp_count,rr.id,rr.record_no,
-        rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
-        from repair_record rr
-        left join repair_article_type rat on rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0) t where t.disp_count &lt;= 0
-        order by t.report_time desc
-    </select>
-
-
-    <!--郭师傅维修 团队工单 头部数量-->
-    <resultMap type="com.repair.model.vo.TeamWorkCountVo" id="teamWorkOrderMap">
-        <result property="examineCount" column="examine_count"/>
-        <result property="receivingCount" column="receiving_count"/>
-        <result property="maintenanceCount" column="maintenance_count"/>
-        <result property="finishedCount" column="finished_count"/>
-        <result property="timeoutCount" column="timeout_count"/>
-        <result property="closedCount" column="closed_count"/>
-    </resultMap>
-
-    <select id="queryTeamWorkCount" resultType="com.repair.model.vo.TeamWorkCountVo" resultMap="teamWorkOrderMap">
-        select
-        (select Count(*) as sh from (
-        select rr5.* from repair_record rr5
-        inner join repair_collaborate_record rcr on rcr.deleted = 0 and rcr.record_id = rr5.id and
-        rcr.approval_statu = 2
-        where rr5.maintenance_state = 6 and rr5.school_id = #{schoolId} and rr5.deleted = 0
-        UNION ALL
-        select rr.* from repair_record rr
-        inner join repair_transfer_record rtr on rtr.deleted = 0 and rtr.record_id = rr.id and
-        rtr.approval_statu = 2
-        where rr.maintenance_state = 5 and rr.school_id = #{schoolId} and rr.deleted = 0) a) as examine_count,
-        (select Count(*) from repair_record rr1
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr1.id and
-        rdr.is_lose_efficacy = 0
-        where rr1.maintenance_state = 1 and rr1.school_id = #{schoolId} and rr1.deleted = 0) as receiving_count,
-        (select Count(*) from repair_record rr2
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr2.id and
-        rdv.is_lose_efficacy = 0
-        where rr2.maintenance_state = 2 and rr2.school_id = #{schoolId} and rr2.deleted = 0) as maintenance_count,
-        (select Count(*) from repair_record rr7
-        where rr7.deleted = 0 and rr7.school_id = #{schoolId} and rr7.maintenance_state = 7) as finished_count,
-        (select Count(*) as cs from (select rr3.*
-        from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
-        rdr.is_lose_efficacy = 0
-        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
-        UNION ALL
-        select rr4.* from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
-        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count,
-        (select Count(*) from repair_record rr8
-        where rr8.deleted = 0 and rr8.school_id = #{schoolId} and rr8.maintenance_state = 9) as closed_count
-    </select>
-
-    <!--待审核-->
-    <select id="queryTeamWorkExamine" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select rr5.id,rr5.record_no,rr5.report_time,rr5.user_name,rr5.user_phone,rr5.area_id as area_name,rr5.address,rat.name as article_name ,rr5.description,rr5.image,'协作审核' as state from repair_record rr5
-        inner join repair_collaborate_record rcr on rcr.deleted = 0 and rcr.record_id = rr5.id and rcr.approval_statu = 2
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr5.article_id
-        where rr5.maintenance_state = 6 and rr5.school_id = #{schoolId} and rr5.deleted = 0
-        UNION ALL
-        select rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'转单审核' as state from repair_record rr
-        inner join repair_transfer_record rtr on rtr.deleted = 0 and rtr.record_id = rr.id and rtr.approval_statu = 2
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 5 and rr.school_id = #{schoolId} and rr.deleted = 0
-    </select>
-
-    <!--待接单-->
-    <select id="queryTeamWorkPending" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select  case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
-        from repair_record rr
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.school_id = #{schoolId} and rr.deleted = 0
-        order by rr.report_time DESC
-    </select>
-
-    <!--维修中-->
-    <select id="queryTeamWorkMaintenance" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'维修中' as state
-        from repair_record rr
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 2 and rr.school_id = #{schoolId} and rr.deleted = 0
-        order by rr.report_time DESC
-    </select>
-
-    <!--已完成-->
-    <select id="queryTeamWorkFinished" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'已完成' as state from repair_record rr
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 7
-        order by rr.report_time DESC
-    </select>
-
-    <!--已超时-->
-    <select id="queryTeamWorkTimeout" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        SELECT * FROM (
-        select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} when true then '超时未接' else null end as timeout_str,rr3.id,rr3.record_no,rr3.report_time,rr3.user_name,rr3.user_phone,rr3.area_id as area_name,rr3.address,rat.name as article_name ,rr3.description,rr3.image,'已超时' as state from repair_record rr3
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and rdr.is_lose_efficacy = 0
-        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
-        where rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.school_id = #{schoolId}
-        UNION ALL
-        select case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= #{dateNow} when true then '维修超时' else null end as timeout_str,rr4.id,rr4.record_no,rr4.report_time,rr4.user_name,rr4.user_phone,rr4.area_id as area_name,rr4.address,rat.name as article_name ,rr4.description,rr4.image,'已超时' as state from repair_record rr4
-        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
-        rdv.is_lose_efficacy = 0
-        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
-        where rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) t
-        order by t.report_time desc
-    </select>
-
-    <!--已关单-->
-    <select id="queryTeamWorkClosed" resultType="com.repair.model.vo.RepairTechnicianVo"
-            resultMap="repairRecordTechnicianDataMap">
-        select rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'已关单' as state from repair_record rr
-        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 9
-        order by rr.report_time DESC
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairRefundRecordMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairRefundRecordMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSchoolMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairSchoolMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairShiftSettingsMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairShiftSettingsMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSystemMessagesMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairSystemMessagesMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSystemSettingMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairSystemSettingMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairTrackRecordMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairTrackRecordMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairTransferRecordMapper.xml

@@ -1,5 +0,0 @@
-<?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.RepairTransferRecordMapper">
-
-</mapper>

+ 0 - 129
target/classes/mapper/repair/RepairUserMapper.xml

@@ -1,129 +0,0 @@
-<?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.RepairUserMapper">
-
-    <resultMap type="com.repair.model.vo.RepairUserVo" id="repairUserPageMap">
-        <result property="id" column="id"/>
-        <result property="cardNumber" column="card_number"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="teamId" column="team_id"/>
-        <result property="teamName" column="team_name"/>
-        <result property="schoolId" column="school_id"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="userZzid" column="user_zzid"/>
-        <result property="userZzname" column="user_zzname"/>
-        <result property="buildId" column="build_id"/>
-        <result property="buildName" column="build_name"/>
-        <result property="articleId" column="article_id"/>
-        <result property="articleName" column="article_name"/>
-        <result property="workType" column="work_type"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="acceptanceTime" column="acceptance_assess_time"/>
-        <result property="maintenanceTime" column="maintenance_assess_time"/>
-    </resultMap>
-
-    <select id="queryUserPageList" resultType="com.repair.model.vo.RepairUserVo" resultMap="repairUserPageMap">
-        select ru.card_number,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.article_id,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,ru.article_id)) as article_name,ru.user_name, ru.user_phone, ru.team_id, case ru.team_id when 0 then '校方人员' else '第三方人员' end as team_name, ru.school_id,ra.name as school_name,
-        ru.user_zzid,case ru.user_zzid when 3 then '后勤人员' else '维修师傅' end as user_zzname,ru.build_id,(select GROUP_CONCAT(name) from repair_area where find_in_set(id,ru.build_id)) as build_name,ru.work_type,rwt.name as work_type_name from repair_user ru
-        left join repair_area ra on ra.id = ru.school_id and ra.deleted = 0
-        left join repair_work_type rwt on rwt.id = ru.work_type and ra.deleted = 0
-        <where>
-            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2 or ru.user_zzid = 3)
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = ${schoolId}
-            </if>
-            <if test="teamId != null and teamId != ''">
-                and ru.team_id = ${teamId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairLogisticsVo" id="repairLogisticsMap">
-        <result property="id" column="id"/>
-    </resultMap>
-
-    <select id="queryLogisticsList" resultType="com.repair.model.vo.RepairLogisticsVo" resultMap="repairLogisticsMap">
-        select id from repair_user ru
-        where EXISTS (select id from repair_record where deleted = 0 and id = #{recordId} and school_id = ru.school_id)
-        and ru.user_zzid = 3 and ru.deleted = 0
-    </select>
-
-
-    <resultMap type="com.repair.model.vo.UserDataVo" id="userDataMap">
-        <result property="id" column="id"/>
-        <result property="state" column="state"/>
-        <result property="shiftId" column="shift_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="startDate" column="start_date"/>
-        <result property="articleId" column="article_id"/>
-        <result property="acceptanceAssessTime" column="acceptance_assess_time"/>
-        <result property="maintenanceAssessTime" column="maintenance_assess_time"/>
-    </resultMap>
-    <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
-        select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
-        left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and ( FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
-        where ru.id = #{userId} and ru.deleted = 0
-    </select>
-
-    <resultMap type="com.repair.model.vo.CollaboratorVo" id="collaboratorMap">
-        <result property="id" column="id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="state" column="state"/>
-    </resultMap>
-    <select id="queryCollaborator" resultType="com.repair.model.vo.CollaboratorVo" resultMap="collaboratorMap">
-        select ru.id,ru.user_name,ru.user_phone,rwt.name as work_type_name,ru.state
-        from repair_user ru
-        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
-        <where>
-            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
-            <if test="userId != null and userId != ''">
-                and ru.id != #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = #{schoolId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.AddressBookVo" id="addressBookMap">
-        <result property="id" column="id"/>
-        <result property="teamId" column="team_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="workType" column="work_type"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="state" column="state"/>
-        <result property="acceptanceTime" column="acceptance_assess_time"/>
-        <result property="maintenanceTime" column="maintenance_assess_time"/>
-    </resultMap>
-    <select id="queryAddressBook" resultType="com.repair.model.vo.AddressBookVo" resultMap="addressBookMap">
-        select ru.team_id,ru.id,ru.user_name,ru.user_phone,ru.work_type,rwt.name as work_type_name,ru.state,ru.state,ru.acceptance_assess_time,ru.maintenance_assess_time
-        from repair_user ru
-        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
-        <where>
-            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
-            <if test="userId != null and userId != ''">
-                and ru.id != #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = #{schoolId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
-            </if>
-        </where>
-    </select>
-
-
-</mapper>

+ 0 - 13
target/classes/mapper/repair/RepairWorkTypeMapper.xml

@@ -1,13 +0,0 @@
-<?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.RepairWorkTypeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairWorkTypeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryWorkTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairWorkTypeMap">
-       select id,name from repair_work_type where deleted = 0
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/WxAccessTokenMapper.xml

@@ -1,5 +0,0 @@
-<?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.WxAccessTokenMapper">
-
-</mapper>

+ 0 - 3
target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=repair_system
-groupId=com.repair
-version=0.0.1-SNAPSHOT

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

@@ -1,285 +0,0 @@
-com\repair\AutoCode.class
-com\repair\services\impl\RepairShiftSettingsServiceImpl.class
-com\repair\mapper\RepairPayRecordMapper.class
-com\repair\common\utils\AesUtils.class
-com\repair\api\RepairEvaluateControllerAPI.class
-com\repair\common\utils\ExcelExportUtil.class
-com\repair\core\JwtAuthenticationInterceptor.class
-com\repair\services\RepairCollaborateRecordService.class
-com\repair\api\LoginControllerAPI.class
-com\repair\mapper\RepairTrackRecordMapper.class
-com\repair\api\RepairTransferRecordControllerAPI.class
-com\repair\mapper\RepairEvaluateMapper.class
-com\repair\model\vo\MaintenanceTechnicianVo.class
-com\repair\MybatisPlusApplication.class
-com\repair\model\pojo\RepairCollaborateRecord.class
-com\repair\services\impl\RepairEvaluateServiceImpl.class
-com\repair\services\RepairConsumeService.class
-com\repair\model\pojo\RepairClassesSettings.class
-com\repair\model\pojo\RepairConsume.class
-com\repair\api\RepairArticleTypeControllerAPI.class
-com\repair\model\vo\ConsumableExcelVo.class
-com\repair\model\pojo\RepairConsumables.class
-com\repair\model\vo\shiftSettingVo.class
-com\repair\mapper\RepairAdminMapper.class
-com\repair\mapper\RepairReceivingMapper.class
-com\repair\services\RepairRefundRecordService.class
-com\repair\model\request\insertRepairClassesRequest.class
-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\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
-com\repair\model\request\insertRepairConsumeRequest.class
-com\repair\model\vo\ConsumeVo.class
-com\repair\services\RepairNoticeSettingService.class
-com\repair\controller\RepairRecordController.class
-com\repair\api\RepairReceivingControllerAPI.class
-com\repair\core\CORSConfiguration.class
-com\repair\services\impl\RepairClassesSettingsServiceImpl.class
-com\repair\services\impl\RepairCollaborateRecordServiceImpl.class
-com\repair\controller\RepairClassesSettingsController.class
-com\repair\controller\RepairArticleTypeController.class
-com\repair\services\impl\WxAccessTokenServiceImpl.class
-com\repair\api\RepairPayRecordControllerAPI.class
-com\repair\model\result\BaseResult.class
-com\repair\model\request\repairRecordRequest.class
-com\repair\services\impl\RepairSystemMessagesServiceImpl.class
-com\repair\model\result\PageUtils.class
-com\repair\services\impl\RepairNoticeSettingServiceImpl.class
-com\repair\controller\WxAccessTokenController.class
-com\repair\model\vo\pendingOrderVo.class
-com\repair\model\pojo\UnitTimeHelpModel.class
-com\repair\services\impl\RepairDispatchRecordServiceImpl.class
-com\repair\common\utils\WxUtil$1.class
-com\repair\mapper\RepairSchoolMapper.class
-com\repair\model\vo\routeDataVo.class
-com\repair\model\enumModel\eStatu.class
-com\repair\services\RepairWorkTypeService.class
-com\repair\mapper\RepairConsumablesMapper.class
-com\repair\model\enumModel\eIsTop.class
-com\repair\model\enumModel\eUserZZ.class
-com\repair\services\impl\RepairWorkTypeServiceImpl.class
-com\repair\api\RepairClassesSettingsControllerAPI.class
-com\repair\model\vo\RepairClassesVo.class
-com\repair\model\pojo\RepairArea.class
-com\repair\model\vo\NoticePageVo.class
-com\repair\services\impl\RepairReceivingServiceImpl.class
-com\repair\model\request\insertRepairUserRequest.class
-com\repair\model\vo\RepairSchoolVo.class
-com\repair\model\vo\RepairConsumeVo.class
-com\repair\model\result\CommonResult.class
-com\repair\common\exception\EmsException.class
-com\repair\controller\RepairReceivingController.class
-com\repair\controller\RepairEvaluateController.class
-com\repair\services\impl\RepairConsumeServiceImpl.class
-com\repair\model\vo\ClassesSettingVo.class
-com\repair\controller\RepairRefundRecordController.class
-com\repair\model\request\insertRepairAssociationRequest.class
-com\repair\model\vo\RepairRecordPageVo.class
-com\repair\model\request\timeVo.class
-com\repair\controller\RepairConsumablesController.class
-com\repair\services\WxAccessTokenService.class
-com\repair\api\RepairShiftSettingsControllerAPI.class
-com\repair\model\pojo\RepairTransferRecord.class
-com\repair\common\utils\MyX509TrustManager.class
-com\repair\common\utils\ValidateCode.class
-com\repair\services\RepairDispatchRecordService.class
-com\repair\api\RepairNoticeSettingControllerAPI.class
-com\repair\controller\RepairDispatchRecordController.class
-com\repair\services\RepairClassesSettingsService.class
-com\repair\model\pojo\RepairEvaluate.class
-com\repair\services\RepairTrackRecordService.class
-com\repair\model\enumModel\eRecordStatu.class
-com\repair\model\vo\RepairLogisticsVo.class
-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
-com\repair\services\RepairRecordService.class
-com\repair\controller\RepairConsumeController.class
-com\repair\mapper\RepairLeaveMessageMapper.class
-com\repair\api\RepairCollaborateRecordControllerAPI.class
-com\repair\model\enumModel\eFileType.class
-com\repair\model\request\collaborateApplyRequest.class
-com\repair\model\pojo\RepairNoticeSetting.class
-com\repair\config\SmsConfig.class
-com\repair\services\RepairPayRecordService.class
-com\repair\common\utils\HttpsClient.class
-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
-com\repair\controller\LoginController$2.class
-com\repair\mapper\RepairAreaMapper.class
-com\repair\mapper\RepairNoticeSettingMapper.class
-com\repair\services\RepairShiftSettingsService.class
-com\repair\common\utils\WxUtil.class
-com\repair\model\vo\ClassesSettingPageVo.class
-com\repair\controller\RepairAreaController.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
-com\repair\model\vo\RepairAreaTreeVo.class
-com\repair\controller\LoginController$1.class
-com\repair\controller\RepairAdminController.class
-com\repair\core\SwaggerConfiguration.class
-com\repair\model\request\transferApplyRequest.class
-com\repair\services\RepairLeaveMessageService.class
-com\repair\mapper\RepairSystemSettingMapper.class
-com\repair\model\vo\NoticeVo.class
-com\repair\model\request\loginRequest.class
-com\repair\model\vo\UploadFileVo.class
-com\repair\api\RepairSystemSettingControllerAPI.class
-com\repair\mapper\RepairUserMapper.class
-com\repair\model\pojo\WxAccessToken.class
-com\repair\model\request\updateRepairAreaRequest.class
-com\repair\annotation\PassToken.class
-com\repair\config\MySecurity.class
-com\repair\model\enumModel\eUserStatu.class
-com\repair\api\RepairSystemMessagesControllerAPI.class
-com\repair\model\vo\RepairManageCountVo.class
-com\repair\common\utils\SendSms.class
-com\repair\controller\RepairWorkTypeController.class
-META-INF\spring-configuration-metadata.json
-com\repair\core\CORSConfiguration$1.class
-com\repair\model\pojo\RepairDispatchRecord.class
-com\repair\mapper\RepairShiftSettingsMapper.class
-com\repair\model\vo\wxLoginVo.class
-com\repair\controller\RepairPayRecordController.class
-com\repair\api\RepairDispatchRecordControllerAPI.class
-com\repair\mapper\RepairRecordMapper.class
-com\repair\model\request\updateRepairArticleTypeRequest.class
-com\repair\services\impl\RepairSchoolServiceImpl.class
-com\repair\model\request\queryAccountPageRequest.class
-com\repair\common\utils\paramUtils.class
-com\repair\services\impl\RepairRefundRecordServiceImpl.class
-com\repair\services\impl\RepairLeaveMessageServiceImpl.class
-com\repair\services\RepairReceivingService.class
-com\repair\api\RepairRecordControllerAPI.class
-com\repair\model\vo\EvaluateVo.class
-com\repair\mapper\RepairClassesSettingsMapper.class
-com\repair\model\request\insertConsumablesRequest.class
-com\repair\model\vo\ConsumablePageVo.class
-com\repair\common\utils\TimeExchange$1.class
-com\repair\model\request\updateRepairAdminRequest.class
-com\repair\model\request\updateUserDataRequest.class
-com\repair\controller\RepairCollaborateRecordController.class
-com\repair\controller\RepairLeaveMessageController.class
-com\repair\services\impl\RepairConsumablesServiceImpl.class
-com\repair\model\pojo\RepairWorkType.class
-com\repair\common\utils\CommonUtil.class
-com\repair\common\utils\DelayedUtils$2.class
-com\repair\api\RepairRefundRecordControllerAPI.class
-com\repair\aop\LoginCheckAspect.class
-com\repair\model\pojo\RepairTrackRecord.class
-com\repair\common\utils\EncryptionUtil.class
-com\repair\controller\LoginController.class
-com\repair\model\pojo\RepairUser.class
-com\repair\common\utils\MimeTypeUtils.class
-com\repair\mapper\RepairArticleTypeMapper.class
-com\repair\services\impl\RepairRecordServiceImpl.class
-com\repair\model\pojo\RepairLeaveMessage.class
-com\repair\model\vo\RepairArticleTypeTreeVo.class
-com\repair\model\pojo\RepairSystemMessages.class
-com\repair\common\utils\DelayedUtils$1.class
-com\repair\mapper\RepairSystemMessagesMapper.class
-com\repair\model\vo\RepairArticleTypeTreeVo$RepairArticleTypeTreeVoBuilder.class
-com\repair\controller\RepairTrackRecordController.class
-com\repair\model\vo\RepairArticleChildVo.class
-com\repair\services\RepairSystemMessagesService.class
-com\repair\api\RepairConsumablesControllerAPI.class
-com\repair\mapper\RepairCloseMapper.class
-com\repair\model\vo\RepairArticleConsumeVo.class
-com\repair\config\WxOpenidConfig.class
-com\repair\common\utils\TimeExchange.class
-com\repair\controller\RepairTransferRecordController.class
-com\repair\model\enumModel\eTechnicianStatu.class
-com\repair\services\RepairArticleTypeService.class
-com\repair\model\enumModel\eIsSuper.class
-com\repair\api\RepairAreaControllerAPI.class
-com\repair\model\request\updateRepairClassesRequest.class
-com\repair\common\utils\JWTUtil.class
-com\repair\services\RepairUserService.class
-com\repair\model\pojo\RepairRefundRecord.class
-com\repair\model\vo\SystemMenuTreeVo$SystemMenuTreeVoBuilder.class
-com\repair\controller\RepairNoticeSettingController.class
-com\repair\controller\RepairSystemMessagesController.class
-com\repair\model\enumModel\eWeekStatu.class
-com\repair\services\impl\RepairTransferRecordServiceImpl.class
-com\repair\services\RepairSystemSettingService.class
-com\repair\model\pojo\RepairSystemSetting.class
-com\repair\mapper\WxAccessTokenMapper.class
-com\repair\model\vo\ClassSettingDateVo.class
-com\repair\model\vo\ClassesSettingPageDataVo.class
-com\repair\api\RepairLeaveMessageControllerAPI.class
-com\repair\api\RepairUserControllerAPI.class
-com\repair\config\MyBatisPlusConfig.class
-com\repair\mapper\RepairWorkTypeMapper.class
-com\repair\model\request\repairLeaveMessageRequest.class
-com\repair\services\impl\RepairAreaServiceImpl.class
-com\repair\services\impl\RepairPayRecordServiceImpl.class
-com\repair\model\request\updateRepairShiftRequest.class
-com\repair\model\vo\UserDataVo.class
-com\repair\services\RepairEvaluateService.class
-com\repair\controller\MaintenanceConsumeablesRequest.class
-com\repair\model\pojo\RepairShiftSettings.class
-com\repair\model\vo\RepairRecordCountVo.class
-com\repair\services\RepairTransferRecordService.class
-com\repair\common\utils\WxConstants.class
-com\repair\model\request\freezeRepairAdminRequest.class
-com\repair\core\JwtlnterceptorConfig.class
-com\repair\services\impl\RepairAdminServiceImpl.class
-com\repair\model\vo\RepairUserVo.class
-com\repair\model\vo\SystemMenuVo.class
-com\repair\mapper\RepairTransferRecordMapper.class
-com\repair\common\utils\smsUtil.class
-com\repair\annotation\UserLoginCheck.class
-com\repair\common\utils\DelayedUtils.class
-com\repair\controller\RepairUserController.class
-com\repair\model\request\updateRepairConsumeRequest.class
-com\repair\controller\RepairShiftSettingsController.class
-com\repair\api\RepairTrackRecordControllerAPI.class
-com\repair\common\utils\SHA1.class
-com\repair\api\RepairAdminControllerAPI.class
-com\repair\services\RepairAdminService.class
-com\repair\model\vo\MyRepairRecordVo.class
-com\repair\services\RepairSchoolService.class
-com\repair\annotation\ControllerIsShow.class
-com\repair\common\utils\RSAUtils.class
-com\repair\model\vo\SystemMenuVo$SystemMenuVoBuilder.class
-com\repair\common\exception\EmsExceptionHandler.class
-com\repair\services\RepairAreaService.class
-com\repair\model\vo\RepairAreaTreeVo$RepairAreaTreeVoBuilder.class
-com\repair\model\request\finishOrderRequest.class
-com\repair\services\impl\RepairUserServiceImpl.class
-com\repair\common\result\ResponseStatusEnum.class
-com\repair\services\impl\RepairTrackRecordServiceImpl.class
-com\repair\mapper\RepairCollaborateRecordMapper.class
-com\repair\model\pojo\RepairAdmin.class
-com\repair\mapper\RepairRefundRecordMapper.class
-com\repair\model\request\insertRepairShiftSettingRequest.class
-com\repair\services\RepairConsumablesService.class
-com\repair\model\request\changePasswordRequest.class
-com\repair\model\enumModel\eSchool.class
-com\repair\model\vo\CollaborateRecordVo.class
-com\repair\model\pojo\RepairReceiving.class
-com\repair\model\result\Wx_user.class

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

@@ -1,271 +0,0 @@
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairEvaluateController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eFileType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairPayRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCollaborateRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairWorkTypeMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairWorkType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRefundRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eSchool.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxConstants.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArea.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\aop\LoginCheckAspect.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\WxAccessTokenController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SendSms.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairReceivingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\PageUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTrackRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairCollaborateRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairNoticeSettingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eRecordStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MyRepairRecordVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemMessagesControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairArticleTypeMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\MybatisPlusApplication.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\WxOpenidConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumablesControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\smsUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\CommonUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairConsumeRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairDispatchRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\changePasswordRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateRecordVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairWorkTypeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairNoticeSettingControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumeControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SHA1.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairWorkTypeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAreaService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairArticleTypeRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemMessagesMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTrackRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassSettingDateVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairCardNumberVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\UnitTimeHelpModel.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\PassToken.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\JWTUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\AesUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairDispatchRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRefundRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumablesMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairUserControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairLeaveMessageService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\EvaluateVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairWorkTypeController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairConsumeRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertConsumablesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\WxAccessTokenServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairNoticeSettingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\SmsConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairLogisticsVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairUserController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WeiXiaoUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemSettingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairPayRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairLeaveMessage.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\Code.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\shiftSettingVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\ControllerIsShow.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairLeaveMessageController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\wxLoginVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemSettingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairShiftSettingsServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumeService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\pendingOrderVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumablePageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumablesController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\ResponseStatusEnum.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MaintenanceTechnicianVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRefundRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairLeaveMessageRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairReceivingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemSettingControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArticleType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumablesService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MimeTypeUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eTechnicianStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairReceiving.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAreaControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\WxAccessTokenService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSchoolControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSchoolController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAdminService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairPayRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairClassesSettingsService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairUser.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\EncryptionUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferApplyRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairShiftSettingsControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCollaborateRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairArticleTypeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairArticleTypeService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairShiftSettingRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTransferRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairShiftSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsumables.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\StrUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairDispatchRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemMessages.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRefundRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSchoolMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairWorkTypeControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\LoginController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairNoticeSettingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairEvaluateControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumeMapper.java
-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\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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTransferRecordServiceImpl.java
-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\model\pojo\WxAccessToken.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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsSuper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairUserRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRefundRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairClassesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClassesSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairNoticeSettingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\CommonResult.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserDataVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairClassesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTrackRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eWeekStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairManageCountVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSchool.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\timeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumablesServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAdminRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\LoginControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsume.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairUserVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelExportUtil.java
-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\model\request\collaborateApplyRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairNoticeSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAdminController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAreaServiceImpl.java
-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\common\utils\HttpsClient.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleChildVo.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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handle\NonStaticResourceHttpRequestHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairClassesVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MyX509TrustManager.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairDispatchRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairReceivingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTrackRecordMapper.java
-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\model\request\insertRepairAssociationRequest.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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairEvaluate.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairShiftSettingsService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumeController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageDataVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAreaController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairAdmin.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\RSAUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\MyCustomException.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairUserMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairUserServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\LoginVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairTechnicianVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairArticleTypeController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtlnterceptorConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\TimeExchange.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairUserService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsExceptionHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\SwaggerConfiguration.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumableExcelVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairClassesSettingsController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\finishOrderRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsTop.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAdminMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\loginRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\Wx_user.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairReceivingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handler\MyMetaObjectHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DelayedUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserZZ.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAreaMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairEvaluateService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MyBatisPlusConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairClassesSettingsControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairLeaveMessageMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairShiftRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemMessagesController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTransferRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTransferRecordController.java
-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\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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemSettingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemSettingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAdminServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairDispatchRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTypeTreeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCollaborateRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\WxAccessTokenMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAdminControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\queryAccountPageRequest.java
-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

+ 0 - 2
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,2 +0,0 @@
-com\repair\MybatisPlusApplicationTests.class
-com\repair\WrapperTest.class

+ 0 - 2
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,2 +0,0 @@
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\WrapperTest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\MybatisPlusApplicationTests.java

BIN
target/repair_system-0.0.1-SNAPSHOT.jar.original