Skip to content

M
manager
Commit 7b876782 by manxiaoqiang
Options

客户表

parent 24a9694b
Showing with 40 additions and 39 deletions
.idea/workspace.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.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/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
</list> </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" />
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="true"> <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="299">
<caret line="38" column="96" lean-forward="true" selection-start-line="38" selection-start-column="96" selection-end-line="38" selection-end-column="96" /> <caret line="31" column="51" lean-forward="true" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -37,18 +37,18 @@ ...@@ -37,18 +37,18 @@
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="183">
<caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="321">
<caret line="91" column="33" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="33" /> <caret line="83" column="44" lean-forward="true" selection-start-line="83" selection-start-column="44" selection-end-line="83" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<file leaf-file-name="SalesManLeaderRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="SalesManLeaderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299"> <state relative-caret-position="161">
<caret line="18" column="33" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="33" /> <caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -189,8 +189,8 @@ ...@@ -189,8 +189,8 @@
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.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/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/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" /> <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1040,14 +1040,7 @@ ...@@ -1040,14 +1040,7 @@
<workItem from="1517533917524" duration="7763000" /> <workItem from="1517533917524" duration="7763000" />
<workItem from="1517902340876" duration="6159000" /> <workItem from="1517902340876" duration="6159000" />
<workItem from="1522052551509" duration="6896000" /> <workItem from="1522052551509" duration="6896000" />
<workItem from="1522202547904" duration="4115000" /> <workItem from="1522202547904" duration="5468000" />
</task>
<task id="LOCAL-00049" summary="合同">
<created>1516272512766</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1516272512766</updated>
</task> </task>
<task id="LOCAL-00050" summary="合同"> <task id="LOCAL-00050" summary="合同">
<created>1516592276562</created> <created>1516592276562</created>
...@@ -1385,11 +1378,18 @@ ...@@ -1385,11 +1378,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1522220736134</updated> <updated>1522220736134</updated>
</task> </task>
<option name="localTasksCounter" value="98" /> <task id="LOCAL-00098" summary="客户表&#10;&#10;&#10;">
<created>1522234351450</created>
<option name="number" value="00098" />
<option name="presentableId" value="LOCAL-00098" />
<option name="project" value="LOCAL" />
<updated>1522234351451</updated>
</task>
<option name="localTasksCounter" value="99" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="354545000" /> <option name="totallyTimeSpent" value="355898000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -1416,7 +1416,7 @@ ...@@ -1416,7 +1416,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" 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.42553192" sideWeight="0.49016643" 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.3289689" sideWeight="0.5" order="3" 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="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="true" show_stripe_button="true" weight="0.24810892" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24810892" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" 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.33" sideWeight="0.5" order="4" 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.33" sideWeight="0.5" order="4" 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" />
...@@ -1741,6 +1741,7 @@ ...@@ -1741,6 +1741,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1888,18 +1889,26 @@ ...@@ -1888,18 +1889,26 @@
</state> </state>
</provider> </provider>
</entry> </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="299">
<caret line="31" column="51" lean-forward="true" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
<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/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="183">
<caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299"> <state relative-caret-position="161">
<caret line="18" column="33" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="33" /> <caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1914,16 +1923,8 @@ ...@@ -1914,16 +1923,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136"> <state relative-caret-position="321">
<caret line="91" column="33" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="33" /> <caret line="83" column="44" lean-forward="true" selection-start-line="83" selection-start-column="44" selection-end-line="83" selection-end-column="44" />
<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="253">
<caret line="38" column="96" lean-forward="true" selection-start-line="38" selection-start-column="96" selection-end-line="38" selection-end-column="96" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
...@@ -79,8 +79,8 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -79,8 +79,8 @@ public class TkioAccountServiceImpl implements TkioAccountService {
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
String email = null; String email = null;
if(null != sale){ if(null != sale){
email = salesManLeaderRepository.findLeaderByBussinessMan(sale); SalesManLeader one = salesManLeaderRepository.findOne(sale);
User user1 = userRepository.findByEmail(email); User user1 = userRepository.findByEmail(one.getEmail());
map.put("old", user1.getName()); map.put("old", user1.getName());
} }
List<User> list = userService.findbyRole(user.getRole()); List<User> list = userService.findbyRole(user.getRole());
......
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