ceshi

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -22,8 +22,8 @@
       <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="181">
-              <caret line="452" column="20" selection-start-line="452" selection-start-column="20" selection-end-line="452" selection-end-column="20" />
+            <state relative-caret-position="368">
+              <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -49,7 +49,7 @@
       <file pinned="false" current-in-tab="false">
         <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="287">
+            <state relative-caret-position="62">
               <caret line="364" column="65" selection-start-line="364" selection-start-column="65" selection-end-line="364" selection-end-column="65" />
             </state>
           </provider>
@@ -65,15 +65,6 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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/java/com/repair/services/RepairSystemSettingService.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="276">
@@ -94,7 +85,7 @@
       <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="299">
+            <state relative-caret-position="920">
               <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
             </state>
           </provider>
@@ -126,20 +117,21 @@
       <find>receiveSendOrders</find>
       <find>dateNow</find>
       <find>receiveOwnOrders</find>
-      <find>nowDate</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>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>
       <find>queryUserData</find>
       <find>getRepairsShiftIdByHour</find>
       <find>queryManageCount</find>
+      <find>isDuty</find>
+      <find>canceled_count</find>
+      <find>nowDate</find>
+      <find>//2023-10-08 看是否是值班时间接单</find>
+      <find>shifts</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -186,9 +178,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-7" />
-    <option name="width" value="958" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="953" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -273,6 +265,11 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
+              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
+              <item name="target" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -328,18 +325,18 @@
       <updated>1696037190094</updated>
       <workItem from="1696037191371" duration="1987000" />
       <workItem from="1696640152665" duration="87000" />
-      <workItem from="1696640887168" duration="27384000" />
+      <workItem from="1696640887168" duration="31756000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29458000" />
+    <option name="totallyTimeSpent" value="33830000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12899786" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2650334" />
       <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" />
@@ -352,7 +349,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.33041576" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.73851204" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.71115977" />
       <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" />
@@ -368,7 +365,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.6737194" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.96659243" />
       <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" />
@@ -392,13 +389,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1614</line>
+          <line>1613</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>1214</line>
+          <line>1213</line>
           <properties />
           <option name="timeStamp" value="9" />
         </line-breakpoint>
@@ -406,7 +403,13 @@
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
           <line>335</line>
           <properties />
-          <option name="timeStamp" value="10" />
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
+          <line>381</line>
+          <properties />
+          <option name="timeStamp" value="12" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -513,13 +516,6 @@
         </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="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">
@@ -534,10 +530,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <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="299">
-          <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
+        <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/services/impl/RepairShiftSettingsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="70" column="60" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="60" />
         </state>
       </provider>
     </entry>
@@ -548,17 +551,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.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 relative-caret-position="62">
+          <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/services/impl/RepairShiftSettingsServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="70" column="60" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="60" />
+        <state relative-caret-position="920">
+          <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
         </state>
       </provider>
     </entry>
@@ -569,10 +572,17 @@
         </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">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" 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="181">
-          <caret line="452" column="20" selection-start-line="452" selection-start-column="20" selection-end-line="452" selection-end-column="20" />
+        <state relative-caret-position="368">
+          <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" />
         </state>
       </provider>
     </entry>

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

@@ -348,9 +348,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         //循环班次数据
         Integer isDuty = 0;
         try {
-            String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-            String dateHour = new SimpleDateFormat("HH:mm").format(new Date());
             Date nowDate = new Date();
+            String dateNow = new SimpleDateFormat("yyyy-MM-dd").format(nowDate);
+            String dateHour = new SimpleDateFormat("HH:mm").format(nowDate);
+
             RepairRecord rr = new RepairRecord();
             rr.setAreaId(rrr.getAreaId());
             rr.setArticleId(rrr.getArticleId());
@@ -395,8 +396,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 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(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();
                         if(shiftData != null && shiftData.isPresent()){
                             if(shiftData.get().getIsDuty().intValue() == 1){
                                 isDuty = 1;
@@ -1647,7 +1648,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
                     //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();
+                        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();
                         if(shiftData != null && shiftData.isPresent()){
                             if(shiftData.get().getIsDuty().intValue() == 1){
                                 isDuty = 1;