|
|
|
@ -564,7 +564,9 @@ public class InspectionTaskController extends BladeController { |
|
|
|
List<MesRbFilePreserveSlotEntity> submitList = dto.getSubmitList(); |
|
|
|
List<MesRbFilePreserveSlotEntity> submitList = dto.getSubmitList(); |
|
|
|
// List<Long> deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class);
|
|
|
|
// List<Long> deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class);
|
|
|
|
List<Long> deleteIds = dto.getDeleteIds(); |
|
|
|
List<Long> deleteIds = dto.getDeleteIds(); |
|
|
|
|
|
|
|
List<Long> existIds = new ArrayList<>(); |
|
|
|
|
|
|
|
existIds.addAll(deleteIds); |
|
|
|
|
|
|
|
Long rfpId = dto.getRfpId(); |
|
|
|
List<String> uniqueNames = submitList.stream().distinct() |
|
|
|
List<String> uniqueNames = submitList.stream().distinct() |
|
|
|
.map(MesRbFilePreserveSlotEntity::getSlotName) // 提取name字段
|
|
|
|
.map(MesRbFilePreserveSlotEntity::getSlotName) // 提取name字段
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
.collect(Collectors.toList()); |
|
|
|
@ -575,10 +577,11 @@ public class InspectionTaskController extends BladeController { |
|
|
|
if (null != slot.getId()) { |
|
|
|
if (null != slot.getId()) { |
|
|
|
QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq("slot_name", slot.getSlotName()); |
|
|
|
queryWrapper.eq("slot_name", slot.getSlotName()); |
|
|
|
|
|
|
|
queryWrapper.eq("rfp_id", rfpId); |
|
|
|
// queryWrapper.ne("id", slot.getId());
|
|
|
|
// queryWrapper.ne("id", slot.getId());
|
|
|
|
if (null != deleteIds && deleteIds.size() > 0) { |
|
|
|
if (null != existIds && existIds.size() > 0) { |
|
|
|
deleteIds.add(slot.getId()); |
|
|
|
existIds.add(slot.getId()); |
|
|
|
queryWrapper.notIn("id", deleteIds); |
|
|
|
queryWrapper.notIn("id", existIds); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
queryWrapper.ne("id", slot.getId()); |
|
|
|
queryWrapper.ne("id", slot.getId()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -589,6 +592,7 @@ public class InspectionTaskController extends BladeController { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq("slot_name", slot.getSlotName()); |
|
|
|
queryWrapper.eq("slot_name", slot.getSlotName()); |
|
|
|
|
|
|
|
queryWrapper.eq("rfp_id", rfpId); |
|
|
|
if (null != deleteIds && deleteIds.size() > 0) { |
|
|
|
if (null != deleteIds && deleteIds.size() > 0) { |
|
|
|
queryWrapper.notIn("id", deleteIds); |
|
|
|
queryWrapper.notIn("id", deleteIds); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -607,7 +611,6 @@ public class InspectionTaskController extends BladeController { |
|
|
|
BladeUser curUserInfo = AuthUtil.getUser(); |
|
|
|
BladeUser curUserInfo = AuthUtil.getUser(); |
|
|
|
// PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request);
|
|
|
|
// PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request);
|
|
|
|
// Long rfpId = data.getLong("rfpId");
|
|
|
|
// Long rfpId = data.getLong("rfpId");
|
|
|
|
Long rfpId = dto.getRfpId(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); |
|
|
|
service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); |
|
|
|
return R.status(true); |
|
|
|
return R.status(true); |
|
|
|
|