Skip to content

M
manager
Commit 7f1719c6 by manxiaoqiang
Options

客户表

parent 7b876782
Showing with 40 additions and 48 deletions
.idea/workspace.xml
...@@ -3,6 +3,7 @@ ...@@ -3,6 +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/repository/SalesManLeaderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.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/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/" />
...@@ -27,8 +28,8 @@ ...@@ -27,8 +28,8 @@
<file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false"> <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="299"> <state relative-caret-position="161">
<caret line="31" column="51" lean-forward="true" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" /> <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -47,18 +48,8 @@ ...@@ -47,18 +48,8 @@
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true"> <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="321"> <state relative-caret-position="-507">
<caret line="83" column="44" lean-forward="true" selection-start-line="83" selection-start-column="44" selection-end-line="83" selection-end-column="44" /> <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<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="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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -67,8 +58,8 @@ ...@@ -67,8 +58,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="161"> <state relative-caret-position="115">
<caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" /> <caret line="10" column="90" lean-forward="true" selection-start-line="10" selection-start-column="90" selection-end-line="10" selection-end-column="90" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -152,7 +143,6 @@ ...@@ -152,7 +143,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" /> <option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" /> <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/common/model/Reminder.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.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/common/model/ReminderLevel.java" />
...@@ -191,6 +181,7 @@ ...@@ -191,6 +181,7 @@
<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/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" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1040,14 +1031,7 @@ ...@@ -1040,14 +1031,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="5468000" /> <workItem from="1522202547904" duration="5972000" />
</task>
<task id="LOCAL-00050" summary="合同">
<created>1516592276562</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1516592276562</updated>
</task> </task>
<task id="LOCAL-00051" summary="合同"> <task id="LOCAL-00051" summary="合同">
<created>1516611136767</created> <created>1516611136767</created>
...@@ -1385,11 +1369,18 @@ ...@@ -1385,11 +1369,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1522234351451</updated> <updated>1522234351451</updated>
</task> </task>
<option name="localTasksCounter" value="99" /> <task id="LOCAL-00099" summary="客户表&#10;&#10;&#10;">
<created>1522293168587</created>
<option name="number" value="00099" />
<option name="presentableId" value="LOCAL-00099" />
<option name="project" value="LOCAL" />
<updated>1522293168587</updated>
</task>
<option name="localTasksCounter" value="100" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="355898000" /> <option name="totallyTimeSpent" value="356402000" />
</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" />
...@@ -1542,13 +1533,6 @@ ...@@ -1542,13 +1533,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<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">
<caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="309">
...@@ -1889,42 +1873,50 @@ ...@@ -1889,42 +1873,50 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.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="299"> <state relative-caret-position="183">
<caret line="31" column="51" lean-forward="true" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" /> <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/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/SalesManLeader.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="115">
<caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" /> <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 /> <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/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161"> <state relative-caret-position="161">
<caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" /> <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/SalesManLeader.java"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/1.5.1.RELEASE/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<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="115"> <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" /> <caret line="10" column="90" lean-forward="true" selection-start-line="10" selection-start-column="90" selection-end-line="10" selection-end-column="90" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</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="321"> <state relative-caret-position="-507">
<caret line="83" column="44" lean-forward="true" selection-start-line="83" selection-start-column="44" selection-end-line="83" selection-end-column="44" /> <caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/tkio/repository/SalesManLeaderRepository.java
...@@ -8,7 +8,7 @@ import tkio.model.SalesManLeader; ...@@ -8,7 +8,7 @@ import tkio.model.SalesManLeader;
import java.util.List; import java.util.List;
@Transactional @Transactional
public interface SalesManLeaderRepository extends JpaRepository<SalesManLeader, Long> { public interface SalesManLeaderRepository extends JpaRepository<SalesManLeader, Integer> {
@Query(value = "select email from sales_man_leader where id=(select leader from sales_man_leader where id=?1)", nativeQuery = true) @Query(value = "select email from sales_man_leader where id=(select leader from sales_man_leader where id=?1)", nativeQuery = true)
String findLeaderByBussinessMan(Long bussinessMan); String findLeaderByBussinessMan(Long bussinessMan);
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
...@@ -79,7 +79,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -79,7 +79,7 @@ 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){
SalesManLeader one = salesManLeaderRepository.findOne(sale); SalesManLeader one = salesManLeaderRepository.findOne(Integer.parseInt(sale+""));
User user1 = userRepository.findByEmail(one.getEmail()); User user1 = userRepository.findByEmail(one.getEmail());
map.put("old", user1.getName()); map.put("old", user1.getName());
} }
......
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