首页统计

.idea/workspace.xml

@@ -2,15 +2,8 @@
 <project version="4">
   <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/RepairAdminControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" afterDir="false" />
-      <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/RepairPayRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.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/RepairManageCountVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.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/java/com/repair/model/vo/RepairAnalysisVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.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" />
       <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" />
@@ -45,43 +38,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <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="149">
-              <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1456#1457#0" expanded="true" />
-                <element signature="e#1512#1513#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="349" column="74" selection-start-line="349" selection-start-column="74" selection-end-line="349" selection-end-column="74" />
-              <folding>
-                <element signature="e#35156#35160#0" expanded="true" />
-                <element signature="e#35276#35280#0" expanded="true" />
-                <element signature="e#35356#35360#0" expanded="true" />
-                <element signature="e#35888#35892#0" expanded="true" />
-                <element signature="e#36019#36023#0" expanded="true" />
-                <element signature="e#36096#36100#0" expanded="true" />
-                <element signature="e#37909#37913#0" expanded="true" />
-                <element signature="e#38034#38038#0" 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/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
+            <state relative-caret-position="3397">
               <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -91,81 +51,42 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="253">
-              <caret line="11" column="15" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairRecordControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="509">
-              <caret line="227" column="36" selection-start-line="227" selection-start-column="36" selection-end-line="227" selection-end-column="36" />
+            <state relative-caret-position="81">
+              <caret line="1289" column="74" selection-start-line="1289" selection-start-column="74" selection-end-line="1289" selection-end-column="74" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+            <state relative-caret-position="368">
+              <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
               <folding>
-                <element signature="e#458#459#0" expanded="true" />
-                <element signature="e#498#499#0" expanded="true" />
+                <element signature="e#453#454#0" expanded="true" />
+                <element signature="e#496#497#0" expanded="true" />
+                <element signature="e#722#723#0" expanded="true" />
+                <element signature="e#766#767#0" expanded="true" />
               </folding>
             </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">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="32">
-              <caret line="82" column="5" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" />
+            <state relative-caret-position="276">
+              <caret line="15" column="37" selection-start-line="15" selection-start-column="37" selection-end-line="15" selection-end-column="37" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1075#1076#0" expanded="true" />
-                <element signature="e#1166#1167#0" expanded="true" />
-                <element signature="e#1339#1340#0" expanded="true" />
-                <element signature="e#1376#1377#0" expanded="true" />
-                <element signature="e#1409#1410#0" expanded="true" />
-                <element signature="e#1443#1444#0" expanded="true" />
+                <element signature="e#258#259#0" expanded="true" />
+                <element signature="e#302#303#0" 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/RepairAdminServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="68" column="65" selection-start-line="68" selection-start-column="29" selection-end-line="68" selection-end-column="65" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairAdminControllerAPI.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14">
-              <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="148" column="70" selection-start-line="148" selection-start-column="70" selection-end-line="148" selection-end-column="70" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -178,9 +99,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>支付</find>
-      <find>revokeRepairRecordById</find>
-      <find>downloadRepairClassesSettingExcel</find>
       <find>closeOrder</find>
       <find>closePCOrder</find>
       <find>json</find>
@@ -205,9 +123,12 @@
       <find>queryManageCount</find>
       <find>queryNotTimeout</find>
       <find>RepairRecordPageVo</find>
-      <find>repairTotalData</find>
       <find>repairSummarizing</find>
       <find>as dispatch_count</find>
+      <find>repairAnalysis</find>
+      <find>'-','维修超时'</find>
+      <find>repairTotalData</find>
+      <find>queryTimeOut</find>
     </findStrings>
     <replaceStrings>
       <replace>RepairConsume</replace>
@@ -248,8 +169,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordTimeoutPageVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/EvaluateVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairArticleTypeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairEvaluateMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairEvaluateController.java" />
@@ -296,9 +215,11 @@
         <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/api/RepairRecordControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairRecordPageVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java" />
       </list>
     </option>
   </component>
@@ -733,12 +654,12 @@
       <workItem from="1692328425694" duration="3410000" />
       <workItem from="1692338996790" duration="52964000" />
       <workItem from="1692691144895" duration="14181000" />
