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-05 15:59:20 +08:00
parent bf815cd9ae
commit c589707549
3 changed files with 315 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -10,7 +10,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.7" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" /> <output url="file://$PROJECT_DIR$/classes" />
</component> </component>
</project> </project>

644
.idea/workspace.xml generated
View File

@ -6,7 +6,11 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment="" /> <list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment="JLR1.0">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -20,38 +24,98 @@
<file leaf-file-name="CaseDaoImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="CaseDaoImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="326">
<caret line="208" column="37" lean-forward="false" selection-start-line="208" selection-start-column="37" selection-end-line="208" selection-end-column="37" /> <caret line="207" column="13" lean-forward="false" selection-start-line="207" selection-start-column="13" selection-end-line="207" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EnterpriseServiceImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="OrderCheckDaoImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/EnterpriseServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220"> <state relative-caret-position="-858">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" /> <caret line="29" column="41" lean-forward="true" selection-start-line="29" selection-start-column="41" selection-end-line="29" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EnterpriseService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="JLRUser.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/JLRUser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="110">
<caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" /> <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EnterpriseAction.java" pinned="false" current-in-tab="true"> <file leaf-file-name="BaseAction.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/EnterpriseAction.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/BaseAction.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="792">
<caret line="236" column="40" lean-forward="false" selection-start-line="236" selection-start-column="40" selection-end-line="236" selection-end-column="40" /> <caret line="49" column="72" lean-forward="false" selection-start-line="49" selection-start-column="72" selection-end-line="49" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RequestUtil.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/util/RequestUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="888" column="33" lean-forward="false" selection-start-line="888" selection-start-column="33" selection-end-line="888" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserAction.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/UserAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RoleAction.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/RoleAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SupplierAction.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/SupplierAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CasesAction.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="937">
<caret line="171" column="46" lean-forward="false" selection-start-line="171" selection-start-column="46" selection-end-line="171" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CaseDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/CaseDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="19" column="99" lean-forward="false" selection-start-line="19" selection-start-column="99" selection-end-line="19" selection-end-column="99" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -87,7 +151,6 @@
<find>rechangeExportData</find> <find>rechangeExportData</find>
<find>loginEmailBlur</find> <find>loginEmailBlur</find>
<find>putSystemUser</find> <find>putSystemUser</find>
<find>update</find>
<find>rescueState</find> <find>rescueState</find>
<find>showMyInfoDialog</find> <find>showMyInfoDialog</find>
<find>GET_MY</find> <find>GET_MY</find>
@ -98,11 +161,15 @@
<find>recharges_query</find> <find>recharges_query</find>
<find>consume_update</find> <find>consume_update</find>
<find>sou</find> <find>sou</find>
<find>update</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>D:\JLR\JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4\src\main\webapp\css</dir> <dir>D:\JLR\JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4\src\main\webapp\css</dir>
</dirStrings> </dirStrings>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
<option name="externalProjectsViewState"> <option name="externalProjectsViewState">
<projects_view /> <projects_view />
@ -158,10 +225,10 @@
<option value="$PROJECT_DIR$/src/main/webapp/js/business/sue.js" /> <option value="$PROJECT_DIR$/src/main/webapp/js/business/sue.js" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/CasesListServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/CasesListServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" />
<option value="$PROJECT_DIR$/src/main/webapp/page/coupon_consume_query.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/coupon_consume_query.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/CouponServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/CouponServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CouponDaoImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CouponDaoImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" />
</list> </list>
</option> </option>
</component> </component>
@ -223,146 +290,29 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="AndroidView" /> <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="AndroidView" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" /> <item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" type="462c0819:PsiDirectoryNode" /> <item name="JLR-master" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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" />
<item name="action" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
<item name="impl" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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" />
<item name="service" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" 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" />
<item name="service" type="462c0819:PsiDirectoryNode" />
<item name="impl" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="page" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.importing" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="D:/OLD/JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="SDKs" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
</component> </component>
@ -674,11 +624,28 @@
<workItem from="1539568380883" duration="18654000" /> <workItem from="1539568380883" duration="18654000" />
<workItem from="1539654200339" duration="18462000" /> <workItem from="1539654200339" duration="18462000" />
<workItem from="1539739566199" duration="9231000" /> <workItem from="1539739566199" duration="9231000" />
<workItem from="1540174466925" duration="2005000" />
<workItem from="1540435378993" duration="2512000" />
<workItem from="1540518345414" duration="1376000" />
<workItem from="1540776057014" duration="636000" />
<workItem from="1540862528959" duration="50000" />
<workItem from="1540885323426" duration="1564000" />
<workItem from="1541053525040" duration="661000" />
<workItem from="1541136946209" duration="703000" />
<workItem from="1541381110669" duration="11854000" />
</task> </task>
<task id="LOCAL-00001" summary="ceshi">
<created>1540174575886</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1540174575886</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="781611000" /> <option name="totallyTimeSpent" value="802972000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -706,16 +673,16 @@
<window_info id="UI Designer" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65924656" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65924656" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32534248" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32418525" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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="5" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" 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="7" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="6" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66952056" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" /> <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="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="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.25113463" 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.21331316" 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="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="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" /> <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" />
@ -769,6 +736,11 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="ceshi" />
<MESSAGE value="JLR1.0" />
<option name="LAST_COMMIT_MESSAGE" value="JLR1.0" />
</component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
@ -784,106 +756,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/user.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2860">
<caret line="107" column="34" lean-forward="false" selection-start-line="107" selection-start-column="23" selection-end-line="107" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/RoleAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="43" column="8" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="43" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/UserAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="38" column="54" lean-forward="true" selection-start-line="38" selection-start-column="54" selection-end-line="38" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/UserInfoServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="29" column="19" lean-forward="false" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/UserInfoDaoImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="29" column="78" lean-forward="false" selection-start-line="29" selection-start-column="78" selection-end-line="29" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/enterprise.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="209" column="29" lean-forward="false" selection-start-line="209" selection-start-column="29" selection-end-line="209" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/header.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="91" column="126" lean-forward="true" selection-start-line="91" selection-start-column="110" selection-end-line="91" selection-end-column="126" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://D:/JDK/src.zip!/java/lang/StringBuffer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1374">
<caret line="180" column="5" lean-forward="true" selection-start-line="180" selection-start-column="5" selection-end-line="180" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/js/business/coupon.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6688">
<caret line="309" column="24" lean-forward="false" selection-start-line="309" selection-start-column="24" selection-end-line="309" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/coupon_consume.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5258">
<caret line="239" column="0" lean-forward="false" selection-start-line="239" selection-start-column="0" selection-end-line="239" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/home.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
<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="264">
<caret line="136" column="0" lean-forward="false" selection-start-line="136" selection-start-column="0" selection-end-line="298" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/CouponConsumeJlrPO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1232">
<caret line="90" column="24" lean-forward="false" selection-start-line="90" selection-start-column="24" selection-end-line="90" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/vo/ConsumeQueryExcelVO.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/vo/ConsumeQueryExcelVO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="132">
@ -905,19 +777,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/EnterpriseJlr.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="20" column="29" lean-forward="false" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseInfoEnter.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseInfoEnter.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286"> <state relative-caret-position="286">
<caret line="148" column="35" lean-forward="true" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" /> <caret line="148" column="35" lean-forward="true" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -925,23 +788,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124"> <state relative-caret-position="124">
<caret line="227" column="20" lean-forward="false" selection-start-line="227" selection-start-column="20" selection-end-line="227" selection-end-column="20" /> <caret line="227" column="20" lean-forward="false" selection-start-line="227" selection-start-column="20" selection-end-line="227" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/CaseDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="19" column="99" lean-forward="false" selection-start-line="19" selection-start-column="99" selection-end-line="19" selection-end-column="99" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/util/RequestUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18348">
<caret line="859" column="25" lean-forward="false" selection-start-line="859" selection-start-column="25" selection-end-line="859" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -956,9 +802,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318"> <state relative-caret-position="318">
<caret line="229" column="29" lean-forward="false" selection-start-line="229" selection-start-column="29" selection-end-line="229" selection-end-column="29" /> <caret line="229" column="29" lean-forward="false" selection-start-line="229" selection-start-column="29" selection-end-line="229" selection-end-column="29" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -966,7 +809,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="16" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="16" /> <caret line="0" column="16" lean-forward="false" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -974,15 +816,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="772"> <state relative-caret-position="772">
<caret line="292" column="20" lean-forward="false" selection-start-line="507" selection-start-column="31" selection-end-line="507" selection-end-column="132" /> <caret line="292" column="20" lean-forward="false" selection-start-line="507" selection-start-column="31" selection-end-line="507" selection-end-column="132" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/CasesListService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1276">
<caret line="65" column="27" lean-forward="false" selection-start-line="65" selection-start-column="27" selection-end-line="65" selection-end-column="27" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -990,7 +823,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="51" column="19" lean-forward="false" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" /> <caret line="51" column="19" lean-forward="false" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -998,11 +830,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2454"> <state relative-caret-position="-2454">
<caret line="15" column="9" lean-forward="false" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" /> <caret line="15" column="9" lean-forward="false" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
<folding>
<marker date="1539680194234" expanded="true" signature="2260:2284" ph="..." />
<marker date="1539680194234" expanded="true" signature="13096:13102" ph="&amp;nbsp;" />
<marker date="1539680194234" expanded="true" signature="13102:13108" ph="&amp;nbsp;" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1010,17 +837,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3850"> <state relative-caret-position="3850">
<caret line="457" column="24" lean-forward="false" selection-start-line="457" selection-start-column="24" selection-end-line="457" selection-end-column="24" /> <caret line="457" column="24" lean-forward="false" selection-start-line="457" selection-start-column="24" selection-end-line="457" selection-end-column="24" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="171" column="46" lean-forward="false" selection-start-line="171" selection-start-column="46" selection-end-line="171" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1028,7 +844,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="22" column="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" /> <caret line="22" column="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1036,7 +851,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="374">
<caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="38" /> <caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="38" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1044,9 +858,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="315" column="19" lean-forward="false" selection-start-line="315" selection-start-column="19" selection-end-line="315" selection-end-column="19" /> <caret line="315" column="19" lean-forward="false" selection-start-line="315" selection-start-column="19" selection-end-line="315" selection-end-column="19" />
<folding>
<marker date="1536656022589" expanded="true" signature="7770:7785" ph="select count... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1054,7 +865,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3580"> <state relative-caret-position="-3580">
<caret line="22" column="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" /> <caret line="22" column="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1062,7 +872,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="228">
<caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" /> <caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1070,15 +879,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="46" column="26" lean-forward="false" selection-start-line="46" selection-start-column="26" selection-end-line="46" selection-end-column="26" /> <caret line="46" column="26" lean-forward="false" selection-start-line="46" selection-start-column="26" selection-end-line="46" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CouponAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3">
<caret line="159" column="18" lean-forward="true" selection-start-line="159" selection-start-column="18" selection-end-line="159" selection-end-column="18" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1094,7 +894,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278"> <state relative-caret-position="278">
<caret line="36" column="28" lean-forward="false" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" /> <caret line="36" column="28" lean-forward="false" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1102,7 +901,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310"> <state relative-caret-position="310">
<caret line="200" column="19" lean-forward="false" selection-start-line="200" selection-start-column="19" selection-end-line="200" selection-end-column="19" /> <caret line="200" column="19" lean-forward="false" selection-start-line="200" selection-start-column="19" selection-end-line="200" selection-end-column="19" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1110,7 +908,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256"> <state relative-caret-position="256">
<caret line="63" column="30" lean-forward="true" selection-start-line="63" selection-start-column="30" selection-end-line="63" selection-end-column="30" /> <caret line="63" column="30" lean-forward="true" selection-start-line="63" selection-start-column="30" selection-end-line="63" selection-end-column="30" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1118,7 +915,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="19" column="14" lean-forward="false" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" /> <caret line="19" column="14" lean-forward="false" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1126,7 +922,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="208">
<caret line="22" column="21" lean-forward="false" selection-start-line="22" selection-start-column="21" selection-end-line="22" selection-end-column="21" /> <caret line="22" column="21" lean-forward="false" selection-start-line="22" selection-start-column="21" selection-end-line="22" selection-end-column="21" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1134,15 +929,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="186">
<caret line="19" column="14" lean-forward="false" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" /> <caret line="19" column="14" lean-forward="false" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1738">
<caret line="25" column="14" lean-forward="false" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1150,7 +936,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308"> <state relative-caret-position="308">
<caret line="68" column="20" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="20" /> <caret line="68" column="20" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1158,38 +943,189 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1992"> <state relative-caret-position="-1992">
<caret line="24" column="9" lean-forward="false" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" /> <caret line="24" column="9" lean-forward="false" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/EnterpriseAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110">
<caret line="236" column="40" lean-forward="false" selection-start-line="236" selection-start-column="40" selection-end-line="236" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/BaseRole.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="19" column="32" lean-forward="false" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/EnterpriseDaoImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2046">
<caret line="103" column="13" lean-forward="false" selection-start-line="103" selection-start-column="13" selection-end-line="103" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/EnterpriseServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/CasesListService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1276">
<caret line="65" column="27" lean-forward="false" selection-start-line="65" selection-start-column="27" selection-end-line="65" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/BaseDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/BaseDaoImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application/applicationContext-hibernate.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="48" lean-forward="false" selection-start-line="16" selection-start-column="41" selection-end-line="16" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/business/applicationContext-customer.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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/resources/business/applicationContext-zengwp.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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/resources/eache/applicationContext-eache.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="61" lean-forward="false" selection-start-line="11" selection-start-column="61" selection-end-line="11" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CouponAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3146">
<caret line="159" column="18" lean-forward="false" selection-start-line="159" selection-start-column="18" selection-end-line="159" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/EnterpriseJlr.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="20" column="29" lean-forward="false" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/pojo/JLRUser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/BaseAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="49" column="72" lean-forward="false" selection-start-line="49" selection-start-column="72" selection-end-line="49" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/util/RequestUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="888" column="33" lean-forward="false" selection-start-line="888" selection-start-column="33" selection-end-line="888" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/UserAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/RoleAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/SupplierAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="937">
<caret line="171" column="46" lean-forward="false" selection-start-line="171" selection-start-column="46" selection-end-line="171" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/CaseDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="19" column="99" lean-forward="false" selection-start-line="19" selection-start-column="99" selection-end-line="19" selection-end-column="99" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="326">
<caret line="208" column="37" lean-forward="false" selection-start-line="208" selection-start-column="37" selection-end-line="208" selection-end-column="37" /> <caret line="207" column="13" lean-forward="false" selection-start-line="207" selection-start-column="13" selection-end-line="207" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/EnterpriseServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220"> <state relative-caret-position="-858">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" /> <caret line="29" column="41" lean-forward="true" selection-start-line="29" selection-start-column="41" selection-end-line="29" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/EnterpriseAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="236" column="40" lean-forward="false" selection-start-line="236" selection-start-column="40" selection-end-line="236" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>

