LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug#40905

Browse Source
This commit is contained in:
梁琦涛
2021-10-19 10:29:59 +08:00
parent ac05b68f35
commit 430409b296
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+1 -1
View File
@@ -540,7 +540,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
String selections = request.getParameter("selections"); String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) { if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(",")); List<String> selectionList = Arrays.asList(selections.split(","));
exportList = pageList.stream().filter(item -> selectionList.contains(payIncomeContract.getId())).collect(Collectors.toList()); exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
} else { } else {
exportList = pageList; exportList = pageList;
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
// 查询打包年份的打包企业 // 查询打包年份的打包企业
List<String> listProject = new ArrayList<>(); List<String> listProject = new ArrayList<>();
if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){ if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE1,payIncomeContract.getPackYear()); listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPackYear());
} }
List<String> finalListProject = listProject; List<String> finalListProject = listProject;
list.forEach(p->{ list.forEach(p->{