Skip to content

M
manager
Commit c940e6dd by manxiaoqiang
Options

Merge remote-tracking branch 'remotes/origin/20180328_sale' into 9637230e

* remotes/origin/20180328_sale: 客户表 客户表 客户表 客户表 客户表 # Conflicts: # .idea/workspace.xml
parent 94b5a00a
Showing with 94 additions and 99 deletions
.idea/workspace.xml
......@@ -3,9 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
......@@ -27,11 +25,41 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="31" column="53" lean-forward="false" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="96" column="9" lean-forward="false" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="137" column="42" lean-forward="true" selection-start-line="137" selection-start-column="42" selection-end-line="137" selection-end-column="42" />
<state relative-caret-position="2346">
<caret line="137" column="42" lean-forward="false" selection-start-line="137" selection-start-column="42" selection-end-line="137" selection-end-column="42" />
<folding />
</state>
</provider>
......@@ -40,18 +68,18 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="71" column="55" lean-forward="true" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" />
<state relative-caret-position="1633">
<caret line="71" column="55" lean-forward="false" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="14" column="82" lean-forward="true" selection-start-line="14" selection-start-column="82" selection-end-line="14" selection-end-column="82" />
<state relative-caret-position="322">
<caret line="14" column="81" lean-forward="true" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding />
</state>
</provider>
......@@ -60,7 +88,7 @@
<file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<state relative-caret-position="-599">
<caret line="79" column="93" lean-forward="false" selection-start-line="79" selection-start-column="93" selection-end-line="79" selection-end-column="93" />
<folding />
</state>
......@@ -70,7 +98,7 @@
<file leaf-file-name="AccountFlowRestrictServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<state relative-caret-position="4071">
<caret line="194" column="19" lean-forward="false" selection-start-line="194" selection-start-column="19" selection-end-line="194" selection-end-column="19" />
<folding />
</state>
......@@ -81,7 +109,7 @@
<entry file="file://$PROJECT_DIR$/src/main/resources/common.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="16" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<caret line="0" column="16" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -192,7 +220,6 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/model/Account.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
......@@ -200,6 +227,7 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
</list>
</option>
......@@ -1177,13 +1205,6 @@
<workItem from="1523843445576" duration="7238000" />
<workItem from="1523876594256" duration="75800000" />
</task>
<task id="LOCAL-00052" summary="合同">
<created>1516671393123</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1516671393124</updated>
</task>
<task id="LOCAL-00053" summary="合同">
<created>1516674172587</created>
<option name="number" value="00053" />
......@@ -1520,11 +1541,18 @@
<option name="project" value="LOCAL" />
<updated>1524449063751</updated>
</task>
<option name="localTasksCounter" value="101" />
<task id="LOCAL-00101" summary="Merge remote-tracking branch 'remotes/origin/20180328_sale' into 20180411&#10;&#10;* remotes/origin/20180328_sale:&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;">
<created>1524452409522</created>
<option name="number" value="00101" />
<option name="presentableId" value="LOCAL-00101" />
<option name="project" value="LOCAL" />
<updated>1524452409522</updated>
</task>
<option name="localTasksCounter" value="102" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="463147000" />
<option name="totallyTimeSpent" value="463543000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1547,8 +1575,8 @@
<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="3" 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.33" sideWeight="0.5" order="1" 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="5" 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.5155483" sideWeight="0.49546143" 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.54664487" sideWeight="0.49016643" order="9" 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.5155483" sideWeight="0.49546143" 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.3289689" sideWeight="0.5" order="3" 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.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2927383" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
......@@ -1658,7 +1686,8 @@
<MESSAGE value="Merge remote-tracking branch 'remotes/origin/feature_20180116_new'&#10;&#10;* remotes/origin/feature_20180116_new:&#10; 客户表-1&#10; app排序&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
<MESSAGE value="客户表&#10;&#10;&#10;" />
<MESSAGE value="二版&#10;&#10;&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="二版&#10;&#10;&#10;" />
<MESSAGE value="Merge remote-tracking branch 'remotes/origin/20180328_sale' into 20180411&#10;&#10;* remotes/origin/20180328_sale:&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'remotes/origin/20180328_sale' into 20180411&#10;&#10;* remotes/origin/20180328_sale:&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10; 客户表&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1682,7 +1711,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="9" lean-forward="false" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -1690,7 +1718,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="9" lean-forward="false" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -1698,7 +1725,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="21" column="16" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
......@@ -1714,7 +1740,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
......@@ -1739,9 +1764,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1286">
<caret line="70" column="9" lean-forward="false" selection-start-line="70" selection-start-column="9" selection-end-line="70" selection-end-column="9" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1749,7 +1771,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="20" column="19" lean-forward="false" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
......@@ -1757,7 +1778,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="14" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
......@@ -1765,7 +1785,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
......@@ -1773,7 +1792,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
......@@ -1781,7 +1799,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
......@@ -1805,7 +1822,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
......@@ -1813,7 +1829,6 @@
<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>
......@@ -1857,9 +1872,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="10" column="8" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1867,9 +1879,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="60" column="22" lean-forward="false" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1885,7 +1894,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="51" column="63" lean-forward="true" selection-start-line="51" selection-start-column="63" selection-end-line="51" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
......@@ -1893,7 +1901,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="50" column="9" lean-forward="false" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -1909,12 +1916,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="734">
<caret line="62" column="37" lean-forward="false" selection-start-line="62" selection-start-column="37" selection-end-line="62" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1199#1200#0" expanded="true" />
<element signature="e#1255#1256#0" expanded="true" />
<element signature="e#1303#1304#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1922,7 +1923,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="17" column="25" lean-forward="false" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
......@@ -1942,7 +1942,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" column="42" lean-forward="false" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
......@@ -1958,33 +1957,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="36" column="57" lean-forward="false" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="13" column="16" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="112" column="58" lean-forward="false" selection-start-line="112" selection-start-column="58" selection-end-line="112" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
......@@ -2008,7 +1980,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-300">
<caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -2016,7 +1987,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -2024,7 +1994,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="39" column="54" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
......@@ -2040,7 +2009,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="15" column="21" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
......@@ -2048,7 +2016,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
......@@ -2063,23 +2030,23 @@
<entry file="file://$PROJECT_DIR$/src/main/resources/common.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="16" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<caret line="0" column="16" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="137" column="42" lean-forward="true" selection-start-line="137" selection-start-column="42" selection-end-line="137" selection-end-column="42" />
<state relative-caret-position="2346">
<caret line="137" column="42" lean-forward="false" selection-start-line="137" selection-start-column="42" selection-end-line="137" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="71" column="55" lean-forward="true" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" />
<state relative-caret-position="1633">
<caret line="71" column="55" lean-forward="false" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" />
<folding />
</state>
</provider>
......@@ -2088,21 +2055,36 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<state relative-caret-position="4071">
<caret line="194" column="19" lean-forward="false" selection-start-line="194" selection-start-column="19" selection-end-line="194" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="31" column="53" lean-forward="false" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<state relative-caret-position="-599">
<caret line="79" column="93" lean-forward="false" selection-start-line="79" selection-start-column="93" selection-end-line="79" selection-end-column="93" />
<folding />
</state>
......@@ -2110,8 +2092,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="14" column="82" lean-forward="true" selection-start-line="14" selection-start-column="82" selection-end-line="14" selection-end-column="82" />
<state relative-caret-position="322">
<caret line="14" column="81" lean-forward="true" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="96" column="9" lean-forward="false" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" />
<folding />
</state>
</provider>
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
......@@ -89,7 +89,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
User user1 = userRepository.findByEmail(one.getEmail());
map.put("old", user1.getName());
}
List<User> list = userService.findbyRole(user.getRole());
List<User> list = new ArrayList<>();
if(user.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey()) || user.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey())){
list = userService.findbyRole(user.getRole());
}else {
list = userRepository.findSales();
}
map.put("new", list);
return map;
}
......
src/main/resources/spring/applicationContext-schedule.xml
......@@ -12,7 +12,7 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 45 10 * * ?"/>
<task:scheduled ref="tkioAccountTask" method="task" cron="0 1 11 * * ?"/>
</task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment