From 8843c006c6545de6fa51318008280dbcdb63d2f4 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 14:22:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterSubitemController.java | 3 +-- .../entity/SafetyCenterSubitem.java | 6 ++++++ .../mapper/SafetyCenterSubitemMapper.java | 5 +++++ .../mapper/xml/SafetyCenterSubitemMapper.xml | 13 +++++++++++++ .../service/SafetyCenterSubitemService.java | 5 ++--- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 3d8ad93a..1fc0d97b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -50,9 +50,8 @@ public class SafetyCenterSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenterSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = safetyCenterSubitemService.pageList(page, queryWrapper); + IPage pageList = safetyCenterSubitemService.pageList(page, safetyCenterSubitem); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index 95359776..efcbb1fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -46,6 +46,12 @@ public class SafetyCenterSubitem { @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; + /** + * 成员单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "成员单位名称") + private String companyName; /**企业联系人id*/ @TableField(exist = false) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index 9490f06a..eae688ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -1,11 +1,16 @@ package com.jero.functionalsafetycenter.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import org.apache.ibatis.annotations.Param; /** * @author liJiaRao * @date 2024-06-12 16:40 */ public interface SafetyCenterSubitemMapper extends BaseMapper { + IPage pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index a9e5c65b..c857d363 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -17,4 +17,17 @@ id, project_id, company_id, remarks, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 7f949639..e2b7a2e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -2,7 +2,6 @@ package com.jero.functionalsafetycenter.service; import cn.hutool.core.collection.CollStreamUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; @@ -119,8 +118,8 @@ public class SafetyCenterSubitemService extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { - IPage pageList = this.page(page, queryWrapper); + public IPage pageList(Page page, SafetyCenterSubitem safetyCenterSubitem) { + IPage pageList = baseMapper.pageList(page, safetyCenterSubitem); List records = pageList.getRecords(); //根据企业id获取所有联系人 List companyIdList = records.stream().map(SafetyCenterSubitem::getCompanyId).collect(Collectors.toList());