sunbo/jlr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JLR1.0

Browse Source
This commit is contained in:
sunrich
2018-11-21 10:39:17 +08:00
parent 1364fe53a4
commit 9d773f6102
3 changed files with 80 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
.idea/workspace.xml generated
View File

@ -8,6 +8,8 @@
<component name="ChangeListManager">
<list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -22,60 +24,29 @@
<file leaf-file-name="caseDetails.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6587">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="682">
<caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="true">
<file leaf-file-name="footer.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7410">
<caret line="947" column="31" lean-forward="true" selection-start-line="947" selection-start-column="31" selection-end-line="947" selection-end-column="31" />
<folding>
<element signature="e#1565#1597#0#HTML" expanded="true" />
<element signature="e#1787#1829#0#HTML" expanded="true" />
<element signature="e#1885#1903#0#HTML" expanded="true" />
<element signature="e#14265#14291#0#HTML" expanded="true" />
<element signature="e#14384#14410#0#HTML" expanded="true" />
<element signature="e#14831#14857#0#HTML" expanded="true" />
<element signature="e#14946#14972#0#HTML" expanded="true" />
<element signature="e#15187#15213#0#HTML" expanded="true" />
<element signature="e#15392#15418#0#HTML" expanded="true" />
<element signature="e#15602#15628#0#HTML" expanded="true" />
<element signature="e#15990#16016#0#HTML" expanded="true" />
<element signature="e#16439#16465#0#HTML" expanded="true" />
<element signature="e#16590#16616#0#HTML" expanded="true" />
<element signature="e#16800#16826#0#HTML" expanded="true" />
<element signature="e#16978#17004#0#HTML" expanded="true" />
<element signature="e#17220#17246#0#HTML" expanded="true" />
<element signature="e#17362#17388#0#HTML" expanded="true" />
<element signature="e#17684#17732#0#HTML" expanded="true" />
<element signature="e#17946#18000#0#HTML" expanded="true" />
<element signature="e#27118#27172#0#HTML" expanded="true" />
<element signature="e#27327#27353#0#HTML" expanded="true" />
<element signature="e#27525#27555#0#HTML" expanded="true" />
<element signature="e#28226#28244#0#HTML" expanded="true" />
<element signature="e#28340#28380#0#HTML" expanded="true" />
<element signature="e#28531#28561#0#HTML" expanded="true" />
<element signature="e#28680#28706#0#HTML" expanded="true" />
<element signature="e#28893#28923#0#HTML" expanded="true" />
<element signature="e#29384#29402#0#HTML" expanded="true" />
<element signature="e#29497#29537#0#HTML" expanded="true" />
<element signature="e#29767#29807#0#HTML" expanded="true" />
<element signature="e#30102#30128#0#HTML" expanded="true" />
<element signature="e#30718#30736#0#HTML" expanded="true" />
<element signature="e#30925#30964#0#HTML" expanded="true" />
<element signature="e#31700#31740#0#HTML" expanded="true" />
<element signature="e#32436#32476#0#HTML" expanded="true" />
<element signature="e#33189#33229#0#HTML" expanded="true" />
<element signature="e#33357#33387#0#HTML" expanded="true" />
<element signature="e#33692#33732#0#HTML" expanded="true" />
<element signature="e#34586#34625#0#HTML" expanded="true" />
<element signature="e#35383#35423#0#HTML" expanded="true" />
</folding>
<state relative-caret-position="3951">
<caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
@ -90,44 +61,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="footer.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-264">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1542767267214" expanded="true" signature="7766:8630" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="7962:8026" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8042:8621" ph="{&quot;type&quot;: &quot;POST&quot;...}" />
<marker date="1542767267214" expanded="true" signature="8281:8339" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8378:8611" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8467:8535" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8541:8597" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8657:8811" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8740:8800" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8846:9255" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9063:9105" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9111:9249" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9284:10511" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9353:10505" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9509:10493" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9642:10363" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9685:9781" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9811:10272" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9922:10250" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10047:10224" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10278:10345" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10659:10699" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10740:11165" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10860:10905" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10919:11159" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11097:11149" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11559:11609" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -175,6 +108,7 @@
</dirStrings>
</component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GradleLocalSettings">
@ -198,7 +132,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/SupplierAction.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java" />
<option value="$PROJECT_DIR$/src/main/webapp/js/business/cases.js" />
<option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/user.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/js/business/enterprise.js" />
@ -236,6 +169,7 @@
<option value="$PROJECT_DIR$/src/main/webapp/page/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/home.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
</list>
</option>
</component>
@ -316,40 +250,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="jlr" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="jlr" type="462c0819:PsiDirectoryNode" />
<item name="business" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
@ -710,7 +610,7 @@
<workItem from="1542266860375" duration="629000" />
<workItem from="1542590853085" duration="13495000" />
<workItem from="1542677147951" duration="22239000" />
<workItem from="1542763435853" duration="1542000" />
<workItem from="1542763435853" duration="2153000" />
</task>
<task id="LOCAL-00001" summary="ceshi">
<created>1540174575886</created>
@ -740,11 +640,18 @@
<option name="project" value="LOCAL" />
<updated>1542767322708</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="JLR1.0">
<created>1542767331334</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1542767331334</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="868735000" />
<option name="totallyTimeSpent" value="869346000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -781,7 +688,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6689537" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25340393" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20953101" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29198185" sideWeight="0.5068493" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
@ -1223,14 +1130,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6587">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3828">
@ -1239,88 +1138,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-264">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1542767267214" expanded="true" signature="7766:8630" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="7962:8026" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8042:8621" ph="{&quot;type&quot;: &quot;POST&quot;...}" />
<marker date="1542767267214" expanded="true" signature="8281:8339" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8378:8611" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8467:8535" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8541:8597" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8657:8811" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8740:8800" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8846:9255" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9063:9105" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9111:9249" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9284:10511" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9353:10505" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9509:10493" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9642:10363" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9685:9781" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9811:10272" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9922:10250" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10047:10224" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10278:10345" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10659:10699" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10740:11165" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10860:10905" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10919:11159" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11097:11149" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11559:11609" ph="{...}" />
</folding>
<state relative-caret-position="682">
<caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7410">
<caret line="947" column="31" lean-forward="true" selection-start-line="947" selection-start-column="31" selection-end-line="947" selection-end-column="31" />
<folding>
<element signature="e#1565#1597#0#HTML" expanded="true" />
<element signature="e#1787#1829#0#HTML" expanded="true" />
<element signature="e#1885#1903#0#HTML" expanded="true" />
<element signature="e#14265#14291#0#HTML" expanded="true" />
<element signature="e#14384#14410#0#HTML" expanded="true" />
<element signature="e#14831#14857#0#HTML" expanded="true" />
<element signature="e#14946#14972#0#HTML" expanded="true" />
<element signature="e#15187#15213#0#HTML" expanded="true" />
<element signature="e#15392#15418#0#HTML" expanded="true" />
<element signature="e#15602#15628#0#HTML" expanded="true" />
<element signature="e#15990#16016#0#HTML" expanded="true" />
<element signature="e#16439#16465#0#HTML" expanded="true" />
<element signature="e#16590#16616#0#HTML" expanded="true" />
<element signature="e#16800#16826#0#HTML" expanded="true" />
<element signature="e#16978#17004#0#HTML" expanded="true" />
<element signature="e#17220#17246#0#HTML" expanded="true" />
<element signature="e#17362#17388#0#HTML" expanded="true" />
<element signature="e#17684#17732#0#HTML" expanded="true" />
<element signature="e#17946#18000#0#HTML" expanded="true" />
<element signature="e#27118#27172#0#HTML" expanded="true" />
<element signature="e#27327#27353#0#HTML" expanded="true" />
<element signature="e#27525#27555#0#HTML" expanded="true" />
<element signature="e#28226#28244#0#HTML" expanded="true" />
<element signature="e#28340#28380#0#HTML" expanded="true" />
<element signature="e#28531#28561#0#HTML" expanded="true" />
<element signature="e#28680#28706#0#HTML" expanded="true" />
<element signature="e#28893#28923#0#HTML" expanded="true" />
<element signature="e#29384#29402#0#HTML" expanded="true" />
<element signature="e#29497#29537#0#HTML" expanded="true" />
<element signature="e#29767#29807#0#HTML" expanded="true" />
<element signature="e#30102#30128#0#HTML" expanded="true" />
<element signature="e#30718#30736#0#HTML" expanded="true" />
<element signature="e#30925#30964#0#HTML" expanded="true" />
<element signature="e#31700#31740#0#HTML" expanded="true" />
<element signature="e#32436#32476#0#HTML" expanded="true" />
<element signature="e#33189#33229#0#HTML" expanded="true" />
<element signature="e#33357#33387#0#HTML" expanded="true" />
<element signature="e#33692#33732#0#HTML" expanded="true" />
<element signature="e#34586#34625#0#HTML" expanded="true" />
<element signature="e#35383#35423#0#HTML" expanded="true" />
</folding>
<state relative-caret-position="3951">
<caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>