From 9f79d887ebd53065b09bf5ac765a89e9aa6a31b6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 4 Jul 2024 10:51:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterSubitemController.java | 5 ++++- .../entity/SafetyCenterSubitem.java | 2 ++ .../entity/SafetyCenterSubitemContacts.java | 3 +++ .../service/SafetyCenterSubitemService.java | 15 +++++++++------ 4 files changed, 18 insertions(+), 7 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 b7aa3edf..147af04d 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 @@ -150,7 +150,10 @@ public class SafetyCenterSubitemController extends JeroController page = new Page<>(-1, -1); + IPage pageList = safetyCenterSubitemService.pageList(page, safetyCenterSubitem); + List list = pageList.getRecords(); + return super.exportListXls(list, SafetyCenterSubitem.class, "功能安全中心成员"); } /** 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 efcbb1fe..72aeca20 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 @@ -12,6 +12,7 @@ import java.util.List; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecgframework.poi.excel.annotation.ExcelCollection; import javax.validation.constraints.Size; @@ -62,6 +63,7 @@ public class SafetyCenterSubitem { /**企业联系人列表*/ @TableField(exist = false) @ApiModelProperty(value = "企业联系人列表") + @ExcelCollection(name = "企业联系人列表") private List contactsList; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java index 266c4769..34b4a2cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; /** *功能安全中心成员-联系人 @@ -51,6 +52,7 @@ public class SafetyCenterSubitemContacts { */ @TableField(value = "contacts_id") @ApiModelProperty(value="企业联系人id") + @Excel(name = "企业联系人",dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String contactsId; /** @@ -58,6 +60,7 @@ public class SafetyCenterSubitemContacts { */ @TableField(value = "remarks") @ApiModelProperty(value="备注") + @Excel(name = "备注") private String remarks; /** 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 8d3fd5b0..2a81cf40 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 @@ -189,19 +189,22 @@ public class SafetyCenterSubitemService extends ServiceImpl pageList = baseMapper.pageList(page, safetyCenterSubitem); List records = pageList.getRecords(); //根据企业id获取所有联系人 - List companyIdList = records.stream().map(SafetyCenterSubitem::getCompanyId).collect(Collectors.toList()); + List subitemIdList = records.stream().map(SafetyCenterSubitem::getId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SafetyCenterSubitemContacts::getCompanyId,companyIdList); - wrapper.orderByAsc(SafetyCenterSubitemContacts::getCompanyId); + wrapper.in(SafetyCenterSubitemContacts::getSubitemId,subitemIdList); + wrapper.orderByAsc(SafetyCenterSubitemContacts::getSubitemId); //根据orderNum排序 wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum); List contactsList = contactsService.list(wrapper); //根据企业id分组 - Map> stringListMap = CollStreamUtil.groupByKey(contactsList, SafetyCenterSubitemContacts::getCompanyId); + Map> stringListMap = CollStreamUtil.groupByKey(contactsList, SafetyCenterSubitemContacts::getSubitemId); //遍历，存入数据 for (SafetyCenterSubitem subitem : records) { - String companyId = subitem.getCompanyId(); - List safetyCenterSubitemContacts = stringListMap.get(companyId); + String subitemId = subitem.getId(); + List safetyCenterSubitemContacts = stringListMap.get(subitemId); + if (safetyCenterSubitemContacts == null){ + continue; + } subitem.setContactsId(safetyCenterSubitemContacts.get(0).getContactsId()); subitem.setContactsList(safetyCenterSubitemContacts); }