From b1c32fb0a28025d8e619cdda404a185acaa5a75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 24 Jan 2023 20:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmTestCaseController.java | 27 ++++++----- .../xm/core/ctrl/XmTestCasedbController.java | 45 +++++++++++-------- .../xm/core/ctrl/XmTestPlanController.java | 40 ++++++++--------- 3 files changed, 63 insertions(+), 49 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index 74784acc..9fcc3e70 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -279,7 +279,9 @@ public class XmTestCaseController { } } boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); - if(!isPm && !StringUtils.hasText(xmTestCase.getCuserid())){ + if(isPm){ + can=xmTestCasesDb; + }else{ for (XmTestCase xmTestCaseDb : xmTestCasesDb) { Tips tips2 = new Tips("检查通过"); tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null); @@ -344,15 +346,20 @@ public class XmTestCaseController { List can=new ArrayList<>(); List no=new ArrayList<>(); Map noTipsMap=new HashMap<>(); - for (XmTestCase data : datasDb) { - if(isPm){ - can.add(data); - }else{ - tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId()); - noTipsMap.put(tips.getMsg(),tips); - no.add(data); - } - } + if(isPm){ + can=datasDb; + }else { + for (XmTestCase data : datasDb) { + tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId()); + if(tips.isOk()){ + can.add(data); + }else { + noTipsMap.put(tips.getMsg(),tips); + no.add(data); + } + } + } + List msgs=new ArrayList<>(); if(can.size()>0){ xmTestCaseService.batchDelete(can); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java index bad21cea..c7fddddc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java @@ -266,10 +266,10 @@ public class XmTestCasedbController { List can=new ArrayList<>(); List no=new ArrayList<>(); Set noTips=new HashSet<>(); - for (XmTestCasedb data : xmTestCasedbsDb) { - if(isPm){ - can.add(data); - }else{ + if(isPm){ + can=xmTestCasedbsDb; + }else { + for (XmTestCasedb data : xmTestCasedbsDb) { tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId()); if(!tips.isOk()){ no.add(data); @@ -278,7 +278,9 @@ public class XmTestCasedbController { can.add(data); } } + } + if(can.size()>0){ xmTestCasedbMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList())); xmTestCasedbService.editSomeFields(xmTestCasedbMap); @@ -320,26 +322,33 @@ public class XmTestCasedbController { return failed("data-0","请上送待删除数据列表"); } List datasDb=xmTestCasedbService.selectListByIds(xmTestCasedbs.stream().map(i-> i.getId() ).collect(Collectors.toList())); - + if(datasDb==null || datasDb.size()==0){ + return failed("data-0","测试库已不存在"); + } + XmTestCasedb xmTestCasedbDb=datasDb.get(0); + if(datasDb.stream().filter(k->!k.getProductId().equals(xmTestCasedbDb.getProductId())).findAny().isPresent()){ + return failed("data-0","批量处理只能在同一个产品下进行"); + } + User user=LoginUtils.getCurrentUserInfo(); + XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId()); + boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); List can=new ArrayList<>(); List no=new ArrayList<>(); Set noTips=new HashSet<>(); - User user=LoginUtils.getCurrentUserInfo(); - for (XmTestCasedb data : datasDb) { - XmProduct xmProductDb=productService.getProductFromCache(data.getProductId()); - boolean isPm=groupService.checkUserIsProductAdm(xmProductDb, user.getUserid()); - if(isPm){ - can.add(data); - }else{ + if(isPm){ + can=datasDb; + }else { + for (XmTestCasedb data : datasDb) { tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId()); - if(!tips.isOk()){ - no.add(data); - noTips.add(tips.getMsg()); + if(!tips.isOk()){ + no.add(data); + noTips.add(tips.getMsg()); }else{ - can.add(data); + can.add(data); } - } - } + } + } + List msgs=new ArrayList<>(); if(can.size()>0){ xmTestCasedbService.batchDelete(can); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java index 0ecd41d7..2480cf18 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java @@ -287,20 +287,18 @@ public class XmTestPlanController { List can=new ArrayList<>(); List no=new ArrayList<>(); Set noTips=new HashSet<>(); - for (XmTestPlan xmTestPlanDb : xmTestPlansDb) { - Tips tips2 = new Tips("检查通过"); - if(isPm){ - can.add(xmTestPlanDb); - }else{ - tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); - if(!tips2.isOk()){ - no.add(xmTestPlanDb); - noTips.add(tips2.getMsg()); - }else{ - can.add(xmTestPlanDb); - } - } - + if(isPm){ + can=xmTestPlansDb; + }else { + for (XmTestPlan xmTestPlanDb : xmTestPlansDb) { + Tips tips2 =productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); + if(!tips2.isOk()){ + no.add(xmTestPlanDb); + noTips.add(tips2.getMsg()); + }else{ + can.add(xmTestPlanDb); + } + } } if(can.size()>0){ xmTestPlanMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList())); @@ -353,21 +351,21 @@ public class XmTestPlanController { List can=new ArrayList<>(); List no=new ArrayList<>(); Set noTips=new HashSet<>(); - for (XmTestPlan xmTestPlanDb : datasDb) { - Tips tips2 = new Tips("检查通过"); - if(isPm){ - can.add(xmTestPlanDb); - }else{ - tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); + if(isPm){ + can=datasDb; + }else { + for (XmTestPlan xmTestPlanDb : datasDb) { + Tips tips2 =productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); if(!tips2.isOk()){ no.add(xmTestPlanDb); noTips.add(tips2.getMsg()); }else{ can.add(xmTestPlanDb); } - } + } } + List msgs=new ArrayList<>(); if(can.size()>0){ xmTestPlanService.batchDelete(can);