-      <workItem from="1692753806714" duration="73910000" />
+      <workItem from="1692753806714" duration="76924000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="922125000" />
+    <option name="totallyTimeSpent" value="925139000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -765,8 +686,8 @@
       <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.14605543" />
       <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" weight="0.6684902" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8249453" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.69502765" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.8074398" />
       <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" />
@@ -782,7 +703,7 @@
       <window_info anchor="bottom" id="Event Log" order="16" weight="0.32822758" />
       <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.8238512" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.8205689" />
       <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" />
@@ -965,20 +886,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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="623">
-          <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" />
-        </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="345">
-          <caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
-        </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="140">
@@ -1309,52 +1216,66 @@
         </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/RepairManageCountVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
+        <state relative-caret-position="529">
+          <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#458#459#0" expanded="true" />
+            <element signature="e#498#499#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.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="529">
-          <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+        <state relative-caret-position="35">
+          <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
           <folding>
-            <element signature="e#458#459#0" expanded="true" />
-            <element signature="e#498#499#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#1456#1457#0" expanded="true" />
+            <element signature="e#1512#1513#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAnalysisVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="349" column="74" selection-start-line="349" selection-start-column="74" selection-end-line="349" selection-end-column="74" />
+        <state relative-caret-position="276">
+          <caret line="15" column="37" selection-start-line="15" selection-start-column="37" selection-end-line="15" selection-end-column="37" />
           <folding>
-            <element signature="e#35156#35160#0" expanded="true" />
-            <element signature="e#35276#35280#0" expanded="true" />
-            <element signature="e#35356#35360#0" expanded="true" />
-            <element signature="e#35888#35892#0" expanded="true" />
-            <element signature="e#36019#36023#0" expanded="true" />
-            <element signature="e#36096#36100#0" expanded="true" />
-            <element signature="e#37909#37913#0" expanded="true" />
-            <element signature="e#38034#38038#0" expanded="true" />
+            <element signature="e#258#259#0" expanded="true" />
+            <element signature="e#302#303#0" expanded="true" />
           </folding>
         </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/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
+        <state relative-caret-position="3397">
+          <caret line="3465" column="64" selection-start-line="3465" selection-start-column="49" selection-end-line="3465" selection-end-column="64" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1456#1457#0" expanded="true" />
-            <element signature="e#1512#1513#0" expanded="true" />
+          </folding>
+        </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="81">
+          <caret line="1289" column="74" selection-start-line="1289" selection-start-column="74" selection-end-line="1289" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTotalDataVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
+          <folding>
+            <element signature="e#453#454#0" expanded="true" />
+            <element signature="e#496#497#0" expanded="true" />
+            <element signature="e#722#723#0" expanded="true" />
+            <element signature="e#766#767#0" expanded="true" />
           </folding>
         </state>
       </provider>

src/main/java/com/repair/model/vo/RepairAnalysisVo.java

@@ -7,6 +7,15 @@ public class RepairAnalysisVo {
 
     //    总单数
     private Integer totalCount;
+
+    public Integer getTotalCount() {
+        return checkCount + receivingCount+ maintainCount+ accomplishCount + shutCount + cancelCount + disposeCount + affirmCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
     //    待审核
     private Integer checkCount;
     //    待接单

src/main/java/com/repair/model/vo/RepairTotalDataVo.java

@@ -22,6 +22,14 @@ public class RepairTotalDataVo {
     //    已完成总数=（已完成+已取消+已关单）
     private Integer accomplishTotalCount;
 
+    public Integer getAccomplishTotalCount() {
+        return accomplishCount + cancelCount + shutCount;
+    }
+
+    public void setAccomplishTotalCount(Integer accomplishTotalCount) {
+        this.accomplishTotalCount = accomplishTotalCount;
+    }
+
     //    已完成
     private Integer accomplishCount;
 
@@ -33,4 +41,12 @@ public class RepairTotalDataVo {
 
     //    总单数
     private Integer totalCount;
+
+    public Integer getTotalCount() {
+        return checkCount + receivingCount + disposeCount + affirmCount + maintainCount + accomplishCount + cancelCount + shutCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
 }

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

@@ -1101,7 +1101,6 @@
 
     <select id="repairAnalysis" resultType="com.repair.model.vo.RepairAnalysisVo">
         SELECT
-        COUNT(*) AS total_count,
         (SELECT COUNT(*) FROM repair_record
         <where>
             AND deleted = 0
@@ -1111,21 +1110,23 @@
             </if>
         </where>
         ) as check_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) FROM repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
         <where>
-            AND deleted = 0
-            and maintenance_state = 1
+            AND rr.deleted = 0
+            and rr.maintenance_state = 1
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as receiving_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) 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 rr.maintenance_state = 2
         <where>
-            AND deleted = 0
-            and maintenance_state = 2
+            AND rr.deleted = 0
+            and rr.maintenance_state = 2
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as maintain_count ,
@@ -1175,59 +1176,40 @@
         </where>
         )
         as affirm_count
-        FROM
-        repair_record rr
-        <where>
-            AND rr.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
     </select>
+
     <select id="queryTimeOut" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM (
-        select rr3.school_id,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,concat((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
-        rdr.is_lose_efficacy = 0
+        SELECT count(*) FROM (
+        select rdr.users_id as
+        user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
         rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
         rdr.receiving_time)
-        <where>
-            and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.maintenance_state &lt;= 7
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr3.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        UNION ALL
-        select rr4.school_id,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,concat((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
-        rdv.is_lose_efficacy = 0
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
+        UNION
+        select
+        rdv.user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and
         rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
         minute) &lt;= rdv.finish_time)
-        <where>
-            and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.maintenance_state &lt;= 7
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr4.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
         ) t
     </select>
 
     <select id="repairSummarizing" resultType="com.repair.model.vo.RepairSummarizingVo">
         SELECT
-        COUNT(*) AS total_count,
         (SELECT COUNT(*) FROM repair_record
         <where>
             AND deleted = 0
@@ -1237,21 +1219,23 @@
             </if>
         </where>
         ) as check_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) FROM repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
         <where>
-            AND deleted = 0
-            and maintenance_state = 1
+            AND rr.deleted = 0
+            and rr.maintenance_state = 1
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as receiving_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) 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 rr.maintenance_state = 2
         <where>
-            AND deleted = 0
-            and maintenance_state = 2
+            AND rr.deleted = 0
+            and rr.maintenance_state = 2
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as maintain_count ,
@@ -1301,31 +1285,23 @@
         </where>
         )
         as affirm_count
-        FROM
-        repair_record rr
-        <where>
-            AND rr.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
     </select>
 
     <select id="repairTotalData" resultType="com.repair.model.vo.RepairTotalDataVo">
-        select *, sum(t.accomplish_count + t.cancel_count + t.shut_count) as accomplish_total_count
-        from (SELECT COUNT(*)                              AS total_count,
-                     (SELECT COUNT(*)
+        select (SELECT COUNT(*)
                       FROM repair_record
                       where deleted = 0
                         and (maintenance_state in (5, 6))) as check_count,
                      (SELECT COUNT(*)
-                      FROM repair_record
-                      where deleted = 0
-                        and maintenance_state = 1)         as receiving_count,
+                      FROM repair_record rr
+                      left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
+                      where rr.deleted = 0
+                        and rr.maintenance_state = 1)         as receiving_count,
                      (SELECT COUNT(*)
-                      FROM repair_record
-                      where deleted = 0
-                        and maintenance_state = 2)         as maintain_count,
+                      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 rr.maintenance_state = 2
+                      where rr.deleted = 0
+                        and rr.maintenance_state = 2)         as maintain_count,
                      (SELECT COUNT(*)
                       FROM repair_record
                       where deleted = 0
@@ -1347,8 +1323,6 @@
                       where deleted = 0
                         and maintenance_state = 4)
                                                            as affirm_count
-              FROM repair_record rr
-              where rr.deleted = 0) t
     </select>
 
 </mapper>

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -1101,7 +1101,6 @@
 
     <select id="repairAnalysis" resultType="com.repair.model.vo.RepairAnalysisVo">
         SELECT
-        COUNT(*) AS total_count,
         (SELECT COUNT(*) FROM repair_record
         <where>
             AND deleted = 0
@@ -1111,21 +1110,23 @@
             </if>
         </where>
         ) as check_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) FROM repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
         <where>
