自动派单

.idea/workspace.xml

@@ -2,11 +2,9 @@
 <project version="4">
   <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/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/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/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$/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" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -18,19 +16,15 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
+    <option name="isMigrated" value="true" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="753">
-              <caret line="326" column="6" selection-start-line="326" selection-start-column="6" selection-end-line="326" selection-end-column="6" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="1211">
+              <caret line="420" column="49" selection-start-line="420" selection-start-column="49" selection-end-line="420" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -39,70 +33,16 @@
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
             <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/application-dev.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="253">
-              <caret line="478" selection-start-line="478" selection-end-line="478" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" 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/DetailsVo.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="701">
-              <caret line="139" column="48" selection-start-line="136" selection-start-column="4" selection-end-line="139" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="677">
-              <caret line="152" column="45" selection-start-line="152" selection-start-column="45" selection-end-line="152" selection-end-column="45" />
+              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" 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/enumModel/eRecordStatu.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="272">
-              <caret line="12" column="15" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="15" />
+            <state relative-caret-position="68">
+              <caret line="734" column="119" selection-start-line="734" selection-start-column="119" selection-end-line="734" selection-end-column="119" />
             </state>
           </provider>
         </entry>
@@ -111,13 +51,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>receiveOwnOrders</find>
-      <find>getRepairsByShiftIds</find>
-      <find>receiveOrders</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>and rdr.users_id in</find>
-      <find>as finished_count</find>
       <find>&lt;if test=&quot;maintenanceName != null and maintenanceName != ''&quot;&gt;</find>
       <find>getRepairsShiftIdByHour</find>
       <find>queryManageCount</find>
@@ -139,8 +72,15 @@
       <find>getRepairsByRecordId</find>
       <find>getTechniciansByUserId</find>
       <find>queryTeamWorkPage</find>
