优化首页查询

.idea/workspace.xml

@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" 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/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -20,11 +20,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
-              <caret line="637" column="16" selection-start-line="637" selection-start-column="16" selection-end-line="637" selection-end-column="16" />
+            <state relative-caret-position="453">
+              <caret line="1069" column="60" selection-start-line="1069" selection-start-column="45" selection-end-line="1069" selection-end-column="60" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -44,17 +44,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
+            <state relative-caret-position="138">
               <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="431">
-              <caret line="485" column="31" selection-start-line="485" selection-start-column="31" selection-end-line="485" selection-end-column="31" />
+            <state relative-caret-position="367">
+              <caret line="495" column="67" selection-start-line="495" selection-start-column="67" selection-end-line="495" selection-end-column="67" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="322">
+              <caret line="113" column="24" selection-start-line="113" selection-start-column="24" selection-end-line="113" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -62,7 +71,7 @@
       <file pinned="false" current-in-tab="false">
         <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="483">
+            <state relative-caret-position="759">
               <caret line="45" column="37" selection-start-line="45" selection-start-column="27" selection-end-line="45" selection-end-column="37" />
             </state>
           </provider>
@@ -111,7 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryPCMessageUnreadCount</find>
       <find>queryRepairCloses</find>
       <find>事务</find>
       <find>MapperS</find>
@@ -135,12 +143,13 @@
       <find>maintenanceGoodsTotal</find>
       <find>case</find>
       <find>NotT</find>
-      <find>queryNotTimeout</find>
-      <find>queryManagePage</find>
       <find>60 * 60</find>
       <find>rdv</find>
       <find>upload</find>
       <find>uploadFile</find>
+      <find>queryManagePage</find>
+      <find>queryNotTimeout</find>
+      <find>(case rr.maintenance_state when 2 then (select user_name from repair_user where id = rdv.user_id and deleted = 0) else '' end) as rdvName</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -178,10 +187,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
       </list>
     </option>
   </component>
@@ -215,9 +224,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectId" id="2ahuEEqvb7VL7aZNfgOouNVEGo4" />
@@ -226,6 +235,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -343,7 +353,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -598,12 +607,13 @@
       <workItem from="1756344245204" duration="1900000" />
       <workItem from="1756693944345" duration="29000" />
       <workItem from="1758268354634" duration="308000" />
-      <workItem from="1759110496778" duration="2420000" />
+      <workItem from="1759110496778" duration="10917000" />
+      <workItem from="1760945262667" duration="1949000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="277469000" />
+    <option name="totallyTimeSpent" value="287915000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -626,11 +636,11 @@
       <window_info id="UI Designer" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.195629" />
+      <window_info content_ui="combo" id="Project" order="8" weight="0.40087622" />
       <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.42231947" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.46498907" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.42651933" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.809628" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32932165" />
@@ -638,7 +648,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32928178" />
       <window_info anchor="bottom" id="Docker" order="9" weight="0.32928178" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.31947485" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.319337" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" weight="0.32928178" />
@@ -1012,17 +1022,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1508">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="6785">
+          <caret line="337" column="37" selection-start-line="337" selection-start-column="30" selection-end-line="337" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6785">
-          <caret line="337" column="37" selection-start-line="337" selection-start-column="30" selection-end-line="337" selection-end-column="37" />
+        <state relative-caret-position="138">
+          <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+        </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="759">
+          <caret line="45" column="37" selection-start-line="45" selection-start-column="27" selection-end-line="45" selection-end-column="37" />
         </state>
       </provider>
     </entry>
@@ -1050,34 +1067,27 @@
         </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="431">
-          <caret line="485" column="31" selection-start-line="485" selection-start-column="31" selection-end-line="485" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
+    <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="23">
-          <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+        <state relative-caret-position="453">
+          <caret line="1069" column="60" selection-start-line="1069" selection-start-column="45" selection-end-line="1069" 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/RepairRecordControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="45" column="37" selection-start-line="45" selection-start-column="27" selection-end-line="45" selection-end-column="37" />
+        <state relative-caret-position="322">
+          <caret line="113" column="24" selection-start-line="113" selection-start-column="24" selection-end-line="113" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.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="23">
-          <caret line="637" column="16" selection-start-line="637" selection-start-column="16" selection-end-line="637" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="367">
+          <caret line="495" column="67" selection-start-line="495" selection-start-column="67" selection-end-line="495" selection-end-column="67" />
         </state>
       </provider>
     </entry>

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

@@ -475,9 +475,12 @@
                               rr.area_id as area_name,rr.address,
                               rr.user_name,rr.user_phone,rat.name as article_name,rr.description,rr.report_time,
                               rr.maintenancer_name,rr.maintenance_state,
-                              (case rr.maintenance_state when 2 then (select user_name from repair_user where id = rdv.user_id and deleted = 0) else '' end) as rdvName,
-                              (case rr.maintenance_state when 1 then (select user_name from repair_user where id = rdr.users_id and deleted = 0) else '' end) as rdrName,
-                              (case rr.maintenance_state when 11 then (select user_name from repair_user where id = ror.user_id and deleted = 0) else '' end) as rorName
+        (case rr.maintenance_state when 2 then rdv_user.user_name else '' end) as rdvName,
+        (case rr.maintenance_state when 1 then rdr_user.user_name else '' end) as rdrName,
+        (case rr.maintenance_state when 11 then ror_user.user_name else '' end) as rorName
+        --                               (case rr.maintenance_state when 2 then (select user_name from repair_user where id = rdv.user_id and deleted = 0) else '' end) as rdvName,
+--                               (case rr.maintenance_state when 1 then (select user_name from repair_user where id = rdr.users_id and deleted = 0) else '' end) as rdrName,
+--                               (case rr.maintenance_state when 11 then (select user_name from repair_user where id = ror.user_id and deleted = 0) else '' end) as rorName
         from repair_record rr
         left join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0 and
         rdv.finish_time is null and rr.maintenance_state = 2
@@ -488,6 +491,9 @@
             and (rr.maintenance_state ${stateStr}
         </if>
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
+        left join repair_user rdv_user on rdv_user.id = rdv.user_id and rdv_user.deleted = 0
+        left join repair_user rdr_user on rdr_user.id = rdr.users_id and rdr_user.deleted = 0
+        left join repair_user ror_user on ror_user.id = ror.user_id and ror_user.deleted = 0
         <where>
             and rr.deleted = 0
             <if test="schoolId != null and schoolId != ''">