diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index bf1dfc25..930cb363 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -285,7 +285,7 @@ public class WorkCenterController extends BladeController { List teamIds = workCenter.getTeamIds(); String result = null; String team = null; - if(null != teamIds){ + if(null != teamIds && teamIds.size() > 0){ for(Long teamId:teamIds){ CenterTeam centerteam = new CenterTeam(); @@ -305,6 +305,10 @@ public class WorkCenterController extends BladeController { team= teams.stream() .map(user -> String.valueOf(user.getTsName())) .collect(Collectors.joining(",")); + }else{ + QueryWrapper qwcenteam = new QueryWrapper<>(); + qwcenteam.eq("WC_ID",detail.getId()); + teamCenterService.remove(qwcenteam); } // detail.setTeamId(result); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index ef461631..38c344fd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -73,6 +73,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * [检验任务] 控制器 @@ -206,15 +207,15 @@ public class InspectionTaskController extends BladeController { log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); // 热表 烧结 检验员 数据区分。 -// if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { -// search.setFromType(InspectionTaskConst.FROM_TYPE_RB); -// } -// if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { -// search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); -// } -// if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { -// search.setFromType(null); -// } + if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_RB); + } + if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); + } + if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { + search.setFromType(null); + } IPage pagesVO = service.listSearch(Condition.getPage(query), search); return R.data(pagesVO); } @@ -227,15 +228,15 @@ public class InspectionTaskController extends BladeController { log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); // 热表 烧结 检验员 数据区分。 -// if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { -// search.setFromType(InspectionTaskConst.FROM_TYPE_RB); -// } -// if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { -// search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); -// } -// if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { -// search.setFromType(null); -// } + if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_RB); + } + if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); + } + if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { + search.setFromType(null); + } IPage pagesVO = service.queryWorkOrder(Condition.getPage(query), search); return R.data(pagesVO); } @@ -360,10 +361,49 @@ public class InspectionTaskController extends BladeController { // List submitList = JSONArray.parseArray(data.get("submitList").toString(), MesRbFilePreserveSlotEntity.class); List submitList = dto.getSubmitList(); - // List deleteIds = JSONArray.parseArray(data.get("deleteIds").toString(), Long.class); List deleteIds = dto.getDeleteIds(); + List uniqueNames = submitList.stream().distinct() + .map(MesRbFilePreserveSlotEntity::getSlotName) // 提取name字段 + .collect(Collectors.toList()); + if (uniqueNames.size() != submitList.size()) { + return R.fail("槽号名称不能重复"); + }else{ + for(MesRbFilePreserveSlotEntity slot : submitList){ + if(null != slot.getId()){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("slot_name", slot.getSlotName()); +// queryWrapper.ne("id", slot.getId()); + if(null != deleteIds && deleteIds.size() > 0){ + deleteIds.add(slot.getId()); + queryWrapper.notIn("id", deleteIds); + }else{ + queryWrapper.ne("id", slot.getId()); + } + List list = mesRbFilePreserveSlotService.list(queryWrapper); + if(null != list && list.size() > 0){ + return R.fail("槽号名称不能重复"); + } + }else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("slot_name", slot.getSlotName()); + if(null != deleteIds && deleteIds.size() > 0){ + queryWrapper.notIn("id", deleteIds); + } + List list = mesRbFilePreserveSlotService.list(queryWrapper); + if(null != list && list.size() > 0){ + return R.fail("槽号名称不能重复"); + } + } + + + } + + } + + + BladeUser curUserInfo = AuthUtil.getUser(); // PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request); // Long rfpId = data.getLong("rfpId");