Skip to content

M
manager
Commit e37f1f12 by manxiaoqiang
Options

客户表

parent 0e60f9ae
Showing with 193 additions and 263 deletions
.idea/workspace.xml
......@@ -3,7 +3,9 @@
<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$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -24,119 +26,66 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
<state relative-caret-position="529">
<caret line="35" column="71" lean-forward="true" selection-start-line="35" selection-start-column="71" selection-end-line="35" selection-end-column="71" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="logback.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
<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="-646">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="206">
<caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="63" column="0" lean-forward="false" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1316#1317#0" expanded="false" />
<element signature="e#1356#1357#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false">
<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="276">
<caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
<state relative-caret-position="136">
<caret line="91" column="33" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<file leaf-file-name="SalesManLeader.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/SalesManLeader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="46" column="16" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
<state relative-caret-position="115">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountFlowRestrictService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<file leaf-file-name="SalesManLeaderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<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" />
<state relative-caret-position="299">
<caret line="18" column="33" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
<state relative-caret-position="115">
<caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Account4Web.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
<folding>
<element signature="e#2336#2337#0" expanded="true" />
<element signature="e#2364#2365#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="414">
<caret line="30" column="55" lean-forward="false" selection-start-line="30" selection-start-column="55" selection-end-line="30" selection-end-column="55" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1474#1475#0" expanded="false" />
<element signature="e#1551#1552#0" expanded="false" />
</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="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -207,7 +156,6 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
<option value="$PROJECT_DIR$/src/main/java/track/model/MeasuresTrackNew.java" />
......@@ -218,14 +166,12 @@
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
......@@ -244,6 +190,9 @@
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
</list>
</option>
</component>
......@@ -338,6 +287,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -560,67 +511,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="task" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controller" />
<option name="myItemId" value="dic" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -652,9 +543,7 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -1152,14 +1041,8 @@
<workItem from="1517447750893" duration="11115000" />
<workItem from="1517533917524" duration="7763000" />
<workItem from="1517902340876" duration="6159000" />
<workItem from="1522052551509" duration="4324000" />
</task>
<task id="LOCAL-00047" summary="合同">
<created>1516187770796</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1516187770796</updated>
<workItem from="1522052551509" duration="6896000" />
<workItem from="1522202547904" duration="3680000" />
</task>
<task id="LOCAL-00048" summary="合同">
<created>1516244162355</created>
......@@ -1497,11 +1380,18 @@
<option name="project" value="LOCAL" />
<updated>1522060257129</updated>
</task>
<option name="localTasksCounter" value="96" />
<task id="LOCAL-00096" summary="客户表&#10;&#10;&#10;">
<created>1522060643031</created>
<option name="number" value="00096" />
<option name="presentableId" value="LOCAL-00096" />
<option name="project" value="LOCAL" />
<updated>1522060643031</updated>
</task>
<option name="localTasksCounter" value="97" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="347858000" />
<option name="totallyTimeSpent" value="354110000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1654,41 +1544,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="63" column="52" lean-forward="true" selection-start-line="63" selection-start-column="52" selection-end-line="63" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="31" column="73" lean-forward="false" selection-start-line="31" selection-start-column="73" selection-end-line="31" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="162" column="13" lean-forward="true" selection-start-line="162" selection-start-column="13" selection-end-line="162" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1493">
<caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
......@@ -1812,20 +1667,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275">
<caret line="319" column="22" lean-forward="true" selection-start-line="319" selection-start-column="22" selection-end-line="319" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="40" column="15" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
......@@ -1851,7 +1692,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
......@@ -1880,7 +1720,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-161">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1903,14 +1742,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="20" />
</state>
</provider>
</entry>
......@@ -1943,107 +1774,157 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2691">
<caret line="144" column="73" lean-forward="false" selection-start-line="144" selection-start-column="73" selection-end-line="144" selection-end-column="73" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#7549#7550#0" expanded="false" />
<element signature="e#7605#7606#0" expanded="false" />
</folding>
<state relative-caret-position="3312">
<caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="30" column="55" lean-forward="false" selection-start-line="30" selection-start-column="55" selection-end-line="30" selection-end-column="55" />
<state relative-caret-position="1587">
<caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1474#1475#0" expanded="false" />
<element signature="e#1551#1552#0" expanded="false" />
<element signature="e#2336#2337#0" expanded="false" />
<element signature="e#2364#2365#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
<folding>
<element signature="imports" expanded="false" />
</folding>
<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="345">
<caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.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/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<state relative-caret-position="943">
<caret line="63" column="0" lean-forward="false" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1316#1317#0" expanded="false" />
<element signature="e#1356#1357#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
<state relative-caret-position="851">
<caret line="58" column="71" lean-forward="false" selection-start-line="58" selection-start-column="71" selection-end-line="58" selection-end-column="71" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
<folding>
<element signature="e#2336#2337#0" expanded="true" />
<element signature="e#2364#2365#0" expanded="true" />
</folding>
<state relative-caret-position="138">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
<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" />
<caret line="10" column="22" lean-forward="false" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
<state relative-caret-position="115">
<caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-646">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="92">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="46" column="16" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
<state relative-caret-position="125">
<caret line="31" column="15" lean-forward="false" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
<state relative-caret-position="115">
<caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="27" />
<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="206">
<caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="18" column="33" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/SalesManLeader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<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="136">
<caret line="91" column="33" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="33" />
<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="529">
<caret line="35" column="71" lean-forward="true" selection-start-line="35" selection-start-column="71" selection-end-line="35" selection-end-column="71" />
<folding />
</state>
</provider>
......
src/main/java/tkio/controller/TkioAccountController.java
......@@ -24,6 +24,23 @@ public class TkioAccountController {
@Autowired
TkioAccountService tkioAccountService;
//sale
@RequestMapping(value = "/findSale", method = RequestMethod.GET)
@ResponseBody
public ResultModel findSale(@CurrentAccount User loginAccount, @RequestParam(required = false) Long sale) {
return ResultModel.OK(tkioAccountService.findSale(loginAccount, sale));
}
//sale
@RequestMapping(value = "/update/sale", method = RequestMethod.PUT)
@ResponseBody
public ResultModel updateSale(@CurrentAccount User loginAccount,
@RequestParam String email, @RequestParam String accountEmail) {
return ResultModel.OK(tkioAccountService.updateSale(email, accountEmail));
}
//客户列表
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
......
src/main/java/tkio/service/TkioAccountService.java
......@@ -9,6 +9,10 @@ import java.util.Map;
* Created by mxq on 2017/12/26.
*/
public interface TkioAccountService {
Map<String, Object> findSale(User user, Long sale);
Account4Web updateSale(String email, String account);
List<Account4Web> findAll(User user);
Account4Web findOne(String email);
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
......@@ -7,6 +7,7 @@ import common.service.UserService;
import dic.RoleEnum;
import dic.RoleTypeEnum;
import org.apache.commons.collections.map.AbstractMapDecorator;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.collections4.list.TreeList;
import org.json.JSONArray;
import org.json.JSONException;
......@@ -74,6 +75,33 @@ public class TkioAccountServiceImpl implements TkioAccountService {
ReminderLevelRepository reminderLevelRepository;
@Override
public Map<String, Object> findSale(User user, Long sale) {
Map<String, Object> map = new HashMap();
String email = null;
if(null != sale){
email = salesManLeaderRepository.findLeaderByBussinessMan(sale);
User user1 = userRepository.findByEmail(email);
map.put("old", user1.getName());
}
List<User> list = userService.findbyRole(user.getRole());
map.put("new", list);
return map;
}
@Override
public Account4Web updateSale(String email, String account) {
Account accountTkio = accountRepository.findByEmail(account);
Account4Web account4Web = account4WebRepository.findByEmail(account);
SalesManLeader leader = salesManLeaderRepository.findOneByEmail(email);
accountTkio.setBussinessman(Long.parseLong(leader.getId()+""));
accountRepository.save(accountTkio);
account4Web.setBussinessMan(Long.parseLong(leader.getId()+""));
return account4WebRepository.save(account4Web);
}
@Override
public List<Account4Web> findAll(User user) {
List<Account4Web> result = new ArrayList<>();
List<Account4Web> account4WebList = null;
......
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