|
|
@@ -43,6 +43,7 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Description: 企业信息表
|
|
|
@@ -93,7 +94,9 @@ public class HlwCompanySubcontractorApiController extends JeecgController<HlwCom
|
|
|
Result<IPage<HlwCompanySubcontractor>> result = new Result<IPage<HlwCompanySubcontractor>>();
|
|
|
String companyCode = jsonObject.getString("companyCode");
|
|
|
Integer pageNo = jsonObject.getInteger("pageNo");
|
|
|
+ Integer applicationId = jsonObject.getInteger("applicationId");
|
|
|
Integer pageSize = jsonObject.getInteger("pageSize");
|
|
|
+ Integer applicationType = jsonObject.getInteger("applicationType");
|
|
|
log.info("companyCode========={}", companyCode);
|
|
|
//根据companyCode获取HlwCompany实体
|
|
|
HlwCompany hlwCompany = hlwCompanyService.getByCompanyCode(companyCode);
|
|
|
@@ -103,6 +106,9 @@ public class HlwCompanySubcontractorApiController extends JeecgController<HlwCom
|
|
|
if (pageSize == -1) {
|
|
|
//设置为“-1”表示不进行分页
|
|
|
List<HlwCompanySubcontractor> list = hlwCompanySubcontractorMapper.getListByCompanyIdNoPage(hlwCompanySubcontractor);
|
|
|
+ if(applicationType!=null){
|
|
|
+ list=list.stream().filter(item -> item.getIsOn().equals(1)).collect(Collectors.toList());
|
|
|
+ }
|
|
|
return Result.ok(list);
|
|
|
} else {
|
|
|
Page<HlwCompanySubcontractor> page = new Page<HlwCompanySubcontractor>(pageNo, pageSize);
|