公共指标处理 删除方法

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationEvaluationCommonInfoController.java

@@ -53,19 +53,15 @@ public class OrganizationEvaluationCommonInfoController {
 
 	/**
 	 * 批量删除
-	 * @param organizationEvaluationId
-	 * @param indicatorId
-	 * @param organizationId
-	 * @param deptIds
+	 * @param ids
 	 * @return
 	 */
-	@PostMapping(value = "/remove")
+	@PostMapping(value = "/remove/{ids}")
 	@ApiOperation(value = "删除", notes = "删除")
-	public R deleteAll(@RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId,
-					   @RequestParam(value = "indicatorId", required = false) String indicatorId,
-					   @RequestParam(value = "organizationId", required = false) String organizationId,
-					   @RequestParam(value = "deptId", required = false) String  deptIds) {
-		boolean b = organizationEvaluationCommonInfoService.removeCommonInfos(organizationEvaluationId,indicatorId,organizationId,deptIds);
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = organizationEvaluationCommonInfoService.removeByIds(Arrays.asList(strings));
+//		boolean b = organizationEvaluationCommonInfoService.removeCommonInfos(organizationEvaluationId,indicatorId,organizationId,deptIds);
 		if (b) {
 			return R.ok().data(b);
 		} else {

ims-service/ims-eval/src/main/java/com/ims/eval/service/IOrganizationEvaluationCommonInfoService.java

@@ -22,6 +22,6 @@ public interface IOrganizationEvaluationCommonInfoService extends IService<Organ
 
 	Map getListAll(String organizationEvaluationId, String indicatorId, String organizationId, String deptId);
 
-	boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId,String deptId);
+//	boolean removeCommonInfos(String 批量删除, String indicatorId, String organizationId,String deptId);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationCommonInfoServiceImpl.java

@@ -49,7 +49,6 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 	public boolean addEvaluationCommonInfo(List<AddEvaluationInfoDTO> addEvaluationInfoDTOs) {
 		for (AddEvaluationInfoDTO addEvaluationInfoDTO : addEvaluationInfoDTOs) {
 
-
 			//1.获取考评id(获取此考评记录)
 			String organizationEvaluationId = addEvaluationInfoDTO.getOrganizationEvaluationId();
 
@@ -210,28 +209,28 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 		return data;
 	}
 
-	@Override
-	public boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, String deptId) {
-		QueryWrapper<OrganizationEvaluationCommonInfo> qw = new QueryWrapper<>();
-
-		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
-			qw.lambda().eq(OrganizationEvaluationCommonInfo::getOrganizationEvaluationId, organizationEvaluationId);
-		}
-		if (StringUtils.isNotEmpty(indicatorId)) {
-			qw.lambda().eq(OrganizationEvaluationCommonInfo::getIndicatorId, indicatorId);
-		}
-		if (StringUtils.isNotEmpty(organizationId)) {
-			qw.lambda().eq(OrganizationEvaluationCommonInfo::getOrganizationId, organizationId);
-		}
-		if (StringUtils.isNotEmpty(deptId)) {
-			qw.lambda().eq(OrganizationEvaluationCommonInfo::getDeptId, deptId);
-		}
-		List<OrganizationEvaluationCommonInfo> list = baseMapper.selectList(qw);
-
-		//获取
-		List<String> commonIds = list.stream().map(OrganizationEvaluationCommonInfo::getId).collect(Collectors.toList());
-		boolean b = this.removeByIds(commonIds);
-
-		return b;
-	}
+//	@Override
+//	public boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, String deptId) {
+//		QueryWrapper<OrganizationEvaluationCommonInfo> qw = new QueryWrapper<>();
+//
+//		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
+//			qw.lambda().eq(OrganizationEvaluationCommonInfo::getOrganizationEvaluationId, organizationEvaluationId);
+//		}
+//		if (StringUtils.isNotEmpty(indicatorId)) {
+//			qw.lambda().eq(OrganizationEvaluationCommonInfo::getIndicatorId, indicatorId);
+//		}
+//		if (StringUtils.isNotEmpty(organizationId)) {
+//			qw.lambda().eq(OrganizationEvaluationCommonInfo::getOrganizationId, organizationId);
+//		}
+//		if (StringUtils.isNotEmpty(deptId)) {
+//			qw.lambda().eq(OrganizationEvaluationCommonInfo::getDeptId, deptId);
+//		}
+//		List<OrganizationEvaluationCommonInfo> list = baseMapper.selectList(qw);
+//
+//		//获取
+//		List<String> commonIds = list.stream().map(OrganizationEvaluationCommonInfo::getId).collect(Collectors.toList());
+//		boolean b = this.removeByIds(commonIds);
+//
+//		return b;
+//	}
 }