团队重构

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<XmTestCase> can=new ArrayList<>();
             List<XmTestCase> no=new ArrayList<>();
             Map<String, Tips> noTipsMap=new HashMap<>();
-            for (XmTestCase data : datasDb) {
             if(isPm){
-                    can.add(data);
+				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<String> msgs=new ArrayList<>();
             if(can.size()>0){
                 xmTestCaseService.batchDelete(can);

xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java

@@ -266,10 +266,10 @@ public class XmTestCasedbController {
 			List<XmTestCasedb> can=new ArrayList<>();
 			List<XmTestCasedb> no=new ArrayList<>();
 			Set<String> noTips=new HashSet<>();
-			for (XmTestCasedb data : xmTestCasedbsDb) {
 			if(isPm){
-					can.add(data);
+				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,17 +322,23 @@ public class XmTestCasedbController {
                 return failed("data-0","请上送待删除数据列表");
             }
              List<XmTestCasedb> 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<XmTestCasedb> can=new ArrayList<>();
             List<XmTestCasedb> no=new ArrayList<>();
 			Set<String> 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);
+				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);
@@ -340,6 +348,7 @@ public class XmTestCasedbController {
 					}
 				}
 			}
+
             List<String> msgs=new ArrayList<>();
             if(can.size()>0){
                 xmTestCasedbService.batchDelete(can);

xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java

@@ -287,12 +287,11 @@ public class XmTestPlanController {
 			List<XmTestPlan> can=new ArrayList<>();
 			List<XmTestPlan> no=new ArrayList<>();
 			Set<String> noTips=new HashSet<>();
-			for (XmTestPlan xmTestPlanDb : xmTestPlansDb) {
-				Tips tips2 = new Tips("检查通过");
 			if(isPm){
-					 can.add(xmTestPlanDb);
+				can=xmTestPlansDb;
 			}else {
-				 	tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
+				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());
@@ -300,7 +299,6 @@ public class XmTestPlanController {
 						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<XmTestPlan> can=new ArrayList<>();
 			List<XmTestPlan> no=new ArrayList<>();
 			Set<String> noTips=new HashSet<>();
-			for (XmTestPlan xmTestPlanDb : datasDb) {
-				Tips tips2 = new Tips("检查通过");
 			if(isPm){
-					can.add(xmTestPlanDb);
+				can=datasDb;
 			}else {
-					tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
+				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<String> msgs=new ArrayList<>();
             if(can.size()>0){
                 xmTestPlanService.batchDelete(can);