|
@@ -297,7 +297,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
return mergeAccountId(settlementAccountList,allocations,uploadYears);
|
|
|
}
|
|
|
|
|
|
- private List<String> mergeAccountId(List<String> settlementAccountList, List<UserAllocation> allocations,String uploadYears) {
|
|
|
+ private List<String> mergeAccountId(List<String> settlementAccountList, List<UserAllocation> allocations,String downloadYear) {
|
|
|
List<String>salesAccount = new ArrayList<>();
|
|
|
for(UserAllocation allocation:allocations){
|
|
|
if(allocation.getAccountStatus() == 0){
|
|
@@ -305,10 +305,10 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
}
|
|
|
if(allocation.getAccountStatus() == 1){
|
|
|
//被关停的账户
|
|
|
- Long updateDateNum = Long.parseLong(DateUtils.formatDate(allocation.getUpdateTime(),"yyyymm"));
|
|
|
- uploadYears = uploadYears.replace("-","");
|
|
|
- Long uploadYearNum = Long.parseLong(uploadYears);
|
|
|
- if(updateDateNum>=uploadYearNum){
|
|
|
+ Long updateDateNum = Long.parseLong(DateUtils.formatDate(allocation.getUpdateTime(),"yyyyMM"));
|
|
|
+ downloadYear = downloadYear.replace("-","");
|
|
|
+ Long downloadYearNum = Long.parseLong(downloadYear);
|
|
|
+ if(updateDateNum >= downloadYearNum){
|
|
|
salesAccount.add(allocation.getAccountId()+"");
|
|
|
}
|
|
|
}
|