|
@ -113,7 +113,10 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { |
|
|
IPage<BsSgcYxjdDynamicCredit> page = bsSgcYxjdDynamicCreditService.selectPage(sp); |
|
|
IPage<BsSgcYxjdDynamicCredit> page = bsSgcYxjdDynamicCreditService.selectPage(sp); |
|
|
creditList.addAll(list); |
|
|
creditList.addAll(list); |
|
|
creditList.addAll(page.getRecords()); |
|
|
creditList.addAll(page.getRecords()); |
|
|
|
|
|
if (sp.getData().getType().equals("1")) { |
|
|
creditList = creditList.stream().filter(x -> !x.getStatus().equals("0")).collect(Collectors.toList()); |
|
|
creditList = creditList.stream().filter(x -> !x.getStatus().equals("0")).collect(Collectors.toList()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
creditList = creditList.stream().distinct().collect(Collectors.toList()); |
|
|
creditList = creditList.stream().distinct().collect(Collectors.toList()); |
|
|
page.setRecords(creditList); |
|
|
page.setRecords(creditList); |
|
|
page.setTotal(creditList.size()); |
|
|
page.setTotal(creditList.size()); |
|
@ -226,6 +229,7 @@ public class BsSgcYxjdDynamicCreditController extends BaseController { |
|
|
this.remark = remark; |
|
|
this.remark = remark; |
|
|
this.loginId = loginId; |
|
|
this.loginId = loginId; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public void run() { |
|
|
public void run() { |
|
|
// 线程需要执行的任务
|
|
|
// 线程需要执行的任务
|
|
|
if (status.equals("1")) { |
|
|
if (status.equals("1")) { |
|
|