xiugai

.idea/workspace.xml

@@ -3,13 +3,17 @@
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.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/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/RepairSystemMessagesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" 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/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.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/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairSystemMessagesMapper.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$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -42,55 +46,82 @@
   <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="135">
+              <caret line="4257" column="60" selection-start-line="4257" selection-start-column="60" selection-end-line="4257" selection-end-column="60" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="178">
+              <caret line="40" column="100" selection-start-line="40" selection-start-column="100" selection-end-line="40" selection-end-column="100" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="89">
-              <caret line="209" column="66" selection-start-line="209" selection-start-column="11" selection-end-line="209" selection-end-column="66" />
+            <state relative-caret-position="385">
+              <caret line="184" column="91" selection-start-line="184" selection-start-column="91" selection-end-line="184" selection-end-column="91" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="94" column="38" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="38" />
+            <state relative-caret-position="364">
+              <caret line="34" column="59" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="59" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.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="369">
-              <caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
+            <state relative-caret-position="325">
+              <caret line="92" column="58" selection-start-line="92" selection-start-column="58" selection-end-line="92" selection-end-column="58" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/aop/LoginCheckAspect.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="277">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+            <state relative-caret-position="624">
+              <caret line="89" column="42" selection-start-line="89" selection-start-column="42" selection-end-line="89" selection-end-column="43" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+            <state relative-caret-position="677">
+              <caret line="35" column="49" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="49" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3743">
-              <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
+            <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>
@@ -107,14 +138,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>nonceStr</find>
-      <find>strToDate</find>
-      <find>.isP</find>
-      <find>ToDate</find>
-      <find>cooperationDetail</find>
-      <find>queryCollaborateDetail</find>
-      <find>cooperationOrders</find>
-      <find>repairUserService.dropDown</find>
       <find>transfer(</find>
       <find>dropDown</find>
       <find>queryTransferDetail</find>
@@ -135,8 +158,16 @@
       <find>updateRepairAdmin</find>
       <find>一键</find>
       <find>readAllManageMessage</find>
-      <find>querySystemMessagePage</find>
       <find>queryMessageUnreadCount</find>
+      <find>lt</find>
+      <find>当天开始时间</find>
+      <find>开始时间</find>
+      <find>cooperationOrders</find>
+      <find>querySystemMessagePage</find>
+      <find>getById</find>
+      <find>getRepairByRecordId</find>
+      <find>collaborateApply</find>
+      <find>queryManageMessagePage</find>
     </findStrings>
     <replaceStrings>
       <replace>repairConsumables</replace>
@@ -177,9 +208,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java" />
@@ -199,7 +227,6 @@
         <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/model/vo/ReportExportVo.java" />
@@ -207,17 +234,13 @@
         <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" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.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/resources/application.yml" />
@@ -226,8 +249,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -259,9 +290,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -512,7 +543,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$/../../人脸打卡/校园打卡/java_clockInServer" />
     <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="nodejs_package_manager_path" value="npm" />
@@ -699,12 +730,12 @@
       <workItem from="1695273589677" duration="7033000" />
       <workItem from="1695342790191" duration="1226000" />
       <workItem from="1695621473813" duration="357000" />
-      <workItem from="1695628762126" duration="6334000" />
+      <workItem from="1695628762126" duration="13418000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1100615000" />
+    <option name="totallyTimeSpent" value="1107699000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -716,7 +747,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -728,10 +759,10 @@
       <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.18603411" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.34135666" />
       <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" visible="true" weight="0.4354486" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.27071825" />
       <window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.1487965" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
@@ -748,7 +779,7 @@
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
       <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.82196164" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.797593" />
       <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" />
@@ -901,90 +932,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.3/spring-core-5.3.3.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2024">
-          <caret line="103" column="45" selection-start-line="103" selection-start-column="45" selection-end-line="103" selection-end-column="45" />
-        </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="10028">
-          <caret line="454" selection-start-line="454" selection-end-line="454" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/cooperationOrdersRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/api/RepairRecordControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="384">
-          <caret line="126" column="25" selection-start-line="126" selection-start-column="17" selection-end-line="126" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="35" column="36" lean-forward="true" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <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="-4144">
-          <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/services/impl/RepairSchoolServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-151">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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="410">
-          <caret line="77" column="22" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="77" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairTransferRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="36" column="28" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTransferRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
-        </state>
-      </provider>
-    </entry>
-    <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="687">
-          <caret line="41" column="37" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="37" />
-        </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="1666">
-          <caret line="200" column="58" selection-start-line="200" selection-start-column="58" selection-end-line="200" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <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="483">
@@ -1013,13 +960,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="9062">
-          <caret line="394" column="31" selection-start-line="394" selection-start-column="16" selection-end-line="394" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <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="6394">
@@ -1048,13 +988,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1449">
-          <caret line="77" column="54" selection-start-line="77" selection-start-column="35" selection-end-line="77" selection-end-column="54" />
-        </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="23">
@@ -1083,16 +1016,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="33" column="27" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairUserService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="295">
@@ -1135,16 +1058,6 @@
         </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="407">
-          <caret line="1765" column="96" selection-start-line="1765" selection-start-column="88" selection-end-line="1765" selection-end-column="96" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
@@ -1208,59 +1121,187 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.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="570">
-          <caret line="35" column="27" lean-forward="true" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
+        <state relative-caret-position="161">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/aop/LoginCheckAspect.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="277">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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="3743">
-          <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
+        <state relative-caret-position="210">
+          <caret line="105" column="70" lean-forward="true" selection-start-line="105" selection-start-column="70" selection-end-line="105" selection-end-column="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+        <state relative-caret-position="138">
+          <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$/src/main/java/com/repair/aop/LoginCheckAspect.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSchoolControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="138">
+          <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$/src/main/java/com/repair/api/RepairNoticeSettingControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="26" column="124" lean-forward="true" selection-start-line="26" selection-start-column="107" selection-end-line="26" selection-end-column="124" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="56">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" 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="287">
+          <caret line="170" column="58" selection-start-line="170" selection-start-column="54" selection-end-line="170" selection-end-column="58" />
+          <folding>
+            <element signature="e#12596#12600#0" expanded="true" />
+          </folding>
+        </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="299">
+          <caret line="35" column="67" selection-start-line="35" selection-start-column="67" selection-end-line="35" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="19" column="53" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="69">
+          <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/cooperationOrdersRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <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/resources/mapper/repair/RepairSystemMessagesMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="7" column="52" lean-forward="true" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
+        <state relative-caret-position="345">
+          <caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
+          <folding>
+            <element signature="e#1297#1301#0" expanded="true" />
+            <element signature="e#1333#1337#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.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="420">
-          <caret line="94" column="38" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="38" />
+        <state relative-caret-position="295">
+          <caret line="47" column="6" selection-start-line="47" selection-start-column="6" selection-end-line="47" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairCollaborateRecord.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="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/conditions/interfaces/Compare.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="32" column="17" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+          <folding>
+            <element signature="e#1028#1029#0" expanded="true" />
+            <element signature="e#1077#1078#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="677">
+          <caret line="35" column="49" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="49" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="89" column="42" selection-start-line="89" selection-start-column="42" selection-end-line="89" selection-end-column="43" />
+        </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="89">
-          <caret line="209" column="66" selection-start-line="209" selection-start-column="11" selection-end-line="209" selection-end-column="66" />
+        <state relative-caret-position="135">
+          <caret line="4257" column="60" selection-start-line="4257" selection-start-column="60" selection-end-line="4257" selection-end-column="60" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="369">
-          <caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
+        <state relative-caret-position="178">
+          <caret line="40" column="100" selection-start-line="40" selection-start-column="100" selection-end-line="40" selection-end-column="100" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="385">
+          <caret line="184" column="91" selection-start-line="184" selection-start-column="91" selection-end-line="184" selection-end-column="91" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="34" column="59" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <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="325">
+          <caret line="92" column="58" selection-start-line="92" selection-start-column="58" selection-end-line="92" selection-end-column="58" />
         </state>
       </provider>
     </entry>

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

@@ -30,7 +30,7 @@ public interface RepairSystemMessagesControllerAPI {
 
     @GetMapping(value = "/querySystemMessagePage")
     @ApiOperation(value = "消息中心", notes = "消息中心", httpMethod = "GET")
-    CommonResult querySystemMessagePage(@RequestParam int currentPage, @RequestParam int pageCount,  @RequestParam int userId);
+    CommonResult querySystemMessagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int userId);
 
     @GetMapping(value = "/readSystemMessage")
     @ApiOperation(value = "已读操作", notes = "已读操作", httpMethod = "GET")
@@ -38,7 +38,7 @@ public interface RepairSystemMessagesControllerAPI {
 
     @GetMapping(value = "/queryManageMessagePage")
     @ApiOperation(value = "管理端消息中心", notes = "管理端消息中心", httpMethod = "GET")
-    CommonResult queryManageMessagePage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestHeader("user_head") String userhead);
+    CommonResult queryManageMessagePage(@RequestParam int currentPage, @RequestParam int pageCount, String createTime, @RequestParam int statu, @RequestHeader("user_head") String userhead);
 
     @GetMapping(value = "/readAllManageMessage")
     @ApiOperation(value = "管理端批量已读操作", notes = "管理端批量已读操作", httpMethod = "GET")

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

@@ -33,7 +33,7 @@ public class TimeExchange {
      * @throws ParseException
      */
     // String date = "2010/05/04 12:34:23";
-    public static Date StringToDate(String time, String formatDate) throws ParseException {
+    public static Date StringToDate(String time, String formatDate){
 
         Date date = new Date();
         // 注意format的格式要与日期String的格式相匹配

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

@@ -4249,6 +4249,15 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 return CommonResult.fail("订单不存在，申请失败");
             }
 
+            /**
+             * 2023-09-27 发起协作审核并审核后不允许再次发起审核
+             * 获取协作审核数据
+             */
+            RepairCollaborateRecord collaborateRecord = repairCollaborateRecordService.getRepairNeByRecordId(data.getRecordId());
+            if (collaborateRecord != null) {
+                return CommonResult.fail("该订单已发起协作审核，请勿重复操作");
+            }
+
             if (recordData.getMaintenanceState() == eRecordStatu.Collaborate.getValue()) {
                 return CommonResult.fail("该订单已发起协作审核，请勿重复操作");
             }

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

@@ -39,7 +39,8 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 新增消息中心数据
-     * @param rc 消息中心数据
+     *
+     * @param rc            消息中心数据
      * @param bindingResult 是否为空判断
      * @return
      */
@@ -57,7 +58,8 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 更新消息中心数据
-     * @param rc 消息中心数据
+     *
+     * @param rc            消息中心数据
      * @param bindingResult 是否为空判断
      * @return
      */
@@ -75,9 +77,10 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 消息中心分页数据查询
+     *
      * @param currentPage 当前页数
-     * @param pageCount 一页数据条数
-     * @param name 查询名称
+     * @param pageCount   一页数据条数
+     * @param name        查询名称
      * @return
      */
     @Override
@@ -89,6 +92,7 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 根据数据ID删除消息中心数据
+     *
      * @param id 数据ID
      * @return
      */
@@ -106,9 +110,10 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 消息中心分页数据查询
+     *
      * @param currentPage 当前页数
-     * @param pageCount 一页数据条数
-     * @param userId 用户ID
+     * @param pageCount   一页数据条数
+     * @param userId      用户ID
      * @return
      */
     @Override
@@ -119,6 +124,7 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 未读数据查询
+     *
      * @param userId 用户ID
      * @return
      */
@@ -132,6 +138,7 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 已读操作
+     *
      * @param id 数据ID
      * @return
      */
@@ -146,13 +153,19 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 管理端消息中心分页数据查询
+     *
      * @param currentPage 当前页数
-     * @param pageCount 一页数据条数
-     * @param userhead 请求头
+     * @param pageCount   一页数据条数
+     * @param createTime  创建时间
+     * @param statu       状态
+     *                    未读：0
+     *                    已读：1
+     *                    全部：2
+     * @param userhead    请求头
      * @return
      */
     @Override
-    public CommonResult queryManageMessagePage(int currentPage, int pageCount, String userhead) {
+    public CommonResult queryManageMessagePage(int currentPage, int pageCount, String createTime, int statu, String userhead) {
         String userID = AesUtils.decrypt(userhead);
         RepairAdmin operateData = repairAdminService.getRepairById(userID);
         if (operateData == null) {
@@ -169,12 +182,13 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
             userId = user.getId();
         }
 
-        PageUtils<SystemMessagePageVo> result = repairSystemMessagesService.querySystemMessagePage(currentPage, pageCount, userId);
+        PageUtils<SystemMessagePageVo> result = repairSystemMessagesService.queryPCSystemMessagePage(currentPage, pageCount, userId, createTime, statu);
         return CommonResult.ok(result);
     }
 
     /**
      * 一键已读操作
+     *
      * @param userhead 请求头
      * @return
      */
@@ -203,6 +217,7 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
     /**
      * 管理端未读数据查询
+     *
      * @param userhead 请求头
      * @return
      */

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

@@ -18,5 +18,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface RepairSystemMessagesMapper extends BaseMapper<RepairSystemMessages> {
     IPage<SystemMessagePageVo> querySystemMessagePage(IPage<SystemMessagePageVo> page, @Param("userId") Integer userId);
-
+    IPage<SystemMessagePageVo> queryPCSystemMessagePage(IPage<SystemMessagePageVo> page, @Param("userId") Integer userId, @Param("statu") Integer statu, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

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

@@ -33,5 +33,7 @@ public interface RepairCollaborateRecordService extends IService<RepairCollabora
 
     RepairCollaborateRecord getRepairByRecordId(Integer recordId);
 
+    RepairCollaborateRecord getRepairNeByRecordId(Integer recordId);
+
     CollaborateDetailVo queryCollaborateDetail(Integer recordId);
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -32,6 +32,8 @@ public interface RepairSystemMessagesService extends IService<RepairSystemMessag
 
     PageUtils<SystemMessagePageVo> querySystemMessagePage(int currentPage, int pageCount, Integer userId);
 
+    PageUtils<SystemMessagePageVo> queryPCSystemMessagePage(int currentPage, int pageCount, Integer userId, String createTime, int statu);
+
     int readAllManageMessage(int userId);
 
     int queryMessageUnreadCount(int userId);

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

@@ -84,6 +84,15 @@ public class RepairCollaborateRecordServiceImpl extends ServiceImpl<RepairCollab
     }
 
     @Override
+    public RepairCollaborateRecord getRepairNeByRecordId(Integer recordId) {
+        QueryWrapper<RepairCollaborateRecord> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("record_id", recordId);
+        queryWrapper.ne("approval_statu", 0);
+        RepairCollaborateRecord result = repairCollaborateRecordMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
     public CollaborateDetailVo queryCollaborateDetail(Integer recordId) {
         CollaborateDetailVo result = repairCollaborateRecordMapper.queryCollaborateDetail(recordId);
         return result;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.repair.common.utils.TimeExchange;
 import com.repair.mapper.RepairSystemMessagesMapper;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.result.PageUtils;
@@ -68,7 +69,7 @@ public class RepairSystemMessagesServiceImpl extends ServiceImpl<RepairSystemMes
 
     @Override
     public boolean inserBatchSystemMessage(List<RepairSystemMessages> datas) {
-        boolean result = this.saveBatch(datas,datas.size());
+        boolean result = this.saveBatch(datas, datas.size());
         return result;
     }
 
@@ -81,13 +82,26 @@ public class RepairSystemMessagesServiceImpl extends ServiceImpl<RepairSystemMes
         return new PageUtils(result);
     }
 
+
+    @Override
+    public PageUtils<SystemMessagePageVo> queryPCSystemMessagePage(int currentPage, int pageCount, Integer userId, String createTime, int statu) {
+        Page<SystemMessagePageVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        //获取开始时间和结束时间
+        String startTime = createTime == null ? createTime : TimeExchange.getStartOfDayStr(TimeExchange.StringToDate(createTime, "yyyy-MM-dd"));
+        String endTime = createTime == null ? createTime : TimeExchange.getEndOfDayStr(TimeExchange.StringToDate(createTime, "yyyy-MM-dd"));
+        IPage<SystemMessagePageVo> result = repairSystemMessagesMapper.queryPCSystemMessagePage(page, userId, statu, startTime, endTime);
+        return new PageUtils(result);
+    }
+
     @Override
     public int readAllManageMessage(int userId) {
         QueryWrapper<RepairSystemMessages> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("recipient_id", userId);
         RepairSystemMessages rsm = new RepairSystemMessages();
         rsm.setIsRead(1);
-        int result = repairSystemMessagesMapper.update(rsm,queryWrapper);
+        int result = repairSystemMessagesMapper.update(rsm, queryWrapper);
         return result;
     }
 

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

@@ -17,4 +17,17 @@
         order by rsm.is_read asc,rsm.create_time desc
     </select>
 
+    <select id="queryPCSystemMessagePage" resultType="com.repair.model.vo.SystemMessagePageVo" resultMap="systemMessagePageMap">
+        select rsm.id,rsm.record_id,rr.record_no,rsm.is_read,rsm.content,rsm.create_time as update_time from repair_system_messages rsm
+        left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
+        where rsm.deleted = 0 and rsm.recipient_id = #{userId}
+        <if test="statu != null and statu != '' and statu != 2">
+            and rsm.is_read = #{statu}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rsm.create_time &gt;= #{startTime} and rsm.create_time &lt;= #{endTime}
+        </if>
+        order by rsm.is_read asc,rsm.create_time desc
+    </select>
+
 </mapper>

target/classes/mapper/repair/RepairSystemMessagesMapper.xml

@@ -17,4 +17,17 @@
         order by rsm.is_read asc,rsm.create_time desc
     </select>
 
+    <select id="queryPCSystemMessagePage" resultType="com.repair.model.vo.SystemMessagePageVo" resultMap="systemMessagePageMap">
+        select rsm.id,rsm.record_id,rr.record_no,rsm.is_read,rsm.content,rsm.create_time as update_time from repair_system_messages rsm
+        left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
+        where rsm.deleted = 0 and rsm.recipient_id = #{userId}
+        <if test="statu != null and statu != '' and statu != 2">
+            and rsm.is_read = #{statu}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rsm.create_time &gt;= #{startTime} and rsm.create_time &lt;= #{endTime}
+        </if>
+        order by rsm.is_read asc,rsm.create_time desc
+    </select>
+
 </mapper>