添加工单维修师傅查询条件

.idea/workspace.xml

@@ -2,21 +2,28 @@
 <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/vo/RepairCampusRecordVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/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/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/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/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/model/vo/RepairCampusVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.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/services/impl/RepairConsumablesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairLeaveMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairLeaveMessageServiceImpl.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/RepairSystemMessagesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairRecordMapper.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/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -48,11 +55,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="2692" column="28" lean-forward="true" selection-start-line="2692" selection-start-column="28" selection-end-line="2692" selection-end-column="28" />
+            <state relative-caret-position="130">
+              <caret line="922" selection-start-line="922" selection-end-line="922" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -61,19 +68,73 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MySecurity.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>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="98">
-              <caret line="825" column="80" selection-start-line="825" selection-start-column="80" selection-end-line="825" selection-end-column="80" />
+            <state relative-caret-position="40">
+              <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/SmsConfig.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="295">
+              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="701">
+              <caret line="41" column="27" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/SwaggerConfiguration.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handle/NonStaticResourceHttpRequestHandler.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusRecordVo.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
+            <state relative-caret-position="138">
+              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1223">
+              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -90,39 +151,38 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>报修工单已</find>
-      <find>changeMaintenanceConsumables</find>
-      <find>queryDetailData</find>
-      <find>details</find>
-      <find>car</find>
-      <find>insertRepairAdmin</find>
-      <find>queryManagePage</find>
-      <find>queryNotTimeout</find>
-      <find>updateRepairUserSettingById</find>
-      <find>setDelayed</find>
-      <find>isEmpty</find>
-      <find>updateRepairUserById</find>
-      <find>queryConsumeMaterial</find>
-      <find>queryPageCollaborator</find>
+      <find>queryPageRepairClassesSettings</find>
+      <find>datas</find>
+      <find>MonthArrayTime</find>
+      <find>支付</find>
+      <find>Sim</find>
+      <find>pay</find>
+      <find>用户信息</find>
+      <find>queryMasterHomeCount</find>
+      <find>getTechnicianCountByUserId</find>
+      <find>queryRepairTechnicianCount</find>
+      <find>queryRepairOrderList</find>
+      <find>queryTimeoutOrderList</find>
+      <find>queryExamineOrderList</find>
+      <find>queryPendingOrderList</find>
+      <find>getTechniciansByUserId</find>
+      <find>closeOrder</find>
+      <find>weiXiaoUtil.sendNotice</find>
+      <find>openid&quot;</find>
       <find>queryCollaboratorUser</find>
-      <find>RepairCampusVo</find>
-      <find>schoolName</find>
-      <find>queryPositiveReviewPage</find>
-      <find>uploadFile</find>
-      <find>jcraft</find>
-      <find>repairCampusTotal</find>
-      <find>Session</find>
-      <find>new BigDecimal(</find>
-      <find>.compareTo(new BigDecimal(0)</find>
-      <find>new BigDecimal(0)</find>
-      <find>collec</find>
-      <find>isP</find>
-      <find>updateDispatch</find>
-      <find>transfer(</find>
-      <find>repairCampus</find>
+      <find>privateKey</find>
+      <find>queryPageCollaborator</find>
+      <find>技术员</find>
+      <find>queryNotTimeout</find>
+      <find>queryManagePage</find>
+      <find>queryManageCount</find>
+      <find>ru</find>
+      <find>as dispatch_count</find>
+      <find>.school_id,rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as</find>
+      <find>finish</find>
+      <find>rr.maintenance_name</find>
     </findStrings>
     <replaceStrings>
-      <replace>RepairConsume</replace>
       <replace>repairConsumables</replace>
       <replace>耗材记录</replace>
       <replace>RepairConsumables</replace>
@@ -152,6 +212,7 @@
       <replace>Close</replace>
       <replace>new RepairSystemMessages();</replace>
       <replace>new RepairSystemMessages();setIsRead(0);</replace>
+      <replace>维修师傅</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -160,17 +221,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/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairCollaborateRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCollaborateRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairDispatchRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairDispatchRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairNoticeSettingController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairPayRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
@@ -178,8 +228,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairReceivingController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairNoticeSettingMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" />
@@ -198,19 +246,32 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
         <option value="$PROJECT_DIR$/../../虹软人脸检测/facedemo/src/main/java/com/face/Controller/MemberHeadImageController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusVo.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusRecordVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairLeaveMessageServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.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/services/impl/RepairUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/ReportExportVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairRecordMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
       </list>
     </option>
   </component>
@@ -242,7 +303,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" />
@@ -311,6 +372,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
+              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -321,7 +391,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="result" type="462c0819:PsiDirectoryNode" />
+              <item name="exception" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
@@ -331,7 +401,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="result" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
@@ -340,7 +410,8 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
@@ -349,7 +420,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
@@ -358,7 +429,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
-              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_report" type="b2602c69:ProjectViewProjectNode" />
@@ -474,8 +545,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -607,9 +678,9 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.TimeExchange" />
         <item itemvalue="Application.AutoCode" />
         <item itemvalue="Application.StrUtils" />
-        <item itemvalue="Application.TimeExchange" />
         <item itemvalue="Application.DelayedUtils" />
         <item itemvalue="Application.RepairRecordController" />
       </list>
@@ -662,12 +733,17 @@
       <workItem from="1693211278627" duration="89000" />
       <workItem from="1693211400881" duration="1142000" />
       <workItem from="1693212744516" duration="92164000" />
-      <workItem from="1694067894180" duration="4673000" />
+      <workItem from="1694067894180" duration="8335000" />
+      <workItem from="1694154240313" duration="188000" />
+      <workItem from="1694155605252" duration="2798000" />
+      <workItem from="1694483448254" duration="3243000" />
+      <workItem from="1694575708078" duration="6153000" />
+      <workItem from="1694997999891" duration="19346000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1034134000" />
+    <option name="totallyTimeSpent" value="1069524000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -691,18 +767,18 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.27680525" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.3916849" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.80994475" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.2762431" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.5370166" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.80662984" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32932165" />
-      <window_info anchor="bottom" id="Spring" order="7" weight="0.32932165" />
+      <window_info anchor="bottom" id="Spring" order="7" weight="0.32603937" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32928178" />
       <window_info anchor="bottom" id="Docker" order="9" />
-      <window_info anchor="bottom" id="Messages" order="10" weight="0.29102844" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.28774616" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
       <window_info anchor="bottom" id="Database Changes" order="12" />
       <window_info anchor="bottom" id="Version Control" order="13" />
@@ -711,7 +787,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.7669584" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.7757112" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -809,12 +885,6 @@
           <option name="timeStamp" value="303" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
-          <line>642</line>
-          <properties />
-          <option name="timeStamp" value="335" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java</url>
           <line>74</line>
           <properties />
@@ -838,6 +908,24 @@
           <properties />
           <option name="timeStamp" value="357" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
+          <line>646</line>
+          <properties />
+          <option name="timeStamp" value="358" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
+          <line>433</line>
+          <properties />
+          <option name="timeStamp" value="361" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java</url>
+          <line>453</line>
+          <properties />
+          <option name="timeStamp" value="363" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -846,366 +934,366 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="545">
-          <caret line="56" column="63" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="24" column="37" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="37" />
+        <state relative-caret-position="1334">
+          <caret line="70" column="58" selection-start-line="70" selection-start-column="58" selection-end-line="70" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="204" selection-start-line="204" selection-end-line="204" />
+        <state relative-caret-position="2116">
+          <caret line="107" column="54" selection-start-line="107" selection-start-column="54" selection-end-line="107" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2047">
-          <caret line="112" column="7" selection-start-line="112" selection-start-column="7" selection-end-line="112" selection-end-column="7" />
+        <state relative-caret-position="1679">
+          <caret line="87" column="58" selection-start-line="87" selection-start-column="58" selection-end-line="87" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="22" column="37" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="37" />
+        <state relative-caret-position="207">
+          <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
         </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/RepairLeaveMessageServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="598">
-          <caret line="35" column="28" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="28" />
+        <state relative-caret-position="426">
+          <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="580">
-          <caret line="508" column="21" selection-start-line="508" selection-start-column="21" selection-end-line="508" selection-end-column="21" />
+        <state relative-caret-position="276">
+          <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassSettingDateVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="98" column="35" selection-start-line="98" selection-start-column="19" selection-end-line="98" selection-end-column="35" />
+        <state relative-caret-position="276">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DateUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/UnitTimeHelpModel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+        <state relative-caret-position="230">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairCloseController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="162" selection-start-line="162" selection-end-line="162" />
+        <state relative-caret-position="-326">
+          <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/java/com/repair/model/pojo/RepairConsume.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
         </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/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="463">
-          <caret line="54" column="53" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="53" />
+        <state relative-caret-position="-1265">
+          <caret line="50" column="13" selection-start-line="50" selection-start-column="13" selection-end-line="50" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2856">
-          <caret line="383" column="166" selection-start-line="383" selection-start-column="166" selection-end-line="383" selection-end-column="166" />
+        <state relative-caret-position="295">
+          <caret line="57" column="75" selection-start-line="57" selection-start-column="32" selection-end-line="57" selection-end-column="75" />
         </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/controller/RepairClassesSettingsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="541">
-          <caret line="302" column="86" selection-start-line="302" selection-start-column="63" selection-end-line="302" selection-end-column="86" />
+        <state relative-caret-position="318">
+          <caret line="352" column="9" lean-forward="true" selection-start-line="349" selection-start-column="8" selection-end-line="352" selection-end-column="9" />
         </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/RepairRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="194" column="88" selection-start-line="194" selection-start-column="88" selection-end-line="194" selection-end-column="88" />
+        <state relative-caret-position="355">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairReceivingServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemMessages.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
           <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="268" column="9" selection-start-line="268" selection-start-column="9" selection-end-line="268" selection-end-column="9" />
+        <state relative-caret-position="19">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.49/jsch-0.1.49.jar!/com/jcraft/jsch/JSch.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../虹软人脸检测/facedemo/src/main/java/com/face/Controller/MemberHeadImageController.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="253">
-          <caret line="13" column="20" lean-forward="true" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
+        <state relative-caret-position="633">
+          <caret line="37" column="51" selection-start-line="37" selection-start-column="51" selection-end-line="37" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/AutoCode.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/metadata/IPage.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="91">
-          <caret line="50" column="33" lean-forward="true" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="45" />
+        <state relative-caret-position="138">
+          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.49/jsch-0.1.49.jar!/com/jcraft/jsch/Session.class">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
+        <state relative-caret-position="108">
+          <caret line="166" column="84" selection-start-line="166" selection-start-column="84" selection-end-line="166" selection-end-column="84" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <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="4623">
-          <caret line="201" column="8" selection-start-line="201" selection-start-column="8" selection-end-line="205" selection-end-column="21" />
+        <state relative-caret-position="50">
+          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/StrUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+        <state relative-caret-position="141">
+          <caret line="35" selection-start-line="35" selection-end-line="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UploadFileVo.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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="209">
+          <caret line="213" selection-start-line="213" selection-end-line="213" />
         </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/controller/RepairUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
+        <state relative-caret-position="17">
+          <caret line="286" column="13" selection-start-line="286" selection-start-column="13" selection-end-line="286" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/CommonResult.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="483">
-          <caret line="32" column="93" selection-start-line="32" selection-start-column="93" selection-end-line="32" selection-end-column="93" />
+        <state relative-caret-position="117">
+          <caret line="207" column="25" selection-start-line="207" selection-start-column="25" selection-end-line="207" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/RSAUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+        <state relative-caret-position="295">
+          <caret line="125" column="41" selection-start-line="125" selection-start-column="41" selection-end-line="125" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1736">
-          <caret line="509" column="79" selection-start-line="509" selection-start-column="79" selection-end-line="509" selection-end-column="79" />
+        <state relative-caret-position="594">
+          <caret line="64" column="2" selection-start-line="64" selection-start-column="2" selection-end-line="65" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="334">
-          <caret line="128" column="29" selection-start-line="128" selection-start-column="15" selection-end-line="128" selection-end-column="29" />
+        <state relative-caret-position="631">
+          <caret line="67" column="2" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="631">
-          <caret line="45" column="7" selection-start-line="45" selection-start-column="4" selection-end-line="45" selection-end-column="7" />
+          <caret line="68" column="2" selection-start-line="68" selection-start-column="2" selection-end-line="68" selection-end-column="2" />
         </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/vo/ReportExportVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+        <state relative-caret-position="385">
+          <caret line="42" column="33" lean-forward="true" selection-start-line="42" selection-start-column="33" selection-end-line="42" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eSchool.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="41" column="33" selection-start-line="41" selection-start-column="25" selection-end-line="41" selection-end-column="33" />
+        <state relative-caret-position="-1334">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        <state relative-caret-position="223">
+          <caret line="47" column="189" selection-start-line="47" selection-start-column="189" selection-end-line="47" selection-end-column="189" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eTechnicianStatu.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="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="414">
+          <caret line="145" column="73" selection-start-line="145" selection-start-column="73" selection-end-line="145" selection-end-column="73" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eUserStatu.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="207">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        <state relative-caret-position="120">
+          <caret line="42" selection-start-line="42" selection-end-line="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eWeekStatu.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="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="17">
+          <caret line="74" column="169" selection-start-line="74" selection-start-column="154" selection-end-line="74" selection-end-column="169" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/MyCustomException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="207">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/ePayPageStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsExceptionHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+        <state relative-caret-position="63">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsTop.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="161">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/annotation/UserLoginCheck.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="253">
+          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eIsSuccess.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="115">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eFileType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/SwaggerConfiguration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="253">
+          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchType.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+        <state relative-caret-position="-1223">
+          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handle/NonStaticResourceHttpRequestHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="27" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="27" />
+        <state relative-caret-position="253">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eUserZZ.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <state relative-caret-position="138">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/exception/EmsExceptionHandler.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        <state relative-caret-position="701">
+          <caret line="41" column="27" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="27" />
         </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/config/SmsConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
-          <caret line="81" column="31" selection-start-line="81" selection-start-column="31" selection-end-line="81" selection-end-column="31" />
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="825" column="80" selection-start-line="825" selection-start-column="80" selection-end-line="825" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusRecordVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
+        <state relative-caret-position="184">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairCampusVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MySecurity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+        <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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="2692" column="28" lean-forward="true" selection-start-line="2692" selection-start-column="28" selection-end-line="2692" selection-end-column="28" />
+        <state relative-caret-position="130">
+          <caret line="922" selection-start-line="922" selection-end-line="922" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-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/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="40">
+          <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -46,7 +46,7 @@ public class AutoCode {
         gc.setDateType(DateType.ONLY_DATE);
         gc.setSwagger2(true);
         mpg.setGlobalConfig(gc);
-//2、设置数据源
+        //2、设置数据源
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl("jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");

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

@@ -72,11 +72,11 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/queryManageCount")
     @ApiOperation(value = "工单状态数量", notes = "工单状态数量", httpMethod = "GET")
-    CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime);
+    CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime, String maintenanceName);
 
     @GetMapping(value = "/queryManagePage")
     @ApiOperation(value = "工单管理工单数据", notes = "工单管理工单数据", httpMethod = "GET")
-    CommonResult queryManagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestHeader("user_head") String userhead, @RequestParam int state, String keyWord, String startTime, String endTime, Integer schoolId);
+    CommonResult queryManagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestHeader("user_head") String userhead, @RequestParam int state, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName);
 
     @GetMapping(value = "/queryPendingOrder")
     @ApiOperation(value = "待处理池分页数据", notes = "待处理池分页数据", httpMethod = "GET")

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

@@ -49,7 +49,7 @@ public interface RepairUserControllerAPI {
 
     @GetMapping(value = "/queryPageCollaborator")
     @ApiOperation(value = "获取协作审核下拉人员分页数据", notes = "获取协作审核下拉人员分页数据", httpMethod = "GET")
-    CommonResult queryPageCollaborator(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam Integer schoolId,@RequestParam Integer userId, String keyWord);
+    CommonResult queryPageCollaborator(Integer currentPage, Integer pageCount, @RequestParam Integer schoolId,@RequestParam Integer userId, String keyWord);
 
     @GetMapping(value = "/queryPositiveReviewPage")
     @ApiOperation(value = "工单完成排行榜分页数据", notes = "工单完成排行榜分页数据", httpMethod = "GET")

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

@@ -430,7 +430,7 @@ public class TimeExchange {
      * @return
      */
     public static int getMonthDays(String date, int month) {
-        int year = Integer.valueOf(date.substring(0, 3));
+        int year = Integer.valueOf(date.substring(0, 4));
         int[] arr = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
         int day = arr[month - 1];//天数对应=数组-1
         if (month == 2 && year % 4 == 0 && year % 100 != 0 || year % 400 == 0) {
@@ -450,6 +450,7 @@ public class TimeExchange {
     public static String[] getCurrentMonthTimeFrame(String DateStr) {
         Calendar c = Calendar.getInstance();//获取Calendar实例
         c.set(Calendar.YEAR, Integer.parseInt(DateStr.substring(0, 4)));
+        int sss = Integer.parseInt(DateStr.substring(5, 7));
         c.set(Calendar.MONTH, Integer.parseInt(DateStr.substring(5, 7).replace("-", "")) - 1);
 
         c.set(Calendar.DAY_OF_MONTH, 1);
@@ -640,6 +641,9 @@ public class TimeExchange {
     public static void main(String[] args) throws ParseException {
           Integer userId = 0;
           String ss = userId.toString();
+        int sss = getMonthDays("2023-09-13",7);
+
+        String[] result = getCurrentMonthTimeFrame("2023-09-13");
         System.out.println(ss);
     }
 }

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

@@ -303,7 +303,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             rtr.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             rtr.setContent("待确认");
             rtr.setUserId(senderId);
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("报价失败");
@@ -459,7 +459,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             repairTrackRecord.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
             repairTrackRecord.setContent("改价");
             repairTrackRecord.setUserId(senderId);
-            repairTrackRecord.setUserZzstr("技术员");
+            repairTrackRecord.setUserZzstr("维修师傅");
             int save = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
 
             if(save <= 0){

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

@@ -765,8 +765,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     public CommonResult getTechnicianCountByUserId(int userId) {
+        RepairUser user = repairUserService.getRepairById(userId);
+        if (user == null) {
+            return CommonResult.fail("用户信息失效，查询失败");
+        }
+
         String dateNow = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        MaintenanceTechnicianVo result = repairRecordService.queryRepairTechnicianCount(userId, dateNow);
+        MaintenanceTechnicianVo result = repairRecordService.queryRepairTechnicianCount(userId, dateNow, user.getSchoolId());
         return CommonResult.ok(result);
     }
 
@@ -786,23 +791,28 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     public CommonResult getTechniciansByUserId(int currentPage, int pageCount, int userId, int state) {
+        RepairUser user = repairUserService.getRepairById(userId);
+        if (user == null) {
+            return CommonResult.fail("用户信息失效，查询失败");
+        }
+
         PageUtils<RepairTechnicianVo> result = null;
         String dateNow = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         switch (state) {
             case 1://待接单
-                result = repairRecordService.queryPendingOrderList(currentPage, pageCount, userId, dateNow);
+                result = repairRecordService.queryPendingOrderList(currentPage, pageCount, userId, dateNow, user.getSchoolId());
                 break;
             case 2://维修中
-                result = repairRecordService.queryRepairOrderList(currentPage, pageCount, userId, dateNow);
+                result = repairRecordService.queryRepairOrderList(currentPage, pageCount, userId, dateNow, user.getSchoolId());
                 break;
             case 3://已超时
-                result = repairRecordService.queryTimeoutOrderList(currentPage, pageCount, userId, dateNow);
+                result = repairRecordService.queryTimeoutOrderList(currentPage, pageCount, userId, dateNow, user.getSchoolId());
                 for (RepairTechnicianVo re : result.getList()) {
                     re.setState(eRecordStatu.stringOf(re.getMaintenanceState()));
                 }
                 break;
             case 4://待审核
-                result = repairRecordService.queryExamineOrderList(currentPage, pageCount, userId);
+                result = repairRecordService.queryExamineOrderList(currentPage, pageCount, userId, user.getSchoolId());
                 break;
             default:
                 break;
@@ -893,7 +903,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime) {
+    public CommonResult queryManageCount(Integer schoolId, @RequestHeader("user_head") String userhead, String keyWord, String startTime, String endTime, String maintenanceName) {
         //String userID = AesUtils.decrypt(userhead);
         //RepairAdmin operateData = repairAdminService.getRepairById(userID);
         //if (operateData == null) {
@@ -911,7 +921,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
         }
 
-        RepairManageCountVo result = repairRecordService.queryManageCount(schoolId, keyWord, startTime, endTime);
+        RepairManageCountVo result = repairRecordService.queryManageCount(schoolId, keyWord, startTime, endTime, maintenanceName);
         return CommonResult.ok(result);
     }
 
@@ -938,7 +948,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryManagePage(int currentPage, int pageCount, @RequestHeader("user_head") String userhead, int state, String keyWord, String startTime, String endTime, Integer schoolId) {
+    public CommonResult queryManagePage(int currentPage, int pageCount, @RequestHeader("user_head") String userhead, int state, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -966,7 +976,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         String stateStr = null;
         switch (state) {
             case 0:
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     if (r.getMaintenanceState() == 1) {
                         r.setState("待接单");
@@ -997,7 +1007,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 1:
                 stateStr = "=1)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     //待接单才能关单
                     r.setState("待接单");
@@ -1009,7 +1019,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 2:
                 stateStr = "=2)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("维修中");
                     r.setDelayed(1);
@@ -1017,7 +1027,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 3:
                 stateStr = "=3)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("待处理");
                     r.setDelayed(1);
@@ -1025,7 +1035,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 4:
                 stateStr = "=5 or rr.maintenance_state = 6)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState(r.getMaintenanceState() == 5 ? "转单待审核" : "协作待审核");
                     r.setDelayed(1);
@@ -1033,27 +1043,27 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
             case 5:
                 stateStr = "=7)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已完成");
                 }
                 break;
             case 6:
                 stateStr = "=8)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已取消");
                 }
                 break;
             case 7:
                 stateStr = "=9)";
-                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId);
+                result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("已关单");
                 }
                 break;
             case 8:
-                PageUtils<RepairRecordTimeoutPageVo> timeoutResult = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime, schoolId);
+                PageUtils<RepairRecordTimeoutPageVo> timeoutResult = repairRecordService.queryTimeout(currentPage, pageCount, keyWord, startTime, endTime, schoolId, maintenanceName);
                 List<RepairRecordPageVo> pages = new ArrayList<>();
                 for (RepairRecordTimeoutPageVo r : timeoutResult.getList()) {
                     RepairRecordPageVo page = new RepairRecordPageVo();
@@ -1333,7 +1343,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
             rtr.setContent("已接单");
             rtr.setUserId(userId);
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("抢单失败！");
@@ -1527,7 +1537,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
             rtr.setContent("已接单");
             rtr.setUserId(userId);
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("接单失败");
@@ -1802,7 +1812,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 //将原有的派单记录数据置为失效
                 RepairDispatchRecord oldDispatchRecord = new RepairDispatchRecord();
                 oldDispatchRecord.setIsLoseEfficacy(eDispatchResult.Expired.getValue());
-                int updateDis = repairDispatchRecordService.updateDispatch(rr.getId(),oldDispatchRecord);
+                int updateDis = repairDispatchRecordService.updateDispatch(rr.getId(), oldDispatchRecord);
 
                 //同意
                 //添加派单记录
@@ -2583,7 +2593,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         headerRow.createCell(5).setCellValue("故障描述");
         headerRow.createCell(6).setCellValue("状态");
         headerRow.createCell(7).setCellValue("报修时间");
-        headerRow.createCell(8).setCellValue("技术员");
+        headerRow.createCell(8).setCellValue("维修师傅");
 
         for (int i = 0; i < result.size(); i++) {
             ReportExportVo reportExportVo = result.get(i);
@@ -2618,7 +2628,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     public CommonResult queryMasterHomeCount(int userId) {
-        MasterHomepageVo result = repairRecordService.queryMasterHomeCount(userId);
+        RepairUser user = repairUserService.getRepairById(userId);
+        if (user == null) {
+            return CommonResult.fail("用户信息失效，查询失败");
+        }
+
+        MasterHomepageVo result = repairRecordService.queryMasterHomeCount(userId, user.getSchoolId());
         return CommonResult.ok(result);
     }
 
@@ -3847,13 +3862,26 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord rtr = new RepairTrackRecord();
             rtr.setRecordId(recordId);
             rtr.setMaintenanceState(eRecordStatu.Closed.getValue());
-            rtr.setContent("订单关闭");
+            rtr.setContent(reason);
             rtr.setUserId(Integer.valueOf(userId));
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("关单失败");
             }
+
+            //查询用户的微校卡号
+            RepairUser user = repairUserService.getRepairById(recordData.getUserId());
+            if(user == null){
+                throw new Exception("关单失败");
+            }
+            List<String> cardNumber = new ArrayList<>();
+            cardNumber.add(user.getCardNumber());
+            String content = MessageFormat.format("【报修系统】报修用户，你好，工单{0}因{1}原因已被关单，谢谢！", recordData.getRecordNo(), reason);
+            CommonResult result = weiXiaoUtil.sendNotice(cardNumber, "报修工单关单", "关单", content, null);
+            if (!result.getCode().equals("200")) {
+                throw new Exception("关单失败！");
+            }
         } catch (Exception e) {
             throw new Exception("关单失败！");
         }
@@ -3925,13 +3953,25 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord rtr = new RepairTrackRecord();
             rtr.setRecordId(recordId);
             rtr.setMaintenanceState(eRecordStatu.Closed.getValue());
-            rtr.setContent("订单关闭");
+            rtr.setContent(reason);
             rtr.setUserId(Integer.valueOf(userId));
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
             if (insertRtr <= 0) {
                 throw new Exception("关单失败");
             }
+
+            RepairUser user = repairUserService.getRepairById(recordData.getUserId());
+            if(user == null){
+                throw new Exception("关单失败");
+            }
+            List<String> cardNumber = new ArrayList<>();
+            cardNumber.add(user.getCardNumber());
+            String content = MessageFormat.format("【报修系统】报修用户，你好，工单{0}因{1}原因已被关单，谢谢！", recordData.getRecordNo(), reason);
+            CommonResult result = weiXiaoUtil.sendNotice(cardNumber, "报修工单关单", "关单", content, null);
+            if (!result.getCode().equals("200")) {
+                throw new Exception("关单失败！");
+            }
         } catch (Exception e) {
             throw new Exception("关单失败！");
         }
@@ -4058,7 +4098,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setMaintenanceState(eRecordStatu.Finished.getValue());
             rtr.setContent("已完成");
             rtr.setUserId(senderId);
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             rtr.setImage(StringUtils.join(data.getImages(), ','));
             rtr.setVoice(data.getVoice());
             rtr.setVoiceLength(data.getVoiceLength());
@@ -4150,7 +4190,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtrR.setMaintenanceState(eRecordStatu.Transfer.getValue());
             rtrR.setContent("转单审核申请");
             rtrR.setUserId(data.getUserId());
-            rtrR.setUserZzstr("技术员");
+            rtrR.setUserZzstr("维修师傅");
             rtrR.setVoice(data.getVoice());
             rtrR.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtrR);
@@ -4250,7 +4290,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rtr.setMaintenanceState(eRecordStatu.Collaborate.getValue());
             rtr.setContent("协作审核申请");
             rtr.setUserId(data.getUserId());
-            rtr.setUserZzstr("技术员");
+            rtr.setUserZzstr("维修师傅");
             rtr.setVoice(data.getVoice());
             rtr.setVoiceLength(data.getVoiceLength());
             int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);

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

@@ -285,8 +285,14 @@ public class RepairUserController implements RepairUserControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryPageCollaborator(int currentPage, int pageCount, Integer schoolId, Integer userId,String keyWord) {
+    public CommonResult queryPageCollaborator(Integer currentPage, Integer pageCount, Integer schoolId, Integer userId,String keyWord) {
         String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        if(currentPage == null){
+            currentPage = 1;
+        }
+        if(pageCount == null){
+            pageCount = 100;
+        }
         PageUtils<RepairWorkTypeVo> result = repairUserService.queryCollaboratorUser(currentPage, pageCount, schoolId, userId, dateNow, keyWord);
         return CommonResult.ok(result);
     }

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

@@ -23,21 +23,21 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<MyRepairRecordVo> queryMyRepairRecordList(IPage<MyRepairRecordVo> page, @Param("stateStr") String stateStr, @Param("userId") Integer userId);
 
-    MaintenanceTechnicianVo queryRepairTechnicianCount(@Param("userId") Integer userId, @Param("dateNow") String dateNow);
+    MaintenanceTechnicianVo queryRepairTechnicianCount(@Param("userId") Integer userId, @Param("dateNow") String dateNow, @Param("schoolId") Integer schoolId);
 
-    IPage<RepairTechnicianVo> queryPendingOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow);
+    IPage<RepairTechnicianVo> queryPendingOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow, @Param("schoolId") Integer schoolId);
 
-    IPage<RepairTechnicianVo> queryRepairOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow);
+    IPage<RepairTechnicianVo> queryRepairOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow, @Param("schoolId") Integer schoolId);
 
-    IPage<RepairTechnicianVo> queryTimeoutOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow);
+    IPage<RepairTechnicianVo> queryTimeoutOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("dateNow") String dateNow, @Param("schoolId") Integer schoolId);
 
-    IPage<RepairTechnicianVo> queryExamineOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId);
+    IPage<RepairTechnicianVo> queryExamineOrderList(IPage<RepairTechnicianVo> page, @Param("userId") Integer userId, @Param("schoolId") Integer schoolId);
 
-    RepairManageCountVo queryManageCount(@Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    RepairManageCountVo queryManageCount(@Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("maintenanceName") String maintenanceName);
 
-    IPage<RepairRecordPageVo> queryNotTimeout(IPage<RepairRecordPageVo> page, @Param("stateStr") String stateStr, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("schoolId") Integer schoolId);
+    IPage<RepairRecordPageVo> queryNotTimeout(IPage<RepairRecordPageVo> page, @Param("stateStr") String stateStr, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("schoolId") Integer schoolId, @Param("maintenanceName") String maintenanceName);
 
-    IPage<RepairRecordTimeoutPageVo> queryTimeout(IPage<RepairRecordTimeoutPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
+    IPage<RepairRecordTimeoutPageVo> queryTimeout(IPage<RepairRecordTimeoutPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId, @Param("maintenanceName") String maintenanceName);
 
     IPage<pendingOrderVo> queryPendingOrder(IPage<pendingOrderVo> page, @Param("schoolId") Integer schoolId);
 
@@ -61,7 +61,7 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 
-    MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
+    MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId, @Param("schoolId") Integer schoolId);
 
     MasterHomepageVo queryLogisticHomeCount(@Param("schoolId") Integer schoolId);
 

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

@@ -94,7 +94,7 @@ public class RepairRecordPageVo {
     private String rdvName;
 
     /**
-     * 技术员
+     * 维修师傅
      */
     private String maintenancerName;
 

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

@@ -76,7 +76,7 @@ public class RepairRecordTimeoutPageVo {
      */
     private Date reportTime;
     /**
-     * 技术员
+     * 维修师傅
      */
     private String maintenancerName;
 

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

@@ -53,7 +53,7 @@ public class ReportExportVo {
     private Date reportTime;
 
     /**
-     * 技术员
+     * 维修师傅
      */
     private String maintenancerName;
 }

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

@@ -33,21 +33,21 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     PageUtils<MyRepairRecordVo> queryMyRepairRecordList(int currentPage, int pageCount, Integer state, Integer userId);
 
-    MaintenanceTechnicianVo queryRepairTechnicianCount(Integer userId, String dateNow);
+    MaintenanceTechnicianVo queryRepairTechnicianCount(Integer userId, String dateNow, Integer schoolId);
 
-    PageUtils<RepairTechnicianVo> queryPendingOrderList(int currentPage, int pageCount, Integer userId, String dateNow);
+    PageUtils<RepairTechnicianVo> queryPendingOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId);
 
-    PageUtils<RepairTechnicianVo> queryRepairOrderList(int currentPage, int pageCount, Integer userId, String dateNow);
+    PageUtils<RepairTechnicianVo> queryRepairOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId);
 
-    PageUtils<RepairTechnicianVo> queryTimeoutOrderList(int currentPage, int pageCount, Integer userId, String dateNow);
+    PageUtils<RepairTechnicianVo> queryTimeoutOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId);
 
-    PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId);
+    PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId, Integer schoolId);
 
-    RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime);
+    RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime, String maintenanceName);
 
-    PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
+    PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName);
 
-    PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
+    PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName);
 
     PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount, int schoolId);
 
@@ -73,21 +73,21 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 
-    MasterHomepageVo queryMasterHomeCount(Integer userId);
+    MasterHomepageVo queryMasterHomeCount(Integer userId, Integer schoolId);
 
     MasterHomepageVo queryLogisticHomeCount(Integer schoolId);
 
-	List<RepairCampusRecordVo> repairCampusTotal();
+    List<RepairCampusRecordVo> repairCampusTotal();
 
     List<RepairCampusRecordVo> repairCampus(String startTime, String endTime);
 
     IPage<RepairAreaVo> repairAreaTotal(int currentPage, int pageCount);
 
-    IPage<RepairAreaVo> repairArea(String startTime, String endTime,int currentPage, int pageCount);
+    IPage<RepairAreaVo> repairArea(String startTime, String endTime, int currentPage, int pageCount);
 
     IPage<MaintenanceGoodsVo> maintenanceGoodsTotal(int currentPage, int pageCount);
 
-    IPage<MaintenanceGoodsVo> maintenanceGoods(String startTime, String endTime,int currentPage, int pageCount);
+    IPage<MaintenanceGoodsVo> maintenanceGoods(String startTime, String endTime, int currentPage, int pageCount);
 
     List<RepairAreaVo> repairAreaExport(String startTime, String endTime);
 

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

@@ -102,7 +102,7 @@ public class RepairConsumablesServiceImpl extends ServiceImpl<RepairConsumablesM
 
     @Override
     public boolean insertConsumableBatch(List<RepairConsumables> rns) {
-        boolean result = this.saveBatch(rns);
+        boolean result = this.saveBatch(rns, rns.size());
         return result;
     }
 

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

@@ -105,7 +105,7 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
 
     @Override
     public boolean insertDispatchBatch(List<RepairDispatchRecord> rdr) {
-        boolean result = this.saveBatch(rdr);
+        boolean result = this.saveBatch(rdr,rdr.size());
         return result;
     }
 

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

@@ -85,7 +85,7 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
 
     @Override
     public boolean inserBatchEvaluate(List<RepairEvaluate> datas) {
-        boolean result = this.saveBatch(datas);
+        boolean result = this.saveBatch(datas,datas.size());
         return result;
     }
 

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

@@ -67,7 +67,7 @@ public class RepairLeaveMessageServiceImpl extends ServiceImpl<RepairLeaveMessag
 
     @Override
     public boolean inserBatchLeaveMessage(List<RepairLeaveMessage> datas) {
-        boolean result = this.saveBatch(datas);
+        boolean result = this.saveBatch(datas, datas.size());
         return result;
     }
 

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

