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

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/repository/SalesManLeaderRepository.java

@@ -8,7 +8,7 @@ import tkio.model.SalesManLeader;
 import java.util.List;
 
 @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)
     String findLeaderByBussinessMan(Long bussinessMan);
 

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

@@ -8,6 +8,7 @@ import dic.ContractTypeEnum;
 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;
@@ -80,6 +81,33 @@ public class TkioAccountServiceImpl implements TkioAccountService {
     CrowdRepository crowdRepository;
 
     @Override
+    public Map<String, Object> findSale(User user, Long sale) {
+        Map<String, Object> map = new HashMap();
+        String email = null;
+        if(null != sale){
+            SalesManLeader one = salesManLeaderRepository.findOne(Integer.parseInt(sale+""));
+            User user1 = userRepository.findByEmail(one.getEmail());
+            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;