接单和派单

.idea/workspace.xml

@@ -3,11 +3,13 @@
   <component name="ChangeListManager">
     <list default="true" id="33a373ef-8a77-410d-8903-f96d9ffe27f3" name="Default Changelist" comment="">
       <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/services/RepairShiftSettingsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.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/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" 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/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.MybatisPlusApplicationTests.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.WrapperTest.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.repair.MybatisPlusApplicationTests.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.repair.WrapperTest.txt" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -17,77 +19,98 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="testRunner" value="GRADLE" />
+    <option name="delegatedBuild" value="true" />
+  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="24">
-              <caret line="4151" column="59" selection-start-line="4151" selection-start-column="59" selection-end-line="4151" selection-end-column="59" />
+            <state relative-caret-position="138">
+              <caret line="944" column="73" selection-start-line="944" selection-start-column="57" selection-end-line="944" selection-end-column="73" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="619" selection-start-line="619" selection-end-line="619" />
+            <state relative-caret-position="317">
+              <caret line="293" column="46" selection-start-line="293" selection-start-column="46" selection-end-line="293" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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/controller/RepairClassesSettingsController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="204" selection-start-line="204" selection-end-line="204" />
+            <state relative-caret-position="287">
+              <caret line="364" column="65" selection-start-line="364" selection-start-column="65" selection-end-line="364" selection-end-column="65" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="28" column="45" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="45" />
+            <state relative-caret-position="-158">
+              <caret line="72" column="40" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="667">
+              <caret line="33" column="72" selection-start-line="33" selection-start-column="72" selection-end-line="33" selection-end-column="72" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemSettingService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="276">
+              <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.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="292">
+              <caret line="135" column="58" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="58" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="32" column="20" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="20" />
+            <state relative-caret-position="161">
+              <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="16" column="32" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
+            <state relative-caret-position="299">
+              <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+            <state relative-caret-position="138">
+              <caret line="308" column="44" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" />
             </state>
           </provider>
         </entry>
@@ -96,15 +119,33 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>receiveOwnOrders</find>
       <find>closeOrder</find>
-      <find>transferApply</find>
       <find>!= 8</find>
       <find>importRepairClassesSettingExcel</find>
-      <find>clssses</find>
       <find>提交订单</find>
       <find>连接成功</find>
       <find>提交失败</find>
