DMP 收入导入

src/main/java/common/controller/DmpIncomeController.java

@@ -20,9 +20,9 @@ public class DmpIncomeController {
 
 
     @GetMapping("/list/bycode")
-    public ResultModel listByContract(String contractCode) {
+    public ResultModel listByContract(String code) {
         //按合同查询
-        return ResultModel.OK(dmpIncomeService.listByCode(contractCode));
+        return ResultModel.OK(dmpIncomeService.listByCode(code));
     }
 
     @GetMapping("/list/byds")
@@ -52,5 +52,4 @@ public class DmpIncomeController {
     }
 
 
-
 }

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

@@ -91,6 +91,9 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
     @Override
     public List<DmpIncome> listByDs(String start, String end) {
         List<DmpIncome> dmpIncomes = dmpIncomeRepository.findByContractDs(start, end);
+        if (dmpIncomes.isEmpty()) {
+            return dmpIncomes;
+        }
         List<String> codes = dmpIncomes.stream().map(v -> v.getContractCode()).collect(Collectors.toList());
         List<Object[]> contracts = contractRepository.findByDmpContractCode(codes);
         Map<String, Object[]> names = contracts.stream().collect(Collectors.toMap(v -> v[0] + "", v -> v, (v1, v2) -> v1));