Browse Source

修改结算单导出逻辑

songyh 3 năm trước cách đây
mục cha
commit
ab5d340430

+ 0 - 8
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -120,18 +120,10 @@ public class SettlementController {
         return Result.successMsg("查询用户",list);
     }
 
-
-
     @ApiOperation(value="财务结算-获取所有运营人员", notes="财务结算-获取所有运营人员")
     @GetMapping("/getAllOperationUser")
     public Result getAllOperationUser() {
         List<Map<String,Object>> list = cwjsPolicyInfoService.getAllOperationUser();
         return Result.successMsg("查询运营用户列表",list);
     }
-
-
-
-
-
-
 }

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -296,6 +296,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
 
     private List<String> mergeAccountId(List<String> settlementAccountList, List<UserAllocation> allocations,String uploadYears) {
         List<String>salesAccount = new ArrayList<>();
+        System.out.println(settlementAccountList.size());
+        System.out.println(allocations.size());
         for(UserAllocation allocation:allocations){
             if(allocation.getAccountStatus() == 0){
                 salesAccount.add(allocation.getAccountId()+"");