合同

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

@@ -25,8 +25,9 @@ public class ContractController {
 
     @RequestMapping(value = "find", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel findAll(@CurrentAccount User loginAccount, @RequestParam String startDate, @RequestParam String endDate) {
-        return ResultModel.OK(service.findAll(startDate, endDate));
+    public ResultModel findAll(@CurrentAccount User loginAccount, @PathVariable String platform,
+                               @RequestParam String startDate, @RequestParam String endDate) {
+        return ResultModel.OK(service.findAll(startDate, endDate, platform));
     }
 
     @RequestMapping(value = "findone", method = RequestMethod.GET)

src/main/java/common/repository/ContractRepository.java

@@ -18,8 +18,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
     @Query(value="select count(*) from contract where email = ?1",nativeQuery=true)
     BigInteger countNumByEmail(String email);
 
-    @Query(value="select * from contract where ds >= ?1 and ds <= ?2 order by ds desc",nativeQuery=true)
-    List<Contract> findByDs(String startDate, String endDate);
+    @Query(value="select * from contract where ds >= ?1 and ds <= ?2 and platfrom = ?3 order by ds desc",nativeQuery=true)
+    List<Contract> findByDs(String startDate, String endDate, String platfrom);
 
     @Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
     Contract findByCode(String contract_code);

src/main/java/common/service/ContractService.java

@@ -27,7 +27,7 @@ public interface ContractService {
 
     Contract update(User loginUser, Contract resource);
 
-    List<Contract> findAll(String startDate, String endDate);
+    List<Contract> findAll(String startDate, String endDate, String platfrom);
 
     Contract findOne(String code);
 

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -167,7 +167,7 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<Contract> findAll(String startDate, String endDate) {
+    public List<Contract> findAll(String startDate, String endDate, String platfrom) {
         List<Contract> result = new ArrayList<>();
         List<User> sales = userRepository.findAll();
         Map<Long, String> saleMap = new HashMap<>();
@@ -183,7 +183,7 @@ public class ContractServiceImpl implements ContractService{
                 typeMap.put(s.getId(), s.getPackageName());
             }
         }
-        List<Contract> contractList = contractRepository.findByDs(startDate, endDate);
+        List<Contract> contractList = contractRepository.findByDs(startDate, endDate, platfrom);
         if(ValidateUtil.isValid(contractList)){
             for(Contract c : contractList){
                 c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : "");