From 7484078098edab2782a5cc69a4c7b6f3e5a72268 Mon Sep 17 00:00:00 2001 From: mash Date: Fri, 10 Feb 2023 17:52:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staff/controller/ExchangeController.java | 10 +++++++--- .../com/ydool/staff/dto/ExchangePageDto.java | 3 +++ .../ydool/staff/service/IExchangeService.java | 2 +- .../service/impl/ExchangeServiceImpl.java | 18 ++++++++++++++++-- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydool/staff/controller/ExchangeController.java b/src/main/java/com/ydool/staff/controller/ExchangeController.java index 91f31b5..25ba4d7 100644 --- a/src/main/java/com/ydool/staff/controller/ExchangeController.java +++ b/src/main/java/com/ydool/staff/controller/ExchangeController.java @@ -50,9 +50,13 @@ public class ExchangeController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "current", value = "当前页"), @ApiImplicitParam(name = "size", value = "每页条数"), - @ApiImplicitParam(name = "id", value = "人员选调id")}) - public AjaxResult exchangePage(){ - return exchangeService.exchangePage(getPage()); + @ApiImplicitParam(name = "userName", value = "姓名"), + @ApiImplicitParam(name = "numberId", value = "身份证号"), + @ApiImplicitParam(name = "willCompanyName", value = "调入企业名称"), + @ApiImplicitParam(name = "CompanyName", value = "调出企业名称"), + @ApiImplicitParam(name = "receipts", value = "单据状态")}) + public AjaxResult exchangePage(String userName,String numberId,String willCompanyName,String CompanyName,String receipts){ + return exchangeService.exchangePage(getPage(),userName,numberId,willCompanyName,CompanyName,receipts); } @GetMapping("selectById") @ApiOperation(value = "查看") diff --git a/src/main/java/com/ydool/staff/dto/ExchangePageDto.java b/src/main/java/com/ydool/staff/dto/ExchangePageDto.java index 55a5e94..5a5aabc 100644 --- a/src/main/java/com/ydool/staff/dto/ExchangePageDto.java +++ b/src/main/java/com/ydool/staff/dto/ExchangePageDto.java @@ -16,6 +16,9 @@ import java.time.LocalDateTime; @Data public class ExchangePageDto { + @ApiModelProperty(value = "id") + private String id; + @ApiModelProperty(value = "员工id") private String personnelId; diff --git a/src/main/java/com/ydool/staff/service/IExchangeService.java b/src/main/java/com/ydool/staff/service/IExchangeService.java index a0c6057..157f135 100644 --- a/src/main/java/com/ydool/staff/service/IExchangeService.java +++ b/src/main/java/com/ydool/staff/service/IExchangeService.java @@ -16,7 +16,7 @@ import com.ydool.staff.request.PersonnelUpdateRequest; */ public interface IExchangeService { - AjaxResult exchangePage(Page page); + AjaxResult exchangePage(Page page,String userName,String numberId,String willCompanyName,String CompanyName,String receipts); AjaxResult saveExchange(ExchangeRequest exchangeRequest); diff --git a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java index f03487a..88c4aeb 100644 --- a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java @@ -4,8 +4,11 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; import com.ydool.common.constant.ArgsConst; import com.ydool.common.data.dto.AjaxResult; import com.ydool.staff.dto.AttachmentDto; @@ -67,8 +70,19 @@ public class ExchangeServiceImpl extends BaseService i @Resource private UserMapper userMapper; @Override - public AjaxResult exchangePage(Page page) { - Page exchangePage = page(page, new LambdaQueryWrapper<>()); + public AjaxResult exchangePage(Page page,String userName,String numberId,String willCompanyName,String companyName,String receipts) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(StrUtil.isNotBlank(willCompanyName),Exchange::getWillCompanyId,willCompanyName) + .exists(StrUtil.isNotBlank(companyName), + "select p.id from t_lc_personnel p where t_lc_exchange.personnel_id = p.id and p.company_name = " +"'"+ companyName+"'") + .exists(StrUtil.isNotBlank(receipts), + "select p.id from t_lc_personnel p where t_lc_exchange.personnel_id = p.id and p.receipts = " +"'"+ receipts+"'") + .exists(StrUtil.isNotBlank(userName), + "select p.id from t_lc_personnel p where t_lc_exchange.personnel_id = p.id and p.user_name like '%" + userName + "%'") + .exists(StrUtil.isNotBlank(numberId), + "select p.id from t_lc_personnel p where t_lc_exchange.personnel_id = p.id and p.number_id =" + numberId); + + Page exchangePage = page(page,wrapper); List list = exchangePage.getRecords(); exchangePage.setRecords(list.stream().map(e->{ ExchangePageDto dto = BeanUtil.copyProperties(e, ExchangePageDto.class);