导出耗材修改

.idea/workspace.xml

@@ -2,9 +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/mapper/RepairSystemMessagesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.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$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairConsumeMapper.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/" />
@@ -38,18 +37,6 @@
   <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="318">
@@ -71,28 +58,46 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemMessagesService.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="364">
-              <caret line="34" column="59" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="59" />
+            <state relative-caret-position="420">
+              <caret line="93" selection-start-line="93" selection-end-line="93" />
             </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/resources/mapper/repair/RepairSystemMessagesMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="93" selection-start-line="93" selection-end-line="93" />
+            <state relative-caret-position="157">
+              <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="325">
+              <caret line="233" column="69" selection-start-line="233" selection-start-column="53" selection-end-line="233" selection-end-column="69" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="67" column="69" selection-start-line="67" selection-start-column="53" selection-end-line="67" selection-end-column="69" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+            <state relative-caret-position="292">
+              <caret line="15" column="206" selection-start-line="15" selection-start-column="206" selection-end-line="15" selection-end-column="206" />
             </state>
           </provider>
         </entry>
@@ -127,15 +132,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -148,8 +144,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>dropDown</find>
-      <find>queryTransferDetail</find>
       <find>is</find>
       <find>queryManagePage</find>
       <find>repairCollaborateRecord</find>
@@ -175,9 +169,11 @@
       <find>querySystemMessagePage</find>
       <find>collaborateApply</find>
       <find>getRepairByRecordId</find>
-      <find>queryManageMessagePage</find>
       <find>queryPCSystemMessagePage</find>
       <find>getById</find>
+      <find>queryManageMessagePage</find>
+      <find>downloadRepairConsumeExcel</find>
+      <find>queryConsumeList</find>
     </findStrings>
     <replaceStrings>
       <replace>repairConsumables</replace>
@@ -218,7 +214,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java" />
@@ -269,6 +264,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml" />
       </list>
     </option>
   </component>
@@ -300,7 +296,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="958" />
     <option name="height" value="1039" />
@@ -740,12 +736,12 @@
       <workItem from="1695273589677" duration="7033000" />
       <workItem from="1695342790191" duration="1226000" />
       <workItem from="1695621473813" duration="357000" />
-      <workItem from="1695628762126" duration="14485000" />
+      <workItem from="1695628762126" duration="15195000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1108766000" />
+    <option name="totallyTimeSpent" value="1109476000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -757,7 +753,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -769,10 +765,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.34743875" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.1663113" />
       <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.27292818" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2702407" />
       <window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.68380743" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
@@ -789,7 +785,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.7995546" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.7990405" />
       <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" />
@@ -942,41 +938,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="23" column="26" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="24" column="46" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairTransferRecordService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairTransferRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="502">
-          <caret line="76" column="22" selection-start-line="72" selection-start-column="7" selection-end-line="76" selection-end-column="22" />
-        </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">
-          <caret line="305" selection-start-line="305" selection-end-line="305" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairWorkTypeVo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -1306,8 +1267,43 @@
     </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="525">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="157">
+          <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ConsumeVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-340">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="67">
+          <caret line="23" column="16" lean-forward="true" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="233" column="69" selection-start-line="233" selection-start-column="53" selection-end-line="233" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="67" column="69" selection-start-line="67" selection-start-column="53" selection-end-line="67" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumeMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="15" column="206" selection-start-line="15" selection-start-column="206" selection-end-line="15" selection-end-column="206" />
         </state>
       </provider>
     </entry>

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

@@ -13,7 +13,7 @@
     </resultMap>
 
     <select id="queryConsumeList" resultType="com.repair.model.vo.ConsumeVo" resultMap="repairConsumeMap">
-       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted) as artile_name FROM `repair_consume` rc
+       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as artile_name FROM `repair_consume` rc
         left join repair_admin ra on ra.id = rc.update_user and ra.deleted = 0
         left join repair_area rae on rae.id = rc.school_id and rae.deleted = 0
         <where>

target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -13,7 +13,7 @@
     </resultMap>
 
     <select id="queryConsumeList" resultType="com.repair.model.vo.ConsumeVo" resultMap="repairConsumeMap">
-       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted) as artile_name FROM `repair_consume` rc
+       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as artile_name FROM `repair_consume` rc
         left join repair_admin ra on ra.id = rc.update_user and ra.deleted = 0
         left join repair_area rae on rae.id = rc.school_id and rae.deleted = 0
         <where>