Commit a733c411 authored by fangxinjiang's avatar fangxinjiang

删除优化

parent 33c46411
...@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -140,8 +141,8 @@ public class TEmpBadRecordController { ...@@ -140,8 +141,8 @@ public class TEmpBadRecordController {
@SysLog("通过ids删除员工不良记录" ) @SysLog("通过ids删除员工不良记录" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('demo_tempbadrecord_del_batch')" ) @PreAuthorize("@pms.hasPermission('demo_tempbadrecord_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpBadRecordService.removeByIds(idList)); return R.ok(tEmpBadRecordService.removeByIds(idList));
} }
......
...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -138,8 +139,8 @@ public class TEmpDisabilityInfoController { ...@@ -138,8 +139,8 @@ public class TEmpDisabilityInfoController {
@SysLog("通过ids删除员工伤残信息表" ) @SysLog("通过ids删除员工伤残信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempdisabilityinfo_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpDisabilityInfoService.removeByIds(idList)); return R.ok(tEmpDisabilityInfoService.removeByIds(idList));
} }
/** /**
......
...@@ -22,8 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -22,8 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpEducation;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpEducationService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpEducationService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EducationSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EducationSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
...@@ -36,6 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -136,11 +135,8 @@ public class TEmpEducationController { ...@@ -136,11 +135,8 @@ public class TEmpEducationController {
@SysLog("通过id删除员工学历信息表" ) @SysLog("通过id删除员工学历信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_education_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_education_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = null; List<String> idList = Arrays.asList(ids);
if (Common.isNotNull(ids)){
idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
}
return R.ok(tEmpEducationService.removeByIds(idList)); return R.ok(tEmpEducationService.removeByIds(idList));
} }
......
...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -146,8 +147,8 @@ public class TEmpFamilyController { ...@@ -146,8 +147,8 @@ public class TEmpFamilyController {
@SysLog("通过id删除员工家庭信息表" ) @SysLog("通过id删除员工家庭信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" ) @PreAuthorize("@pms.hasPermission('archives-family-batch-delete')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return tEmpFamilyService.removeByIdsDiy(idList); return tEmpFamilyService.removeByIdsDiy(idList);
} }
......
...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -35,6 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -135,8 +136,8 @@ public class TEmpProfessionalQualificationController { ...@@ -135,8 +136,8 @@ public class TEmpProfessionalQualificationController {
@SysLog("通过ids删除员工职业资格信息表" ) @SysLog("通过ids删除员工职业资格信息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempprofessionalqualification_del_batch')" )
public R removeByIds(@RequestBody(required = true) String ids) { public R removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(qualificationService.removeByIds(idList)); return R.ok(qualificationService.removeByIds(idList));
} }
/** /**
......
...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -36,6 +36,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -136,8 +137,8 @@ public class TEmpWorkRecordingController { ...@@ -136,8 +137,8 @@ public class TEmpWorkRecordingController {
@SysLog("通过id删除员工家工作息表" ) @SysLog("通过id删除员工家工作息表" )
@DeleteMapping("/removeByIds" ) @DeleteMapping("/removeByIds" )
@PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" ) @PreAuthorize("@pms.hasPermission('archives_tempworkrecording_del_batch')" )
public R<Boolean> removeByIds(@RequestBody(required = true) String ids) { public R<Boolean> removeByIds(@RequestBody(required = true) String[] ids) {
List<String> idList = Common.getList(ids); List<String> idList = Arrays.asList(ids);
return R.ok(tEmpWorkRecordingService.removeByIds(idList)); return R.ok(tEmpWorkRecordingService.removeByIds(idList));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment