|
@@ -4056,6 +4056,10 @@ public class BizProcessInspecionController extends BaseController {
|
|
List<BizProcessInspectionRelationDetail> details = bizProcessInspectionRelationDetailService.query().eq("process_inspection_relation_id", processInspecion.getRelatedId()).list();
|
|
List<BizProcessInspectionRelationDetail> details = bizProcessInspectionRelationDetailService.query().eq("process_inspection_relation_id", processInspecion.getRelatedId()).list();
|
|
List<BizProcessInspectionRelationDetail> add = new ArrayList<>();
|
|
List<BizProcessInspectionRelationDetail> add = new ArrayList<>();
|
|
List<BizProcessInspectionRelationDetail> remove = details.stream().filter(v -> relateList.stream().noneMatch(t -> t.getId().equals(v.getProcessInspectionId())) && !v.getProcessInspectionId().equals(bizProcessInspecion.getId())).collect(Collectors.toList());
|
|
List<BizProcessInspectionRelationDetail> remove = details.stream().filter(v -> relateList.stream().noneMatch(t -> t.getId().equals(v.getProcessInspectionId())) && !v.getProcessInspectionId().equals(bizProcessInspecion.getId())).collect(Collectors.toList());
|
|
|
|
+ if(!remove.isEmpty()){
|
|
|
|
+ List<BizProcessInspecion> processInspectionRemove = bizProcessInspecionService.query().in("id", remove.stream().map(BizProcessInspectionRelationDetail::getProcessInspectionId).collect(Collectors.toList())).list();
|
|
|
|
+ bizProcessInspecionService.removeBatchByIds(processInspectionRemove);
|
|
|
|
+ }
|
|
relateList.forEach(l -> {
|
|
relateList.forEach(l -> {
|
|
if (details.stream().noneMatch(t -> t.getProcessInspectionId().equals(l.getId()))) {
|
|
if (details.stream().noneMatch(t -> t.getProcessInspectionId().equals(l.getId()))) {
|
|
BizProcessInspectionRelationDetail item = new BizProcessInspectionRelationDetail();
|
|
BizProcessInspectionRelationDetail item = new BizProcessInspectionRelationDetail();
|
|
@@ -4069,6 +4073,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
List<BizProcessInspecion> disconnection = bizProcessInspecionService.query().in("id", remove.isEmpty() ? Collections.singletonList(0L) : remove.stream().map(BizProcessInspectionRelationDetail::getProcessInspectionId).collect(Collectors.toList())).list();
|
|
List<BizProcessInspecion> disconnection = bizProcessInspecionService.query().in("id", remove.isEmpty() ? Collections.singletonList(0L) : remove.stream().map(BizProcessInspectionRelationDetail::getProcessInspectionId).collect(Collectors.toList())).list();
|
|
disconnection.forEach(l -> l.setRelatedId(0L));
|
|
disconnection.forEach(l -> l.setRelatedId(0L));
|
|
bizProcessInspecionService.updateBatchById(disconnection);
|
|
bizProcessInspecionService.updateBatchById(disconnection);
|
|
|
|
+
|
|
bizProcessInspectionRelationDetailService.removeBatchByIds(remove);
|
|
bizProcessInspectionRelationDetailService.removeBatchByIds(remove);
|
|
bizProcessInspectionRelationDetailService.saveBatch(add);
|
|
bizProcessInspectionRelationDetailService.saveBatch(add);
|
|
bizProcessInspecionService.updateBatchById(relateList);
|
|
bizProcessInspecionService.updateBatchById(relateList);
|