Commit 5d88fd43 authored by tianbo's avatar tianbo

fix(tcm): 两员配备使用单位增加充装单位

- 增加"充装单位"类型的过滤条件
parent 4e66f5c4
......@@ -64,7 +64,7 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
TzsTwoStaffingDto useUnitTwoStaffingDto = new TzsTwoStaffingDto();
TzsTwoStaffingDto productUnitTwoStaffingDto = new TzsTwoStaffingDto();
List<TzsTwoStaffingCompanyDto> useUnit =
staffingCompanyList.stream().filter(ii -> ii.getSuperviseOrgCode().startsWith(i.get("orgCode").toString()) && ii.getUnitType().contains("使用单位")).collect(Collectors.toList());
staffingCompanyList.stream().filter(ii -> ii.getSuperviseOrgCode().startsWith(i.get("orgCode").toString()) && (ii.getUnitType().contains("充装单位") || ii.getUnitType().contains("使用单位"))).collect(Collectors.toList());
// 使用单位总数
int useUnitCount = useUnit.size();
// 已完成单位数
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment