server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -39,6 +39,14 @@ return ApiResponse.success(companyService.create(company)); } @PreventRepeat @ApiOperation("创建劳务公司") @PostMapping("/createLaborServices") @RequiresPermissions("business:company:create") public ApiResponse<Integer> createLaborServices(@RequestBody Company company){ return ApiResponse.success(companyService.createLaborServices(company)); } @ApiOperation("根据ID删除") @GetMapping("/delete/{id}") @RequiresPermissions("business:company:delete") server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -6,11 +6,13 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.admin.request.LaborMemberDTO; import com.doumee.dao.admin.response.MemberInfoDTO; import com.doumee.dao.business.model.Member; import com.doumee.service.business.MemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -36,6 +38,14 @@ @RequiresPermissions("business:member:create") public ApiResponse create(@RequestBody Member member) { return ApiResponse.success(memberService.create(member)); } @PreventRepeat @ApiOperation("创建劳务人员信息") @PostMapping("/laborMemberCreate") @RequiresPermissions("business:member:create") public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){ return ApiResponse.success(memberService.laborMemberCreate(member)); } @ApiOperation("根据ID删除") @@ -67,6 +77,14 @@ return ApiResponse.success(null); } @ApiOperation("根据ID 禁启用 拉黑") @PostMapping("/updateStatusById") @RequiresPermissions("business:member:update") public ApiResponse updateStatusById(@RequestBody Member member){ memberService.updateStatusById(member); return ApiResponse.success(null); } @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:member:query") @@ -74,6 +92,13 @@ return ApiResponse.success(memberService.findPage(pageWrap)); } @ApiOperation("分页劳务用户信息查询") @PostMapping("/findLaborMemberInfoPage") @RequiresPermissions("business:member:query") public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){ return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap)); } @ApiOperation("导出Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:member:exportExcel") server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,5 +1,6 @@ package com.doumee.service.business; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.admin.request.LaborMemberDTO; @@ -58,6 +59,14 @@ */ void updateById(Member member); /** * 主键更新劳务人员状态 * * @param member 实体对象 */ void updateStatusById(Member member); /** * 批量主键更新 * server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.Objects; /** * 企业信息表Service实现 @@ -255,9 +256,16 @@ .eq(Company::getType,Constants.ZERO) .eq(Company::getName,company.getName()); List<Company> companies = companyMapper.selectList(wrapper); if (CollectionUtils.isNotEmpty(companies)){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"企业信息已存在"); if (CollectionUtils.isEmpty(companies)){ return; } //新增的情况存在记录 if (Objects.isNull(company.getId())){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"公司名称已存在"); } //修改的情况存在记录 匹配不到 own if (!companies.stream().map(s -> s.getId()).anyMatch(s -> s.equals(company.getId()))){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"公司名称已存在"); } } } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -3,6 +3,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; @@ -74,7 +75,7 @@ //获取出生日期 String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo()); //脱敏操作 String hide = IdcardUtil.hide(member.getIdcardNo(), 6, 14); String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14); //转换日期 DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd"); @@ -138,6 +139,16 @@ } @Override public void updateStatusById(Member member) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); Member update = new Member(); update.setEditDate(new Date()); update.setEditor(loginUserInfo.getId()); update.setStatus(member.getStatus()); memberMapper.updateById(update); } @Override public void updateByIdInBatch(List<Member> members) { if (CollectionUtils.isEmpty(members)) { return;