@@ -91,68 +91,68 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
-    public MaintenanceTechnicianVo queryRepairTechnicianCount(Integer userId, String dateNow) {
-        MaintenanceTechnicianVo result = repairRecordMapper.queryRepairTechnicianCount(userId, dateNow);
+    public MaintenanceTechnicianVo queryRepairTechnicianCount(Integer userId, String dateNow, Integer schoolId) {
+        MaintenanceTechnicianVo result = repairRecordMapper.queryRepairTechnicianCount(userId, dateNow, schoolId);
         return result;
     }
 
     @Override
-    public PageUtils<RepairTechnicianVo> queryPendingOrderList(int currentPage, int pageCount, Integer userId, String dateNow) {
+    public PageUtils<RepairTechnicianVo> queryPendingOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId) {
         Page<RepairTechnicianVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairTechnicianVo> result = repairRecordMapper.queryPendingOrderList(page, userId, dateNow);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryPendingOrderList(page, userId, dateNow, schoolId);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<RepairTechnicianVo> queryRepairOrderList(int currentPage, int pageCount, Integer userId, String dateNow) {
+    public PageUtils<RepairTechnicianVo> queryRepairOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId) {
         Page<RepairTechnicianVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairTechnicianVo> result = repairRecordMapper.queryRepairOrderList(page, userId, dateNow);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryRepairOrderList(page, userId, dateNow, schoolId);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<RepairTechnicianVo> queryTimeoutOrderList(int currentPage, int pageCount, Integer userId, String dateNow) {
+    public PageUtils<RepairTechnicianVo> queryTimeoutOrderList(int currentPage, int pageCount, Integer userId, String dateNow, Integer schoolId) {
         Page<RepairTechnicianVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairTechnicianVo> result = repairRecordMapper.queryTimeoutOrderList(page, userId, dateNow);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryTimeoutOrderList(page, userId, dateNow, schoolId);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId) {
+    public PageUtils<RepairTechnicianVo> queryExamineOrderList(int currentPage, int pageCount, Integer userId, Integer schoolId) {
         Page<RepairTechnicianVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairTechnicianVo> result = repairRecordMapper.queryExamineOrderList(page, userId);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryExamineOrderList(page, userId, schoolId);
         return new PageUtils(result);
     }
 
     @Override
-    public RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime) {
-        RepairManageCountVo result = repairRecordMapper.queryManageCount(schoolId, keyWord, startTime, endTime);
+    public RepairManageCountVo queryManageCount(Integer schoolId, String keyWord, String startTime, String endTime,String maintenanceName) {
+        RepairManageCountVo result = repairRecordMapper.queryManageCount(schoolId, keyWord, startTime, endTime,maintenanceName);
         return result;
     }
 
     @Override
-    public PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId) {
+    public PageUtils<RepairRecordPageVo> queryNotTimeout(int currentPage, int pageCount, String stateStr, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName) {
         Page<RepairRecordPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordPageVo> result = repairRecordMapper.queryNotTimeout(page, stateStr, keyWord, startTime, endTime, schoolId);
+        IPage<RepairRecordPageVo> result = repairRecordMapper.queryNotTimeout(page, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId) {
+    public PageUtils<RepairRecordTimeoutPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId, String maintenanceName) {
         Page<RepairRecordTimeoutPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordTimeoutPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime, schoolId);
+        IPage<RepairRecordTimeoutPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime, schoolId, maintenanceName);
         return new PageUtils(result);
     }
 
@@ -255,8 +255,8 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
-    public MasterHomepageVo queryMasterHomeCount(Integer userId) {
-        MasterHomepageVo result = repairRecordMapper.queryMasterHomeCount(userId);
+    public MasterHomepageVo queryMasterHomeCount(Integer userId, Integer schoolId) {
+        MasterHomepageVo result = repairRecordMapper.queryMasterHomeCount(userId, schoolId);
         return result;
     }
 

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

@@ -68,7 +68,7 @@ public class RepairSystemMessagesServiceImpl extends ServiceImpl<RepairSystemMes
 
     @Override
     public boolean inserBatchSystemMessage(List<RepairSystemMessages> datas) {
-        boolean result = this.saveBatch(datas);
+        boolean result = this.saveBatch(datas,datas.size());
         return result;
     }
 

src/main/resources/application-dev.yml

@@ -64,6 +64,9 @@ openid:
   ocode: 1015730314
   xappid: wxd6f090391d410534
   xsecret: a7e349716b116792d79c779bb7216153
+  shappid: 1653095601
+  shsecret: KReLfbAgGZKc3slfEW9Jnhn7RLKqyrGF
+
 
 # 项目公钥私钥
 my-security:

src/main/resources/application-prod.yml

@@ -65,6 +65,8 @@ openid:
   ocode: 1015730314
   xappid: wxd6f090391d410534
   xsecret: a7e349716b116792d79c779bb7216153
+  shappid: 1653095601
+  shsecret: KReLfbAgGZKc3slfEW9Jnhn7RLKqyrGF
 
 # 项目公钥私钥
 my-security:

src/main/resources/application.yml

@@ -62,6 +62,8 @@ openid:
   ocode: 1015730314
   xappid: wxd6f090391d410534
   xsecret: a7e349716b116792d79c779bb7216153
+  shappid: 1653095601
+  shsecret: KReLfbAgGZKc3slfEW9Jnhn7RLKqyrGF
 
 # 项目公钥私钥
 my-security:

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

@@ -85,30 +85,32 @@
             resultMap="repairRecordTechnicianMap">
         select (select Count(*) from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.receiving_time is null and rdr.users_id = #{userId}
-        where rr.deleted = 0 and rr.maintenance_state = 1) 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.*
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 1) 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.school_id = #{schoolId} 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) <= #{dateNow} and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) <= rdr.receiving_time)
-        where rr3.is_duty = 0 and rr3.maintenance_state <= 7 and rr3.deleted = 0
+        where rr3.is_duty = 0 and rr3.school_id = #{schoolId} and rr3.maintenance_state <= 7 and rr3.deleted = 0
         UNION
         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) <= #{dateNow} and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) <= rdv.finish_time)
-        where rr4.is_duty = 0 and rr4.maintenance_state <= 7 and rr4.deleted = 0) c) as timeout_count,(select Count(*) as sh from (
+        where rr4.is_duty = 0 and rr4.school_id = #{schoolId} and rr4.maintenance_state <= 7 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
+        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.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
+        where rr.maintenance_state = 5 and rr.school_id = #{schoolId} and rr.deleted = 0) a) as examine_count
     </select>
 
     <resultMap type="com.repair.model.vo.RepairTechnicianVo" id="repairRecordTechnicianDataMap">
@@ -143,7 +145,7 @@
         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 rdr.receiving_time is null
         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.deleted = 0 and rr.school_id = #{schoolId}
         order by rr.report_time DESC
     </select>
 
@@ -155,7 +157,7 @@
         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
+        where rr.maintenance_state = 2 and rr.deleted = 0 and rr.school_id = #{schoolId}
         order by rr.report_time DESC
     </select>
 
@@ -166,12 +168,12 @@
         select rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  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;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
-        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.school_id = #{schoolId} and rr.deleted = 0
         UNION
         select rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  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;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
-        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0) t
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.school_id = #{schoolId} and rr.deleted = 0) t
         left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = t.id and rdr.is_lose_efficacy = 0
         left join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = t.id and rdv.is_lose_efficacy = 0
         left join repair_article_type rat on rat.deleted = 0 and rat.id = t.article_id
@@ -185,12 +187,12 @@
         select rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price 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
+        where rr.maintenance_state = 6 and rr.deleted = 0 and rr.school_id = #{schoolId}
         UNION ALL
         select rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,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,rr.maintenancer_name,rr.maintenancer_phone,rr.price 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
+        where rr.maintenance_state = 5 and rr.deleted = 0 and rr.school_id = #{schoolId}
     </select>
 
     <resultMap type="com.repair.model.vo.RepairManageCountVo" id="repairManageCountMap">
@@ -206,7 +208,7 @@
 
     <select id="queryManageCount" resultType="com.repair.model.vo.RepairManageCountVo" resultMap="repairManageCountMap">
         select
-        (select Count(*) from repair_record rr
+        (select Count(*) from (select rdr.users_id from repair_record rr
         left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id
         and rr.maintenance_state = 1
         where rr.deleted = 0 and rr.maintenance_state = 1
@@ -220,8 +222,11 @@
         <if test="schoolId != null and schoolId != ''">
             and rr.school_id = #{schoolId}
         </if>
-        ) as dispatch_count,
-        (select Count(*) from repair_record rr
+        ) t
+        <if test="maintenanceName != null and maintenanceName != ''">
+        where t.users_id in (select id from repair_user where user_name like '%' #{maintenanceName} '%' and deleted = 0)
+        </if>) as dispatch_count,
+        (select Count(*) from (select rdv.user_id from repair_record rr
         left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and
         rr.maintenance_state = 2
         where rr.deleted = 0 and rr.maintenance_state = 2
@@ -235,17 +240,25 @@
         <if test="schoolId != null and schoolId != ''">
             and rr.school_id = #{schoolId}
         </if>
-        ) as maintenance_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 3
+        ) t
+        <if test="maintenanceName != null and maintenanceName != ''">
+            where t.user_id in (select id from repair_user where user_name like '%' #{maintenanceName} '%' and deleted = 0)
+        </if>) as maintenance_count,
+        (select Count(*) from repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id
+         <if test="maintenanceName != null and maintenanceName != ''">
+            and rdr.users_id in (select id from repair_user where user_name like '%' #{maintenanceName} '%' and deleted = 0)
+        </if>
+         where rr.deleted = 0 and rr.maintenance_state = 3
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
         ) as logistics_count,
         (select Count(*) from repair_record where deleted = 0 and (maintenance_state = 5 or maintenance_state = 6)
@@ -259,43 +272,60 @@
         <if test="schoolId != null and schoolId != ''">
             and school_id = #{schoolId}
         </if>
-        ) as examine_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7
+        <if test="maintenanceName != null and maintenanceName != ''">
+            and maintenancer_name like '%' #{maintenanceName}
+        </if>) as examine_count,
+        (select Count(*) from repair_record rr
+         where rr.deleted = 0 and rr.maintenance_state = 7
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
+        </if>
+        <if test="maintenanceName != null and maintenanceName != ''">
+            and rr.maintenancer_name like '%' #{maintenanceName}
         </if>
         ) as finished_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 8
+        (select Count(*) from repair_record rr
+         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id
+         <if test="maintenanceName != null and maintenanceName != ''">
+            and rdr.users_id in (select id from repair_user where user_name like '%' #{maintenanceName} '%' and deleted = 0)
+        </if>
+        where rr.deleted = 0 and rr.maintenance_state = 8
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
+        </if>
+        <if test="maintenanceName != null and maintenanceName != ''">
+            and rr.maintenancer_name like '%' #{maintenanceName} '%'
         </if>
         ) as canceled_count,
-        (select Count(*) from repair_record where deleted = 0 and maintenance_state = 9
+        (select Count(*) from repair_record rr
+         where rr.deleted = 0 and rr.maintenance_state = 9
         <if test="keyWord != null and keyWord != ''">
-            and (area_id like '%' #{keyWord} '%' or user_name like '%' #{keyWord} '%' or user_phone like '%' #{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 report_time between #{startTime} and #{endTime}
+            and rr.report_time between #{startTime} and #{endTime}
         </if>
         <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
+            and rr.school_id = #{schoolId}
         </if>
-        ) as closed_count,
+        <if test="maintenanceName != null and maintenanceName != ''">
+            and rr.maintenancer_name like '%' #{maintenanceName} '%'
+        </if>) as closed_count,
         (SELECT count(*) as cs FROM (
         select rdr.users_id as
         user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
@@ -336,7 +366,11 @@
         <if test="schoolId != null and schoolId != ''">
             and rr.school_id = #{schoolId}
         </if>
-        ) t) as timeout_count
+        ) t
+        <if test="maintenanceName != null and maintenanceName != ''">
+        where t.user_id in (select id from repair_user where user_name like '%' #{maintenanceName} '%' and deleted = 0)
+        </if>
+        ) as timeout_count
     </select>
 
     <!--管理端工单分页数据-->
@@ -359,7 +393,7 @@
 
     <!--除已超时外的其他数据获取方式-->
     <select id="queryNotTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        select rr.school_id,rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as
+        select * from (select rr.school_id,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,(select user_name from repair_user where
@@ -388,9 +422,12 @@
             </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
+        </if>
+        </where>) t
+        <if test="maintenanceName != null and maintenanceName != ''">
+            where t.maintenancer_name like '%' #{maintenanceName} '%' or t.rdvName like '%' #{maintenanceName} '%' or t.rdrName like '%' #{maintenanceName} '%'
+        </if>
+        order by t.report_time desc
     </select>
 
     <resultMap type="com.repair.model.vo.RepairRecordTimeoutPageVo" id="repairRecordTimeoutPageMap">
@@ -414,7 +451,7 @@
     <!--#已超时获取方式-->
     <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordTimeoutPageVo"
             resultMap="repairRecordTimeoutPageMap">
-        select t.school_id,t.user_id,t.details,t.id,t.record_no,t.area_name,t.user_name,t.user_phone,rat.name as
+        select * from (select t.school_id,t.user_id,t.details,t.id,t.record_no,t.area_name,t.user_name,t.user_phone,rat.name as
         article_name,t.description,t.report_time,t.maintenance_state,ru.user_name as maintenancer_name,ru.user_phone as
         maintenancer_phone,
         case ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
@@ -471,8 +508,11 @@
         left join repair_receiving rdv on rdv.user_id =t.user_id and rdv.deleted = 0 and rdv.record_id = t.id and
         rdv.is_lose_efficacy = 0
         left join repair_article_type rat on rat.deleted = 0 and rat.id = t.article_id
-        left join repair_user ru on ru.deleted = 0 and ru.id = t.user_id
-        order by t.report_time desc
+        left join repair_user ru on ru.deleted = 0 and ru.id = t.user_id) d
+        <if test="maintenanceName != null and maintenanceName != ''">
+            where d.maintenancer_name like '%' #{maintenanceName} '%'
+        </if>
+        order by d.report_time desc
     </select>
 
 
@@ -735,41 +775,42 @@
     <!--#timeout_count 已超时：包含接单超时 维修超时-->
     <select id="queryMasterHomeCount" resultType="com.repair.model.vo.MasterHomepageVo" resultMap="masterHomepageMap">
         select
-        (select count(*) from repair_receiving
-        where deleted = 0 and user_id = #{userId}) as work_count,
+        (select count(*) from repair_receiving rc
+        inner join repair_record rr on rr.deleted = 0 and rr.school_id = #{schoolId} and rr.id = rc.record_id
+        where rc.deleted = 0 and rc.user_id = #{userId}) as work_count,
         (select
         (select Count(*) as rc from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.users_id = #{userId}
-        where rr.deleted = 0 and rr.maintenance_state = 1) +
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 1) +
         (select Count(*) as wx 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) +
+        where rr2.maintenance_state = 2 and rr2.school_id = #{schoolId} and rr2.deleted = 0) +
         (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
+        where rr5.maintenance_state = 6 and rr5.deleted = 0 and rr5.school_id = #{schoolId}
         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 process_count) as process_count,
+        where rr.maintenance_state = 5 and rr.deleted = 0 and rr.school_id = #{schoolId}) a) as process_count) as process_count,
         (select Count(*) from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.users_id = #{userId}
-        where rr.deleted = 0 and rr.maintenance_state >= 7) as finish_count,
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state >= 7) as finish_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;= NOW() and rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= rdr.receiving_time)
-        where rr3.maintenance_state &lt;= 7 and rr3.is_duty = 0 and rr3.deleted = 0
+        where rr3.maintenance_state &lt;= 7 and rr3.is_duty = 0 and rr3.school_id = #{schoolId} and rr3.deleted = 0
         UNION
         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;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
-        where rr4.maintenance_state &lt;= 7 and rr4.is_duty = 0 and rr4.deleted = 0) c) as timeout_count
+        where rr4.maintenance_state &lt;= 7 and rr4.is_duty = 0 and rr4.school_id = #{schoolId} and rr4.deleted = 0) c) as timeout_count
     </select>
 
     <!--后勤人员和郭师傅首页头部数量-->