+      <find>clssses</find>
+      <find>transferApply</find>
+      <find>reportExport</find>
+      <find>yyyy-MM-dd</find>
+      <find>receiveSendOrders</find>
+      <find>dateNow</find>
+      <find>queryUserData</find>
+      <find>receiveOwnOrders</find>
+      <find>nowDate</find>
+      <find>getRepairsShiftIdByHour</find>
+      <find>getRepairsByShiftIds</find>
+      <find>isDuty</find>
+      <find>receiveOrders</find>
+      <find>//2023-10-08 看是否是值班时间接单</find>
+      <find>select id from repair_user where user_name like '%'</find>
+      <find>(select Count(*) from (select rdr.users_id from repair_record rr</find>
+      <find>queryManageCount</find>
+      <find>and rdr.users_id in</find>
+      <find>as finished_count</find>
+      <find>&lt;if test=&quot;maintenanceName != null and maintenanceName != ''&quot;&gt;</find>
+      <find>canceled_count</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -113,8 +154,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
       </list>
     </option>
   </component>
@@ -148,7 +194,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -197,7 +243,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
@@ -206,7 +252,17 @@
               <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="services" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="repair_system" 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="services" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
@@ -237,7 +293,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../定时器方法/repair_backend" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -278,18 +334,18 @@
       <updated>1696037190094</updated>
       <workItem from="1696037191371" duration="1987000" />
       <workItem from="1696640152665" duration="87000" />
-      <workItem from="1696640887168" duration="8200000" />
+      <workItem from="1696640887168" duration="25431000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10274000" />
+    <option name="totallyTimeSpent" value="27505000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25382933" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26948774" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -301,8 +357,8 @@
       <window_info anchor="bottom" id="Messages" weight="0.32928178" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3314917" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39059082" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33370167" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.74585634" />
       <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" />
@@ -318,7 +374,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.6750547" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.6737194" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -340,17 +396,22 @@
           <properties />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1612</line>
+          <properties />
+          <option name="timeStamp" value="7" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>1212</line>
+          <properties />
+          <option name="timeStamp" value="9" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" column="32" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairDispatchRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
@@ -375,34 +436,143 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <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="418">
+          <caret line="222" column="71" selection-start-line="222" selection-start-column="71" selection-end-line="222" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/Wx_user.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="24" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferApplyRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairShiftSettingsMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="17" column="75" selection-start-line="17" selection-start-column="65" selection-end-line="17" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1203">
+          <caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="135" column="58" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairShiftSettings.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="40" column="19" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairShiftSettingsService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="667">
+          <caret line="33" column="72" selection-start-line="33" selection-start-column="72" selection-end-line="33" selection-end-column="72" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-158">
+          <caret line="72" column="40" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="40" />
+        </state>
+      </provider>
     </entry>
     <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="147">
-          <caret line="619" selection-start-line="619" selection-end-line="619" />
+        <state relative-caret-position="287">
+          <caret line="364" column="65" selection-start-line="364" selection-start-column="65" selection-end-line="364" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="308" column="44" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemSettingService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
         </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="24">
-          <caret line="4151" column="59" selection-start-line="4151" selection-start-column="59" selection-end-line="4151" selection-end-column="59" />
+        <state relative-caret-position="138">
+          <caret line="944" column="73" selection-start-line="944" selection-start-column="57" selection-end-line="944" selection-end-column="73" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="299">
+          <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="317">
+          <caret line="293" column="46" selection-start-line="293" selection-start-column="46" selection-end-line="293" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="28" column="45" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="45" />
+        <state relative-caret-position="161">
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
         </state>
       </provider>
     </entry>

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

@@ -394,6 +394,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 int acceptanceAssessTime = user.getAcceptanceTime();
                 try {
 
+                    //2023-10-08 看是否是值班时间接单
+                    if(shiftDatas.size() > 0){
+                        Optional<RepairShiftSettings> shiftData = shiftDatas.stream().filter(e -> nowDate.before(TimeExchange.StringToDate(dateNow + " " + e.getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss"))).sorted(Comparator.comparing(RepairShiftSettings::getStartTime)).findFirst();
+                        if(shiftData != null && shiftData.isPresent()){
+                            if(shiftData.get().getIsDuty().intValue() == 1){
+                                isDuty = 1;
+                            }
+                        }
+                    }
+
                     //下班之后或者值班接的单不考核 将报修工单中的is_duty改为1
                     Date workTime = TimeExchange.StringToDate(dateNow + " " + datas.get(0).getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss");
                     if (workTime.before(nowDate)) {
@@ -1201,6 +1211,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     public CommonResult receiveOrders(int recordId, int userId) throws Exception {
         try {
             Date nowDate = new Date();
+            String dateHour = new SimpleDateFormat("HH:mm").format(new Date());
 
             //判断是否存在派单数据
             int dispatchCount = repairDispatchRecordService.queryDispatchCount(recordId);
@@ -1236,7 +1247,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
 
             List<String> shifts = Arrays.asList(result.getShiftId().split(","));
-            List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsByShiftIds(shifts);
+            List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsByShiftIds(shifts, dateHour);
             if (shiftDatas.size() <= 0) {
                 return CommonResult.fail("当天未排班，无法接单！");
             }
@@ -1247,6 +1258,15 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             int acceptanceAssessTime = result.getAcceptanceAssessTime();
             int maintenanceAssessTime = result.getMaintenanceAssessTime();
             try {
+                //2023-10-08 看是否是值班时间接单
+                if(shiftDatas.size() > 0){
+                    Optional<RepairShiftSettings> shiftData = shiftDatas.stream().filter(e -> nowDate.before(TimeExchange.StringToDate(dateNow + " " + e.getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss"))).sorted(Comparator.comparing(RepairShiftSettings::getStartTime)).findFirst();
+                    if(shiftData != null && shiftData.isPresent()){
+                        if(shiftData.get().getIsDuty().intValue() == 1){
+                            isDuty = 1;
+                        }
+                    }
+                }
 
                 //下班之后或者值班接的单不考核 将报修工单中的is_duty改为1
                 Date workTime = TimeExchange.StringToDate(dateNow + " " + shiftDatas.get(0).getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss");
@@ -1380,6 +1400,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     public CommonResult receiveOwnOrders(int recordId, int userId) throws Exception {
         try {
             Date nowDate = new Date();
+            String dateHour = new SimpleDateFormat("HH:mm").format(new Date());
+
             //获取订单
             RepairRecord recordData = repairRecordService.getRepairById(recordId);
             if (recordData == null) {
@@ -1423,12 +1445,23 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
 
             List<String> shifts = Arrays.asList(result.getShiftId().split(","));
-            List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsByShiftIds(shifts);
+            List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsByShiftIds(shifts, dateHour);
             if (shiftDatas.size() <= 0) {
                 return CommonResult.fail("当天未排班，无法接单！");
             }
 
             Integer isDuty = 0;
+            //2023-10-08 看是否是值班时间接单
+            if(shiftDatas.size() > 0){
+                Optional<RepairShiftSettings> shiftData = shiftDatas.stream().filter(e -> nowDate.before(TimeExchange.StringToDate(dateNow + " " + e.getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss"))).sorted(Comparator.comparing(RepairShiftSettings::getStartTime)).findFirst();
+                if(shiftData != null && shiftData.isPresent()){
+                    if(shiftData.get().getIsDuty().intValue() == 1){
+                        isDuty = 1;
+                        recordData.setIsDuty(isDuty);
+                    }
+                }
+            }
+
             int maintenanceAssessTime = result.getMaintenanceAssessTime();
             if (recordData.getIsDuty() != 1) {
                 //派单的时候是值班单就按值班单算
@@ -1612,6 +1645,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 int acceptanceAssessTime = rsor.getAcceptanceTime();
                 try {
 
+                    //2023-10-08 看是否是值班时间接单
+                    if(shiftDatas.size() > 0){
+                        Optional<RepairShiftSettings> shiftData = shiftDatas.stream().filter(e -> nowDate.before(TimeExchange.StringToDate(dateNow + " " + e.getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss"))).sorted(Comparator.comparing(RepairShiftSettings::getStartTime)).findFirst();
+                        if(shiftData != null && shiftData.isPresent()){
+                            if(shiftData.get().getIsDuty().intValue() == 1){
+                                isDuty = 1;
+                            }
+                        }
+                    }
+
                     //下班之后或者值班接的单不考核 将报修工单中的is_duty改为1
                     Date workTime = TimeExchange.StringToDate(dateNow + " " + datas.get(0).getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss");
                     if (workTime.before(nowDate)) {
@@ -1666,6 +1709,14 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 } catch (Exception e) {
                     throw new Exception("派单失败！");
                 }
+            }else{
+                isDuty = 1;
+                rdr = new RepairDispatchRecord();
+                //创建派单记录
+                rdr.setAssignedTime(new Date());
+                rdr.setAcceptanceAssessTime(rsor.getAcceptanceTime());
+                rdr.setOrderType(eDispatchType.Send.getValue());
+                rdr.setIsLoseEfficacy(eDispatchResult.NotExpired.getValue());
             }
 
             rr.setIsDuty(isDuty);
@@ -2636,7 +2687,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             dataRow1.createCell(4).setCellValue(reportExportVo.getArticleName());
             dataRow1.createCell(5).setCellValue(reportExportVo.getDescription());
             dataRow1.createCell(6).setCellValue(reportExportVo.getState());
-            dataRow1.createCell(7).setCellValue(reportExportVo.getReportTime());
+            dataRow1.createCell(7).setCellValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(reportExportVo.getReportTime()));
             dataRow1.createCell(8).setCellValue(reportExportVo.getMaintenancerName());
 
         }

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

@@ -29,5 +29,7 @@ public interface RepairShiftSettingsService extends IService<RepairShiftSettings
 
     List<RepairShiftSettings> getRepairsShiftIdByHour(List<String> shiftIds, String dateNow);
 
+    List<RepairShiftSettings> getRepairsByShiftIds(List<String> shiftIds, String dateNow);
+
     List<RepairShiftSettings> getRepairsByShiftIds(List<String> shiftIds);
 }

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

@@ -71,7 +71,16 @@ public class RepairShiftSettingsServiceImpl extends ServiceImpl<RepairShiftSetti
     public List<RepairShiftSettings> getRepairsShiftIdByHour(List<String> shiftIds, String dateNow) {
         QueryWrapper<RepairShiftSettings> queryWrapper = new QueryWrapper();
         queryWrapper.in("id", shiftIds);
-        queryWrapper.eq("is_duty", 0);
+        queryWrapper.gt("end_time", dateNow);
+        queryWrapper.orderByDesc("end_time");
+        List<RepairShiftSettings> result = repairShiftSettingsMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<RepairShiftSettings> getRepairsByShiftIds(List<String> shiftIds, String dateNow) {
+        QueryWrapper<RepairShiftSettings> queryWrapper = new QueryWrapper();
+        queryWrapper.in("id", shiftIds);
         queryWrapper.gt("end_time", dateNow);
         queryWrapper.orderByDesc("end_time");
         List<RepairShiftSettings> result = repairShiftSettingsMapper.selectList(queryWrapper);
@@ -82,7 +91,6 @@ public class RepairShiftSettingsServiceImpl extends ServiceImpl<RepairShiftSetti
     public List<RepairShiftSettings> getRepairsByShiftIds(List<String> shiftIds) {
         QueryWrapper<RepairShiftSettings> queryWrapper = new QueryWrapper();
         queryWrapper.in("id", shiftIds);
-        queryWrapper.eq("is_duty", 0);
         queryWrapper.orderByDesc("end_time");
         List<RepairShiftSettings> result = repairShiftSettingsMapper.selectList(queryWrapper);
         return result;

src/main/resources/application-dev.yml

@@ -41,9 +41,9 @@ spring:
         max-wait: 60000s
 mybatis-plus:
   mapper-locations: classpath:/mapper/repair/*.xml
-#  configuration:
-#    #开启sql打印
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  configuration:
+    #开启sql打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    #关闭sql打印
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:

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

@@ -273,7 +273,7 @@
             and school_id = #{schoolId}
         </if>
         <if test="maintenanceName != null and maintenanceName != ''">
-            and maintenancer_name like '%' #{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
@@ -288,13 +288,10 @@
             and rr.school_id = #{schoolId}
         </if>
         <if test="maintenanceName != null and maintenanceName != ''">
-            and rr.maintenancer_name like '%' #{maintenanceName}
+            and rr.maintenancer_name like '%' #{maintenanceName} '%'
         </if>
         ) as finished_count,
         (select Count(*) from repair_record rr
-         <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 (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord}

target/classes/application-dev.yml

@@ -41,9 +41,9 @@ spring:
         max-wait: 60000s
 mybatis-plus:
   mapper-locations: classpath:/mapper/repair/*.xml
-#  configuration:
-#    #开启sql打印
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  configuration:
+    #开启sql打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    #关闭sql打印
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -273,7 +273,7 @@
             and school_id = #{schoolId}
         </if>
         <if test="maintenanceName != null and maintenanceName != ''">
-            and maintenancer_name like '%' #{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
@@ -288,13 +288,10 @@
             and rr.school_id = #{schoolId}
         </if>
         <if test="maintenanceName != null and maintenanceName != ''">
-            and rr.maintenancer_name like '%' #{maintenanceName}
+            and rr.maintenancer_name like '%' #{maintenanceName} '%'
         </if>
         ) as finished_count,
         (select Count(*) from repair_record rr
-         <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 (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like '%' #{keyWord}