|
|
@@ -223,13 +223,14 @@ public class ActApplytaskServiceImpl implements IActApplytaskService
|
|
|
actHxpapplyDetail.setHxpapplyId(actApplytaskVo.getTaskId());
|
|
|
List <ActHxpapplyDetail> actHxpapplyDetails = actHxpapplyDetailMapper.selectActHxpapplyDetailList(actHxpapplyDetail);
|
|
|
|
|
|
- Map<String, String> collect = new HashMap <>();
|
|
|
- actApplytaskVo.getActHxpapplyDetailList().stream()
|
|
|
- .forEach(a->{
|
|
|
- collect.put(a.getChemicalId()+"@"+a.getCabinetId(),a.getChemicalId()+"@"+a.getCabinetId());
|
|
|
- });
|
|
|
+// Map<String, String> collect = new HashMap <>();
|
|
|
+ Map<Long, Long> collect = actApplytaskVo.getActHxpapplyDetailList().stream()
|
|
|
+ .collect(Collectors.toMap(ActHxpapplyDetail::getId,ActHxpapplyDetail::getId));
|
|
|
+// .forEach(a->{
|
|
|
+// collect.put(a.getChemicalId()+"@"+a.getCabinetId(),a.getChemicalId()+"@"+a.getCabinetId());
|
|
|
+// });
|
|
|
Consumer <List <ActHxpapplyDetail>> comparator = x->x.stream().forEach(p->{
|
|
|
- Predicate<Map <String, String>> pre = pt -> StringUtils.isNotNull(pt.get(p.getChemicalId()+"@"+p.getCabinetId()));
|
|
|
+ Predicate<Map <Long, Long>> pre = pt -> StringUtils.isNotNull(pt.get(p.getId()));
|
|
|
if(pre.test(collect)){
|
|
|
p.setTickStatus(1);
|
|
|
actHxpapplyDetailMapper.updateActHxpapplyDetail(p);
|