v1.3

src/main/java/adi/controller/ADIAccountController.java

@@ -4,7 +4,7 @@ package adi.controller;
 import adi.model.ADIUser;
 import adi.service.ADIAccountService;
 import common.model.*;
-import common.service.AccountService;
+import common.service.AccountCommonService;
 import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,7 +30,7 @@ public class ADIAccountController {
     ADIAccountService tkioAccountService;
 
     @Autowired
-    AccountService accountService;
+    AccountCommonService accountCommonService;
     //sale
     @RequestMapping(value = "/findSale", method = RequestMethod.GET)
     @ResponseBody
@@ -71,7 +71,7 @@ public class ADIAccountController {
 //        if(null == account4Web){
 //            return ResultModel.ERROR(ResultStatus.USER_EMPTY);
 //        }
-        return ResultModel.OK(accountService.findOne("adi",email));
+        return ResultModel.OK(accountCommonService.findOne("adi",email));
     }
     @RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET)
     @ResponseBody

src/main/java/common/controller/ContractController.java

@@ -75,10 +75,10 @@ public class ContractController {
         return ResultModel.OK(service.findAll(loginAccount,startDate, endDate, platform,contractId));
     }
 
-    @RequestMapping(value = "findOne", method = RequestMethod.GET)
+    @RequestMapping(value = "contractid/find", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @PathVariable String platform,
-                               @RequestParam String startDate, @RequestParam String endDate,String contractId) {
+                             String startDate, String endDate,String contractId) {
 
         return ResultModel.OK(service.findOne(loginAccount,startDate, endDate, platform,contractId));
     }

src/main/java/common/service/AccountService.java → src/main/java/common/service/AccountCommonService.java

@@ -3,6 +3,6 @@ package common.service;
 
 import common.model.Account4Web;
 
-public interface AccountService {
+public interface AccountCommonService {
     Account4Web findOne(String dmp, String email);
 }

src/main/java/common/service/impl/AccountServiceImpl.java → src/main/java/common/service/impl/AccountCommonServiceImpl.java

@@ -5,7 +5,7 @@ import common.model.Contract;
 import common.model.PackageBase;
 import common.repository.ContractRepository;
 import common.repository.PackageBaseRepository;
-import common.service.AccountService;
+import common.service.AccountCommonService;
 import office.model.BussinessMan;
 import office.repository.BussinessManRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import java.util.List;
 
 
 @Service
-public class AccountServiceImpl implements AccountService {
+public class AccountCommonServiceImpl implements AccountCommonService {
 
 
     @Autowired

src/main/java/dmp/controller/DmpAccountController.java

@@ -3,7 +3,7 @@ package dmp.controller;
 
 import common.model.Account4Web;
 import common.model.User;
-import common.service.AccountService;
+import common.service.AccountCommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@ public class DmpAccountController {
 
 
     @Autowired
-    AccountService accountService;
+    AccountCommonService accountCommonService;
 
 
     //功能使用查询
@@ -46,6 +46,6 @@ public class DmpAccountController {
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
 
-        return ResultModel.OK(accountService.findOne("dmp",email));
+        return ResultModel.OK(accountCommonService.findOne("dmp",email));
     }
 }