+      <find>pay(</find>
       <find>报价</find>
       <find>changeMaintenanceConsumables</find>
+      <find>transfer(</find>
+      <find>queryManagePage</find>
+      <find>rdr</find>
+      <find>queryTimeoutReportExport</find>
+      <find>reportExport</find>
+      <find>提交订单</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -153,11 +93,11 @@
         <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/resources/application-dev.yml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
       </list>
     </option>
   </component>
@@ -189,8 +129,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="-7" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="953" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -199,7 +139,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -280,6 +219,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -331,17 +271,20 @@
       <updated>1696037190094</updated>
       <workItem from="1696037191371" duration="1987000" />
       <workItem from="1696640152665" duration="87000" />
-      <workItem from="1696640887168" duration="43402000" />
+      <workItem from="1696640887168" duration="44041000" />
+      <workItem from="1696911564581" duration="2242000" />
+      <workItem from="1696926308382" duration="6706000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="45476000" />
+    <option name="totallyTimeSpent" value="55063000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
+    <frame x="953" y="0" width="974" height="1039" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.36761487" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2260128" />
       <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" />
@@ -350,11 +293,10 @@
       <window_info id="UI Designer" order="6" />
       <window_info id="Favorites" order="7" side_tool="true" />
       <window_info id="Web" order="8" side_tool="true" />
-      <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 active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.33370167" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.6718232" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.33041576" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.65745854" />
       <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" />
@@ -367,10 +309,11 @@
       <window_info anchor="bottom" id="Version Control" order="13" />
       <window_info anchor="bottom" id="JRebel Executor" order="14" />
       <window_info anchor="bottom" id="JRebel Console" order="15" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="16" weight="0.32928178" />
       <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.6597374" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.9671773" />
       <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" />
@@ -394,13 +337,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1623</line>
+          <line>1630</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>1223</line>
+          <line>1230</line>
           <properties />
           <option name="timeStamp" value="9" />
         </line-breakpoint>
@@ -529,13 +472,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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/java/com/repair/model/request/ReceiveSendOrdersRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -578,69 +514,66 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PageUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="12" column="15" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="15" />
+        <state relative-caret-position="295">
+          <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="701">
-          <caret line="139" column="48" selection-start-line="136" selection-start-column="4" selection-end-line="139" selection-end-column="48" />
+        <state relative-caret-position="332">
+          <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/model/result/PageUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/transferRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
+        <state relative-caret-position="115">
+          <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/pojo/RepairLeaveMessage.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="332">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="10327">
+          <caret line="478" selection-start-line="478" selection-end-line="478" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
+        <state relative-caret-position="621">
           <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="677">
-          <caret line="152" column="45" selection-start-line="152" selection-start-column="45" selection-end-line="152" selection-end-column="45" />
+        <state relative-caret-position="1173">
+          <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
+        <state relative-caret-position="2852">
+          <caret line="139" column="48" selection-start-line="136" selection-start-column="4" selection-end-line="139" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="753">
-          <caret line="326" column="6" selection-start-line="326" selection-start-column="6" selection-end-line="326" selection-end-column="6" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="3105">
+          <caret line="152" column="45" selection-start-line="152" selection-start-column="45" selection-end-line="152" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+        <state relative-caret-position="276">
+          <caret line="12" column="15" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="15" />
         </state>
       </provider>
     </entry>
@@ -651,10 +584,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.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="253">
-          <caret line="478" selection-start-line="478" selection-end-line="478" />
+        <state relative-caret-position="68">
+          <caret line="734" column="119" selection-start-line="734" selection-start-column="119" selection-end-line="734" selection-end-column="119" />
+        </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="161">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" 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="1211">
+          <caret line="420" column="49" selection-start-line="420" selection-start-column="49" selection-end-line="420" selection-end-column="49" />
         </state>
       </provider>
     </entry>

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

@@ -349,6 +349,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         Integer isDuty = 0;
         try {
             Date nowDate = new Date();
+            //Date nowDate = TimeExchange.StringToDate("2023-10-09 21:25:19","yyyy-MM-dd HH:mm:ss");
             String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(nowDate);
             String dateHour = new SimpleDateFormat("HH:mm").format(nowDate);
 
@@ -386,15 +387,19 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairDispatchRecord rdr = null;
             //只获取不是值班 或下班后的排班数据
             List<RepairShiftSettings> shiftDatas = repairShiftSettingsService.getRepairsShiftIdByHour(shifts, dateHour);
+            if(shiftDatas.size() <= 0){
+                System.out.println("提交订单1");
+                isDuty = 1;
+            }
             for (AutoDispatchUserVo user : users) {
                 List<RepairShiftSettings> datas = shiftDatas.stream().filter(e -> ("," + user.getShiftId() + ",").contains(("," + e.getId() + ","))).collect(Collectors.toList());
                 if (datas.size() <= 0) {
                     continue;
                 }
-
+                System.out.println("提交订单2");
                 int acceptanceAssessTime = user.getAcceptanceTime();
                 try {
-
+                    System.out.println("提交订单3");
                     //2023-10-08 看是否是值班时间接单
                     if(datas.size() > 0){
                         Optional<RepairShiftSettings> shiftData = datas.stream().filter(e -> nowDate.before(TimeExchange.StringToDate(dateNow + " " + e.getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss"))).sorted(Comparator.comparing(RepairShiftSettings::getStartTime)).findFirst();
@@ -404,14 +409,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                             }
                         }
                     }
-
+                    System.out.println("提交订单4");
                     //下班之后或者值班接的单不考核 将报修工单中的is_duty改为1
                     Date workTime = TimeExchange.StringToDate(dateNow + " " + datas.get(0).getEndTime() + ":00", "yyyy-MM-dd HH:mm:ss");
                     if (workTime.before(nowDate)) {
+                        System.out.println("提交订单5");
                         isDuty = 1;
                     }
 
                     if (isDuty == 0) {
+                        System.out.println("提交订单6");
                         //在工作时间才去派单
                         List<timeVo> tvs = DelayedUtils.timeVos(datas);
 
@@ -1265,7 +1272,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
             //师傅自己抢单的时候不去限制抢单师傅的楼栋
 
-            Integer isDuty = 0;
+            Integer isDuty = recordData.getIsDuty();
             int acceptanceAssessTime = result.getAcceptanceAssessTime();
             int maintenanceAssessTime = result.getMaintenanceAssessTime();
             try {
@@ -1461,7 +1468,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 return CommonResult.fail("当天未排班，无法接单！");
             }
 
-            Integer isDuty = 0;
+            Integer isDuty = recordData.getIsDuty();
             //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();
@@ -1641,7 +1648,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("该订单存在待接单师傅，请勿再次派单");
         }
 
-        Integer isDuty = 0;
+        Integer isDuty = rr.getIsDuty();
         Date nowDate = new Date();
         String dateHour = new SimpleDateFormat("HH:mm").format(new Date());
         String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());

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

@@ -707,7 +707,7 @@
         SELECT * FROM (
         select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
-        rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
+        rr3.description,rr3.report_time,(select user_name from repair_user where id = rdr.users_id) as maintenancer_name,rr3.maintenance_state
         from repair_record rr3
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
@@ -732,7 +732,7 @@
         select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
         area_name,rr4.user_name,rr4.user_phone,rat.name as
         article_name,
-        rr4.description,rr4.report_time,rr4.maintenancer_name,rr4.maintenance_state
+        rr4.description,rr4.report_time,(select user_name from repair_user where id = rdv.user_id) as maintenancer_name,rr4.maintenance_state
         from repair_record rr4
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -707,7 +707,7 @@
         SELECT * FROM (
         select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
-        rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
+        rr3.description,rr3.report_time,(select user_name from repair_user where id = rdr.users_id) as maintenancer_name,rr3.maintenance_state
         from repair_record rr3
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
@@ -732,7 +732,7 @@
         select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
         area_name,rr4.user_name,rr4.user_phone,rat.name as
         article_name,
-        rr4.description,rr4.report_time,rr4.maintenancer_name,rr4.maintenance_state
+        rr4.description,rr4.report_time,(select user_name from repair_user where id = rdv.user_id) as maintenancer_name,rr4.maintenance_state
         from repair_record rr4
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and