|
|
@@ -2,17 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/DisReceCountVo.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/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairDispatchRecordMapper.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairDispatchRecordService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairDispatchRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairDispatchRecordMapper.xml" afterDir="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/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -44,11 +34,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="53">
|
|
|
- <caret line="1005" column="86" selection-start-line="1005" selection-start-column="86" selection-end-line="1005" selection-end-column="86" />
|
|
|
+ <state relative-caret-position="407">
|
|
|
+ <caret line="3438" column="74" selection-start-line="3438" selection-start-column="57" selection-end-line="3438" selection-end-column="74" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -57,24 +47,22 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.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="55">
|
|
|
- <caret line="168" column="44" selection-start-line="168" selection-start-column="24" selection-end-line="168" selection-end-column="44" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="614">
|
|
|
+ <caret line="1210" column="77" lean-forward="true" selection-start-line="1210" selection-start-column="77" selection-end-line="1210" selection-end-column="77" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="269">
|
|
|
- <caret line="28" column="53" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="53" />
|
|
|
+ <state relative-caret-position="667">
|
|
|
+ <caret line="35" column="126" selection-start-line="35" selection-start-column="126" selection-end-line="35" selection-end-column="126" />
|
|
|
<folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
+ <element signature="e#652#653#0" expanded="true" />
|
|
|
+ <element signature="e#696#697#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -112,7 +100,6 @@
|
|
|
<find>queryManageCount</find>
|
|
|
<find>queryNotTimeout</find>
|
|
|
<find>RepairRecordPageVo</find>
|
|
|
- <find>repairSummarizing</find>
|
|
|
<find>as dispatch_count</find>
|
|
|
<find>repairAnalysis</find>
|
|
|
<find>'-','维修超时'</find>
|
|
|
@@ -122,6 +109,7 @@
|
|
|
<find>deleteRepairUserSettingById</find>
|
|
|
<find>deleteRepairUserById</find>
|
|
|
<find>queryManagePage</find>
|
|
|
+ <find>repairSummarizing</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>RepairConsume</replace>
|
|
|
@@ -162,7 +150,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairLeaveMessageController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairTrackRecordMapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairConsumablesControllerAPI.java" />
|
|
|
@@ -213,6 +200,7 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -244,9 +232,8 @@
|
|
|
<component name="MavenRunner">
|
|
|
<option name="skipTests" value="true" />
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="-8" />
|
|
|
- <option name="y" value="-8" />
|
|
|
+ <component name="ProjectFrameBounds">
|
|
|
+ <option name="x" value="-7" />
|
|
|
<option name="width" value="974" />
|
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
|
@@ -649,12 +636,12 @@
|
|
|
<workItem from="1692338996790" duration="52964000" />
|
|
|
<workItem from="1692691144895" duration="14181000" />
|
|
|
<workItem from="1692753806714" duration="77298000" />
|
|
|
- <workItem from="1693183046072" duration="5178000" />
|
|
|
+ <workItem from="1693183046072" duration="5952000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="930691000" />
|
|
|
+ <option name="totallyTimeSpent" value="931465000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -678,7 +665,7 @@
|
|
|
<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.17697228" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.17697228" />
|
|
|
<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.7149171" />
|
|
|
@@ -881,13 +868,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/UserDataVo.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="148">
|
|
|
- <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/java/com/repair/model/vo/MyRepairRecordVo.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-789">
|
|
|
@@ -1111,13 +1091,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="29647">
|
|
|
- <caret line="1289" column="73" selection-start-line="1289" selection-start-column="73" selection-end-line="1289" selection-end-column="73" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<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="322">
|
|
|
@@ -1265,14 +1238,32 @@
|
|
|
</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="53">
|
|
|
- <caret line="1005" column="86" selection-start-line="1005" selection-start-column="86" selection-end-line="1005" selection-end-column="86" />
|
|
|
+ <state relative-caret-position="407">
|
|
|
+ <caret line="3438" column="74" selection-start-line="3438" selection-start-column="57" selection-end-line="3438" selection-end-column="74" />
|
|
|
<folding>
|
|
|
<element signature="imports" 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="614">
|
|
|
+ <caret line="1210" column="77" lean-forward="true" selection-start-line="1210" selection-start-column="77" selection-end-line="1210" selection-end-column="77" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairSummarizingVo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="667">
|
|
|
+ <caret line="35" column="126" selection-start-line="35" selection-start-column="126" selection-end-line="35" selection-end-column="126" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#652#653#0" expanded="true" />
|
|
|
+ <element signature="e#696#697#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|