|
@@ -75,7 +75,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
private SysRoleMapper roleMapper;
|
|
|
@Autowired
|
|
|
private IMaterialReportOverViewService materialReportOverViewService;
|
|
|
-
|
|
|
@Resource
|
|
|
private SysLogMapper sysLogMapper;
|
|
|
|
|
@@ -259,7 +258,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
output.close();
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- log.error("====>>>>", e.getMessage());
|
|
|
return Result.errorMsg(e.getMessage());
|
|
|
}
|
|
|
return null;
|
|
@@ -296,8 +294,6 @@ 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()+"");
|
|
@@ -502,16 +498,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
output.close();
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- log.error("====>>>>", e.getMessage());
|
|
|
return Result.errorMsg(e.getMessage());
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- @Resource
|
|
|
- private SettlementInfoMapper settlementInfoMapper;
|
|
|
/**
|
|
|
*
|
|
|
* @description: 财务结算 利润表导出 头条
|
|
@@ -522,10 +513,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Result porfitReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
|
|
|
-
|
|
|
try {
|
|
|
//查询 头条利润表 时间段内 所有 账户
|
|
|
-
|
|
|
List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccount(paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
if (Check.isNull(list)){
|
|
|
return Result.errorMsg("暂无数据");
|
|
@@ -669,14 +658,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- log.error("====>>>>", e.getMessage());
|
|
|
return Result.errorMsg(e.getMessage());
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
*
|
|
|
* @description: 财务结算 利润表导出 快手
|
|
@@ -830,7 +816,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- log.error("====>>>>", e.getMessage());
|
|
|
return Result.errorMsg(e.getMessage());
|
|
|
}
|
|
|
return null;
|