-            AND deleted = 0
-            and maintenance_state = 1
+            AND rr.deleted = 0
+            and rr.maintenance_state = 1
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as receiving_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) 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 rr.maintenance_state = 2
         <where>
-            AND deleted = 0
-            and maintenance_state = 2
+            AND rr.deleted = 0
+            and rr.maintenance_state = 2
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as maintain_count ,
@@ -1175,59 +1176,40 @@
         </where>
         )
         as affirm_count
-        FROM
-        repair_record rr
-        <where>
-            AND rr.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
     </select>
+
     <select id="queryTimeOut" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM (
-        select rr3.school_id,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,concat((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
-        rdr.is_lose_efficacy = 0
+        SELECT count(*) FROM (
+        select rdr.users_id as
+        user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
         and ((date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW() and
         rdr.receiving_time is null) or date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;=
         rdr.receiving_time)
-        <where>
-            and rr3.deleted = 0 and rr3.is_duty = 0 and rr3.maintenance_state &lt;= 7
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr3.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        UNION ALL
-        select rr4.school_id,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,concat((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
-        rdv.is_lose_efficacy = 0
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
+        UNION
+        select
+        rdv.user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
+        as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price from
+        repair_record rr
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr.id and rdv.is_lose_efficacy = 0
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and
         rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time
         minute) &lt;= rdv.finish_time)
-        <where>
-            and rr4.deleted = 0 and rr4.is_duty = 0 and rr4.maintenance_state &lt;= 7
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr4.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
+        where rr.is_duty = 0 and rr.maintenance_state &lt;= 7 and rr.deleted = 0
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and rr.report_time between #{startTime} and #{endTime}
+        </if>
         ) t
     </select>
 
     <select id="repairSummarizing" resultType="com.repair.model.vo.RepairSummarizingVo">
         SELECT
-        COUNT(*) AS total_count,
         (SELECT COUNT(*) FROM repair_record
         <where>
             AND deleted = 0
@@ -1237,21 +1219,23 @@
             </if>
         </where>
         ) as check_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) FROM repair_record rr
+        left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
         <where>
-            AND deleted = 0
-            and maintenance_state = 1
+            AND rr.deleted = 0
+            and rr.maintenance_state = 1
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as receiving_count ,
-        (SELECT COUNT(*) FROM repair_record
+        (SELECT COUNT(*) 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 rr.maintenance_state = 2
         <where>
-            AND deleted = 0
-            and maintenance_state = 2
+            AND rr.deleted = 0
+            and rr.maintenance_state = 2
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         ) as maintain_count ,
@@ -1301,31 +1285,23 @@
         </where>
         )
         as affirm_count
-        FROM
-        repair_record rr
-        <where>
-            AND rr.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rr.report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
     </select>
 
     <select id="repairTotalData" resultType="com.repair.model.vo.RepairTotalDataVo">
-        select *, sum(t.accomplish_count + t.cancel_count + t.shut_count) as accomplish_total_count
-        from (SELECT COUNT(*)                              AS total_count,
-                     (SELECT COUNT(*)
+        select (SELECT COUNT(*)
                       FROM repair_record
                       where deleted = 0
                         and (maintenance_state in (5, 6))) as check_count,
                      (SELECT COUNT(*)
-                      FROM repair_record
-                      where deleted = 0
-                        and maintenance_state = 1)         as receiving_count,
+                      FROM repair_record rr
+                      left join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rr.maintenance_state = 1
+                      where rr.deleted = 0
+                        and rr.maintenance_state = 1)         as receiving_count,
                      (SELECT COUNT(*)
-                      FROM repair_record
-                      where deleted = 0
-                        and maintenance_state = 2)         as maintain_count,
+                      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 rr.maintenance_state = 2
+                      where rr.deleted = 0
+                        and rr.maintenance_state = 2)         as maintain_count,
                      (SELECT COUNT(*)
                       FROM repair_record
                       where deleted = 0
@@ -1347,8 +1323,6 @@
                       where deleted = 0
                         and maintenance_state = 4)
                                                            as affirm_count
-              FROM repair_record rr
-              where rr.deleted = 0) t
     </select>
 
 </mapper>