49
src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java
View File

@ -34,7 +34,7 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
pageInfo.setRows(UtilTools.getRows(request)); pageInfo.setRows(UtilTools.getRows(request));
//sql动态拼接 //sql动态拼接
StringBuffer sql=null; StringBuffer sql=null;
//如果state为0则证明此操作为管理员，否则是经销商 //如果state为0则证明此操作为JLR总账号，否则是经销商
if("0".equals(state)){ if("0".equals(state)){
if("1".equals(rescueState)){ if("1".equals(rescueState)){
sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," + sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," +
@ -91,9 +91,8 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join base_service b on b.id=u.service_id " + "left join base_service b on b.id=u.service_id " +
"left join jlr_supplier_visual v on v.supplier_id=s.id " + "left join jlr_supplier_visual v on v.supplier_id=s.id " +
"where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") " + "where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") " +
"and u.order_status not in (51,53,55)"); "and u.order_status = 31 " +
// "and u.order_status = 31 " + "and v.jlr_user_id =" + logininfo.getId());
// "and v.jlr_user_id =" + logininfo.getId());
}else if("2".equals(rescueState)){ }else if("2".equals(rescueState)){
sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," + sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," +
"u.vin_no vin_no,s.name name," + "u.vin_no vin_no,s.name name," +
@ -102,9 +101,9 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join supplier s on t.service_supplier_id=s.id " + "left join supplier s on t.service_supplier_id=s.id " +
"left join base_service b on b.id=u.service_id " + "left join base_service b on b.id=u.service_id " +
"left join jlr_supplier_visual v on v.supplier_id=s.id " + "left join jlr_supplier_visual v on v.supplier_id=s.id " +
"where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") "); "where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") "+
// "and u.order_status = 55 " + "and u.order_status = 55 " +
// "and v.jlr_user_id =" + logininfo.getId()); "and v.jlr_user_id =" + logininfo.getId());
}else if("3".equals(rescueState)){ }else if("3".equals(rescueState)){
sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," + sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time create_time," +
"u.vin_no vin_no,s.name name," + "u.vin_no vin_no,s.name name," +
@ -113,9 +112,9 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join supplier s on t.service_supplier_id=s.id " + "left join supplier s on t.service_supplier_id=s.id " +
"left join base_service b on b.id=u.service_id " + "left join base_service b on b.id=u.service_id " +
"left join jlr_supplier_visual v on v.supplier_id=s.id " + "left join jlr_supplier_visual v on v.supplier_id=s.id " +
"where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") "); "where u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+") "+
// "and u.order_status = 51 " + "and u.order_status = 51 " +
// "and v.jlr_user_id =" + logininfo.getId()); "and v.jlr_user_id =" + logininfo.getId());
}else { }else {
sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time " + sql = new StringBuffer("select DISTINCT u.code orderCode,u.create_time " +
"create_time,u.vin_no vin_no,s.name name, " + "create_time,u.vin_no vin_no,s.name name, " +
@ -132,9 +131,9 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join base_service b on b.id=u.service_id " + "left join base_service b on b.id=u.service_id " +
"left join jlr_supplier_visual v on v.supplier_id=s.id " + "left join jlr_supplier_visual v on v.supplier_id=s.id " +
"where " + "where " +
"u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id =" + logininfo.getId() + ")") ; "u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id =" + logininfo.getId() + ")"+
// "and u.order_status in (31,53,51,55) " + "and u.order_status in (31,53,51,55) " +
// "and v.jlr_user_id =" + logininfo.getId()); "and v.jlr_user_id =" + logininfo.getId());
} }
} }
if (StringUtils.isNotBlank(frame_code)) { if (StringUtils.isNotBlank(frame_code)) {
@ -205,7 +204,7 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join base_service b on b.id=u.service_id "+ "left join base_service b on b.id=u.service_id "+
"left join jlr_epqr w on w.task_order_id = u.tid " + "left join jlr_epqr w on w.task_order_id = u.tid " +
"where b.id in (1041,1050,1500,1501,1520,1521) " + "where b.id in (1041,1050,1500,1501,1520,1521) " +
"and u.order_status in (21,23,25,28,31) " + // "and u.order_status in (21,23,25,28,31) " +
"and w.state = 1 " + "and w.state = 1 " +
"and u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+")"); "and u.contract_id in (select contract_id from jlr_contract_visual where jlr_user_id ="+logininfo.getId()+")");
}else{ }else{
@ -224,7 +223,7 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join jlr_epqr w on w.task_order_id = u.tid " + "left join jlr_epqr w on w.task_order_id = u.tid " +
"left join base_service b on b.id=u.service_id "+ "left join base_service b on b.id=u.service_id "+
"where b.id in (1041,1050,1500,1501,1520,1521) " + "where b.id in (1041,1050,1500,1501,1520,1521) " +
"and u.order_status in (21,23,25,28,31) " + // "and u.order_status in (21,23,25,28,31) " +
"and u.destination_code in (select contract_destination_id from jlr_destination_visual where jlr_user_id ="+logininfo.getId()+")"); "and u.destination_code in (select contract_destination_id from jlr_destination_visual where jlr_user_id ="+logininfo.getId()+")");
} }
if (StringUtils.isNotBlank(frame_code)) { if (StringUtils.isNotBlank(frame_code)) {
@ -292,22 +291,22 @@ public class CaseDaoImpl extends BaseDaoHibernate implements CaseDao {
"left join supplier s on u.service_supplier_id = s.id "+ "left join supplier s on u.service_supplier_id = s.id "+
"left join base_service b on b.id = u.service_id " + "left join base_service b on b.id = u.service_id " +
"left join contract_member_service_group m on u.member_service_group_id=m.id " + "left join contract_member_service_group m on u.member_service_group_id=m.id " +
"left join contract_trouble_level j on j.id = u.malfunction_level1 " + "left join contract_trouble_level j on j.id = u.malfunction_level1 " +
"left join contract_destination d on d.id = u.contract_destination_id " + "left join contract_destination d on d.id = u.contract_destination_id " +
"left join jlr_epqr e on e.task_order_id = u.tid " + "left join jlr_epqr e on e.task_order_id = u.tid " +
"where u.id = '" + caseCode+"'"); "where u.id = '" + caseCode+"'");
if (StringUtils.isNotBlank(tid)) { if (StringUtils.isNotBlank(tid)) {
sql.append(" and u.tid = '" + tid +"'"); sql.append(" and u.tid = '" + tid +"'");
} }
try { try {
//获取案件详情信息 //获取案件详情信息
List list = getRsBySql(sql.toString()); List list = getRsBySql(sql.toString());
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
vo.setRows(UtilTools.listTojsonArray(list, new String[]{"UID","TID","ORDER_CODE", "CREATE_TIME", "VIN_NO", "NAME", "CODE", "SERVICE_NAME", "MODEL", "PLATENUMBER", "STARTTIME", "LEVELNAME1", "FINISHTIME", "LEVELNAME2", "DNAME", "BRANDNAME", "DMS", "REASON", "MILEAGE", "DNUMBER", "ARRIVETIME", "REMARK", "CHOICE", "PART", "REPAIR", "REFTIME", "FINTIME", "HANDTIME", "USETIME","STATE"})); vo.setRows(UtilTools.listTojsonArray(list, new String[]{"UID","TID","ORDER_CODE", "CREATE_TIME", "VIN_NO", "NAME", "CODE", "SERVICE_NAME", "MODEL", "PLATENUMBER", "STARTTIME", "LEVELNAME1", "FINISHTIME", "LEVELNAME2", "DNAME", "BRANDNAME", "DMS", "REASON", "MILEAGE", "DNUMBER", "ARRIVETIME", "REMARK", "CHOICE", "PART", "REPAIR", "REFTIME", "FINTIME", "HANDTIME", "USETIME","STATE"}));
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
return vo; return vo;
} }